Changeset 7226

Timestamp:

Nov 15, 2016, 1:35:33 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2041: Support for extension points within extensions

Adding more debug logging to see what it going on when scanning for updated extensions.

If using the ExtensionsFile.wasModified() method instead of the ExtensionsFile.checkModified() method (which has already been called in the ExtensionsControl.scanForChanges() method) changes in one extension will automatically be detected in other extensions depending on the same JAR file (this was implemented in [7192] and [7196]).

However it only works once. If the server admin simply closes the extension installation wizard and then open it again, only the JAR file that was actually changed will be detected and not those that depend on it.

I'll need to set up a better test case. One idea is to add an example extension point to the "Example code package" (​http://baseplugins.thep.lu.se/wiki/net.sf.basedb.examplecode) that we can use for testing purposes from other extensions.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/JarClassLoader.java (modified) (3 diffs)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (3 diffs)
• www/admin/extensions/wizard.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/JarClassLoader.java

@@ -497 +497 @@
   public boolean hasChanged(boolean checkSecondary)
   {
+    if (log.isDebugEnabled())
+    {
+      log.debug("Checking if JAR has changed: " + mainJarFile);
+    }
     boolean isSame = mainJarFile.exists() && 
       mainJarFile.lastModified() == jarTimeStamp && mainJarFile.length() == jarSize;
-    if (!isSame) return true;
+    if (!isSame) 
+    {
+      log.debug("Main JAR file has changed: " + mainJarFile);
+      return true;
+    }
     if (checkSecondary)
     {
@@ -505 +513 @@
       {
         File jarFile = info.jarFile;
+        if (jarFile.equals(mainJarFile)) continue; // We have already checked this one
+        
+        if (log.isDebugEnabled())
+        {
+          log.debug("Checking if secondary JAR has changed: " + jarFile);
+        }
         if (jarFile.exists())
         {
@@ -515 +529 @@
           isSame = !info.existed;
         }
-        if (!isSame) return true;
+        if (!isSame) 
+        {
+          log.debug("Secondary JAR file has changed: " + jarFile);
+          return true;
+        }
       }
       for (JarClassLoaderProxy proxy : proxyLoaders)
       {
-        if (proxy.hasChanged()) return true;
-      }
-    }
+        if (log.isDebugEnabled())
+        {
+          log.debug("Checking if proxy JAR has changed: " + proxy.jarPath);
+        }
+        isSame = !proxy.hasChanged();
+        if (!isSame) 
+        {
+          log.debug("Proxy JAR has changed: " + proxy.jarPath);
+          return true;
+        }
+      }
+    }
+    
+    if (log.isDebugEnabled()) log.debug("JAR has not changed: " + mainJarFile);
     return false;
   }

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

@@ -269 +269 @@
   public boolean checkModified()
   {
+    log.debug("Checking if file is modified: " + uri);
     wasModified = false; // Assume not modified as a starting point
     if (isNew)
     {
       // New files are always modified
+      log.debug("File was new: " + uri);
       wasModified = true;
     }
@@ -278 +280 @@
     {
       // The XML or JAR file has changed
+      log.debug("File has been modified: " + uri);
       wasModified = true;
     }
@@ -283 +286 @@
     {
       // JAR files have changed if the class loader detect changes
+      log.debug("Class path has been modified: " + uri);
       wasModified = true;
+    }
+    else
+    {
+      log.debug("File has not been modified: " + uri);
     }
     return wasModified;

trunk/www/admin/extensions/wizard.jsp

@@ -118 +118 @@
           checkInstall = true;
         }
-        else if (xtFile.checkModified())
+        else if (xtFile.wasModified())
         {
           status = "Modified";