Changeset 6341

Timestamp:

Oct 31, 2013, 2:16:52 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1778: Can't re-install an extension with an error

Added the ResetErrorFlagProcessor which is executed first with a filter instance that ignore the error flag.

Location:

branches/3.2-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/InstallFilter.java (modified) (3 diffs)
• src/core/net/sf/basedb/util/extensions/manager/processor/ResetErrorFlagProcessor.java (added)
• www/admin/extensions/wizard.jsp (modified) (1 diff)

branches/3.2-stable/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

@@ -66 +66 @@
 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.UnregisterExtensionsProcessor;
 import net.sf.basedb.util.extensions.xml.ExtensionPointFilter;
@@ -244 +245 @@
         new InstalledFilter(settings) : new InstallFilter(request);
       
+      // 2. Reset error flags if not initial scan
+      if (!initialScan)
+      {
+        ResetErrorFlagProcessor resetError = new ResetErrorFlagProcessor();
+        manager.processFiles(resetError, new InstallFilter(request, true)); // Ignore error flag
+      }
+        
       // 2a. Load extension definitions
       WebClientRegisterExtensionsProcessor registerExtensions = 

branches/3.2-stable/src/clients/web/net/sf/basedb/clients/web/extensions/InstallFilter.java

@@ -26 +26 @@
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile;
+import net.sf.basedb.util.extensions.manager.processor.ResetErrorFlagProcessor;
 import net.sf.basedb.util.filter.Filter;
 
@@ -41 +42 @@
 
   private final HttpServletRequest request;
+  private final boolean ignoreErrorFlag;
   
   public InstallFilter(HttpServletRequest request)
   {
+    this(request, false);
+  }
+  
+  /**
+    Create a filter that allow us to ignore the error flag. Needed
+    to be able to reset the error status for extensions that has
+    been selected for re-install. See {@link ResetErrorFlagProcessor}.
+    @since 3.2.4
+  */
+  public InstallFilter(HttpServletRequest request, boolean ignoreErrorFlag)
+  {
     this.request = request;
+    this.ignoreErrorFlag = ignoreErrorFlag;
   }
   
@@ -50 +64 @@
   public boolean evaluate(ExtensionsFile xtFile) 
   {
-    if (!xtFile.isValid() || (xtFile.hasError())) 
+    if (!xtFile.isValid() || (xtFile.hasError() && !ignoreErrorFlag)) 
     {
       // Do not install files with errors

branches/3.2-stable/www/admin/extensions/wizard.jsp

@@ -151 +151 @@
           checkInstall = true;
         }
+        else if (xtFile.hasError())
+        {
+          status = "Error";
+          allowInstall = true;
+          allowUninstall = true;
+        }
         else
         {