Changeset 7224

Timestamp:

Nov 14, 2016, 1:43:01 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2041: Support for extension points within extensions

Adding more debug-level logging to see what is going on when initializing the extension system. There is one step in the core that only load some extensions and one step in the web client that load other extensions. Everything that falls outside of that is not loaded at all (at least until a manual re-install is triggered from the web interface).

I think it should be safe to remove the filtering from the web client initialization and let it load all extensions. It seems like it should not touch already registered extensions.

Regarding the ClassCastException mentioned in the second point above I think it is a result of the Registry.RegisteredExtensionPoint.update() only is changing the classloader and not the action class.

Location:

trunk/src/core/net/sf/basedb/util/extensions

Files:

• Registry.java (modified) (2 diffs)
• xml/ExtensionPointFilter.java (modified) (2 diffs)
• xml/XmlLoader.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/extensions/Registry.java

@@ -794 +794 @@
     void update(ExtensionPoint<A> ep, ClassLoader classLoader)
     {
+      if (log.isDebugEnabled())
+      {
+        log.debug("Update registry: " + ep + 
+          "; old classloader="+this.classLoader + "; new classLoader="+classLoader);
+      }
       this.classLoader = classLoader;
       this.name = ep.getName();
@@ -935 +940 @@
     void update(Extension<A> extension, ClassLoader classLoader)
     {
+      if (log.isDebugEnabled())
+      {
+        log.debug("Update registry: " + extension + 
+          "; old classloader="+this.classLoader + "; new classLoader="+classLoader);
+      }
       this.classLoader = classLoader;
       this.index = extension.getIndex();

trunk/src/core/net/sf/basedb/util/extensions/xml/ExtensionPointFilter.java

@@ -49 +49 @@
 {
 
+  private static final org.slf4j.Logger log = 
+    org.slf4j.LoggerFactory.getLogger(ExtensionPointFilter.class);
+  
   private final Pattern pattern;
   
@@ -99 +102 @@
       idToMatch = Values.getStringOrNull(tag.getText());
     }
-    return idToMatch != null && pattern.matcher(idToMatch).matches();
+    boolean matches = idToMatch != null && pattern.matcher(idToMatch).matches();
+    
+    if (log.isDebugEnabled()) 
+    {
+      if (matches)
+      {
+        log.debug(tagName + "[" + idToMatch + "] matches filter: " + pattern);
+      }
+      else
+      {
+        log.debug(tagName + "[" + idToMatch + "] doesn't match filter: " + pattern);
+      }
+    }
+
+    return matches;
   }
   // --------------------------
+
+  @Override
+  public String toString() 
+  {
+    return "ExtensionPointFilter["+pattern+"]";
+  }
+  
+  
+  
 }

trunk/src/core/net/sf/basedb/util/extensions/xml/XmlLoader.java

@@ -223 +223 @@
   public void setFilter(Filter<Element> filter)
   {
+    log.debug("Using filter: " + filter);
     this.filter = filter;
   }