Changeset 7228

Timestamp:

Nov 16, 2016, 8:43:51 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2041: Support for extension points within extensions

Implemented a better solution for re-installing an updated extension. The class loader is now reset as part of the re-installation process and not as part of the scanning-for-changes process. The existing ResetErrorFlagProcessor class has been deprecated and replaced with the more generic ResetProcessor which is able to reset the error flag, class loader and any other things we might need to reset in the future when doing a re-installation.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (2 diffs)
• core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (2 diffs)
• core/net/sf/basedb/util/extensions/manager/processor/ResetErrorFlagProcessor.java (modified) (1 diff)
• core/net/sf/basedb/util/extensions/manager/processor/ResetProcessor.java (added)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

@@ -72 +72 @@
 import net.sf.basedb.util.extensions.manager.processor.ExtractResourcesProcessor;
 import net.sf.basedb.util.extensions.manager.processor.PluginInstallationProcessor;
-import net.sf.basedb.util.extensions.manager.processor.ResetErrorFlagProcessor;
+import net.sf.basedb.util.extensions.manager.processor.ResetProcessor;
 import net.sf.basedb.util.extensions.manager.processor.UnregisterExtensionsProcessor;
 import net.sf.basedb.util.extensions.xml.ExtensionPointFilter;
@@ -257 +257 @@
       if (!initialScan)
       {
-        ResetErrorFlagProcessor resetError = new ResetErrorFlagProcessor(results);
-        manager.processFiles(resetError, new InstallFilter(request, true)); // Ignore error flag
+        ResetProcessor reset = new ResetProcessor(results);
+        manager.processFiles(reset, new InstallFilter(request, true)); // Ignore error flag
       }
         

trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java

@@ -582 +582 @@
     throws IOException
   {
-    if ((jarLoader == null || wasModified) && isJar())
+    if ((jarLoader == null) && isJar())
     {
       jarLoader = (JarClassLoader)JarClassLoader.getInstance(getFile().getAbsolutePath(), true);
@@ -738 +738 @@
     {
       xtFile.hasError = error;
+    }
+    
+    /**
+      Reset the classloader for this file, forcing a new
+      instance in case the JAR file has been changed. 
+      This method should be called before re-installing 
+      an extension and the {@link ExtensionsFile#checkModified()} 
+      returns true.
+      @throws IllegalStateException If the file has been closed
+      @since 3.10
+    */
+    public void resetClassLoader()
+    {
+      checkClosed();
+      xtFile.jarLoader = null;
     }
 

trunk/src/core/net/sf/basedb/util/extensions/manager/processor/ResetErrorFlagProcessor.java

@@ -35 +35 @@
   @since 3.2.4
   @base.modified $Date$
+  @deprecated In 3.10, use {@link ResetProcessor} instead
 */
+@Deprecated
 public class ResetErrorFlagProcessor
   implements ExtensionsFileProcessor