Changeset 5607

Timestamp:

Apr 15, 2011, 9:52:28 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1593: Extension system for the core API

References #1592: Unified installation procedure for plug-ins, extensions and more...

Added tags for min/max BASE version that an extension is working with. Switched to use numbers instead of strings in version information and added an extra suffix "-dev" used for development versions.

Also fixes problems with error handling in the startup of the extensions system and problems with re-scanning updated extensions that had an error before or got an error after the update.

Location:

trunk

Files:

• build.xml (modified) (6 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (10 diffs)
• src/clients/web/net/sf/basedb/clients/web/taglib/Page.java (modified) (2 diffs)
• src/core/base.version (modified) (1 diff)
• src/core/net/sf/basedb/core/Application.java (modified) (8 diffs)
• src/core/net/sf/basedb/core/Version.java (modified) (7 diffs)
• src/core/net/sf/basedb/core/plugin/About.java (modified) (1 diff)
• src/core/net/sf/basedb/core/plugin/AboutImpl.java (modified) (11 diffs)
• src/core/net/sf/basedb/core/xsd/extensions.xsd (modified) (5 diffs)
• src/core/net/sf/basedb/util/extensions/AboutBean.java (modified) (3 diffs)
• src/core/net/sf/basedb/util/extensions/Registry.java (modified) (4 diffs)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (8 diffs)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionsManager.java (modified) (9 diffs)
• src/core/net/sf/basedb/util/extensions/manager/filter/InvalidAndModifiedFilter.java (added)
• src/core/net/sf/basedb/util/extensions/manager/filter/ValidAndNewOrModifiedFilter.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/processor/RegisterExtensionsProcessor.java (modified) (9 diffs)
• src/core/net/sf/basedb/util/extensions/manager/processor/UnregisterExtensionsProcessor.java (modified) (5 diffs)
• src/core/net/sf/basedb/util/extensions/xml/XmlLoader.java (modified) (5 diffs)
• src/info/net/sf/basedb/info/VersionInfo.java (modified) (4 diffs)
• www/admin/extensions/details.jsp (modified) (2 diffs)
• www/admin/extensions/index.jsp (modified) (1 diff)
• www/admin/extensions/scan_results.jsp (modified) (3 diffs)

trunk/build.xml

@@ -60 +60 @@
   <!-- set BASE version
     Use numerical versions for bugfix (maintenance) releases starting
-    with "1". Use "0" for the first release of a new trunk version.  Add
-    "pre" to unreleased versions.  Examples: 2.1.1pre, 2.1.1,
-    2.1.2pre, 2.2.2, 2.2.0pre, 2.2.0, 2.2.1pre, 2.2.1 
+    with "1". Use "0" for the first release of a new trunk version.  Set
+    "base.versionsuffix" to "-dev" for unreleased versions. Examples: 2.1.1-dev, 2.1.1,
+    2.1.2-dev, 2.2.2, 2.2.0-dev, 2.2.0, 2.2.1-dev, 2.2.1 
   -->
   <property name="base.majorversion" value="3" />
   <property name="base.minorversion" value="0" />
-  <property name="base.maintenanceversion" value="0pre" />
+  <property name="base.maintenanceversion" value="0" />
+  <property name="base.versionsuffix" value="-dev" />
   <property name="base.version" 
     value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />
@@ -493 +494 @@
         token="@BUILD@"
         value="${base.build}"
+      />
+      <replacefilter 
+        token="@SUFFIX@"
+        value="${base.versionsuffix}"
       />
     </replace>
@@ -1164 +1169 @@
       use="false"
       private="true"
-      windowtitle="BASE ${base.version} API documentation"
+      windowtitle="BASE ${base.version}${base.versionsuffix} API documentation"
       stylesheetfile="${javadoc.src}/javadoc.css"
       classpathref="javadoc.classpath"
@@ -1205 +1210 @@
       </group>
       
-      <header><![CDATA[${base.version}: ${TODAY}]]></header>
+      <header><![CDATA[${base.version}${base.versionsuffix}: ${TODAY}]]></header>
       <link href="http://download.oracle.com/javase/6/docs/api"/>
       <link href="http://docs.jboss.org/hibernate/stable/core/api/"/>
@@ -1315 +1320 @@
       <property name="distribution.dir" location="${docbook.html.out}" />
       <property name="build.dir" location="${build}/docbook/html" />
-      <property name="base.version" value="${base.version}"/>
+      <property name="base.version" value="${base.version}${base.versionsuffix}"/>
     </ant>
      <copy todir="${docbook.html.out}">
@@ -1369 +1374 @@
       <property name="build.dir" location="${build}/docbook/pdf" />
       <property name="pdf.name" value="base.pdf" />
-      <property name="base.version" value="${base.version}"/>
+      <property name="base.version" value="${base.version}${base.versionsuffix}"/>
     </ant>
   </target>

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

@@ -184 +184 @@
   private static ProcessResults scan(boolean initialScan, boolean forceUpdate)
   {
+    log.info("Starting scan: intial=" + initialScan + "; forceUpdate="+forceUpdate);
     String rootPath = servletContext.getContextPath();
     File resourceDir = new File(servletContext.getRealPath(RESOURCES_URL));
@@ -203 +204 @@
       if (!initialScan)
       {
+        log.debug("Checking for deleted files");
         // 1. Process files that has been deleted
         DeletedFilter deleted = new DeletedFilter();
@@ -214 +216 @@
         manager.processFiles(unregister, deleted);
         numUnregistered = unregister.getNumUnregistered();
+        
+        log.debug("Processed " + unregister.getNumFiles() + " deleted files");
       }
       
+      log.debug("Checking for new and updated files");
       // 2. Update the manager with new and modified files
       manager.scanForNewAndUpdated();
@@ -221 +226 @@
       numModifiedFiles = manager.getNumModified();
       numDeletedFiles = manager.getNumDeleted();
+      log.debug("Found " + numNewFiles + " new and " + numModifiedFiles + " modified files");
       
       if (initialScan || numNewFiles > 0 || numModifiedFiles > 0 || forceUpdate)
       {
-        // Process files that are valid and new/updated (unless forceUpdate=true)
+        // 3. Process files that are valid and new/updated (unless forceUpdate=true)
         ValidAndNewOrModifiedFilter valid = new ValidAndNewOrModifiedFilter(initialScan || forceUpdate);
         
-        // 3. Load extension definitions
+        // 3a. Load extension definitions
         WebClientRegisterExtensionsProcessor registerExtensions = 
           new WebClientRegisterExtensionsProcessor(rootPath, rootPath + RESOURCES_URL, rootPath + SERVLET_URL, results);
@@ -238 +244 @@
         manager.processFiles(registerExtensions, valid);
 
-        // 4. Extract web resources
+        // 3b. Extract web resources
         ExtractResourcesProcessor extractResources = new ExtractResourcesProcessor(resourceDir, Pattern.compile("resources/(.*)"), "$1", results);
         extractResources.setForceOverwrite(forceUpdate);
         manager.processFiles(extractResources, valid);
 
-        // 5. Servlets
+        // 3c. Servlets
         LoadServletsProcessor loadServlets = new LoadServletsProcessor(servletContext, results);
         manager.processFiles(loadServlets, valid);
         
-        // 6. Actual registration of all extensions
+        // 3d. Actual registration of all extensions
         registerExtensions.finalizeRegistration(manager);
         numRegistered = registerExtensions.getNumRegistered();
       }
       
-      // Reset the 'last modifed' status of all files and generated summary per file
+      // 4. Reset the 'last modifed' status of all files and generated summary per file
       manager.processFiles(new SetFileStatusProcessor(results));
       results.setEnded();
@@ -468 +474 @@
     @throws PermissionDeniedException If the logged in user doesn't
       have WRITE permission
+    @since 3.0
   */
   public ProcessResults installAndUpdateExtensions(boolean forceUpdate)
@@ -479 +486 @@
     @return A {@link ProcessResults} object, or null if no scan
       has taken place
+    @since 3.0
   */
   public ProcessResults getLastScanResults()
@@ -495 +503 @@
   
   /**
-    Get an iterator returning all registered extension points.
+    Get an list returning all registered extension points.
     @see Registry#getExtensionPoints()
+    @since 3.0 (Returned an Iterator in BASE 2.x)
   */
   public List<ExtensionPoint<?>> getExtensionPoints()
@@ -560 +569 @@
   
   /**
-    Get an iterator returning all registered extensions.
+    Get a list returning all registered extensions.
     @see Registry#getExtensions()
+    @since 3.0 (Returned an Iterator in BASE 2.x)
   */
   public List<Extension<?>> getExtensions()
@@ -569 +579 @@
   
   /**
-    Get an iterator returning all registered extensions for a
+    Get a list returning all registered extensions for a
     specific extension point.
     @param id The ID of the extension point
     @see Registry#getExtensions(String)
+    @since 3.0 (Returned an Iterator in BASE 2.x)
   */
   public List<Extension<?>> getExtensions(String id)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Page.java

@@ -25 +25 @@
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.SessionControl;
+import net.sf.basedb.core.Version;
 import net.sf.basedb.clients.web.Base;
 import net.sf.basedb.util.Values;
@@ -183 +184 @@
     MAX_URL_LENGTH = maxUrlLength > 0 ? String.valueOf(maxUrlLength) : null;
     ROOT = ((HttpServletRequest)pageContext.getRequest()).getContextPath()+"/";
-    BASE_VERSION = "BASE " + Application.getMajorVersion() + "." + 
-      Application.getMinorVersion() + "." + 
-      Application.getMaintenanceVersion();
+    BASE_VERSION = "BASE " + Version.getMajor() + "." + 
+      Version.getMinor() + "." + Version.getMaintenance() + Version.getSuffix();
     SERVER_NAME = Application.getHostName();
     initialized = true;

trunk/src/core/base.version

@@ -3 +3 @@
 maintenance: @MAINTENANCE@
 build: @BUILD@
+suffix: @SUFFIX@

trunk/src/core/net/sf/basedb/core/Application.java

@@ -37 +37 @@
 import net.sf.basedb.util.extensions.manager.ExtensionsManager;
 import net.sf.basedb.util.extensions.manager.ProcessResults;
+import net.sf.basedb.util.extensions.manager.filter.ValidAndNewOrModifiedFilter;
 import net.sf.basedb.util.extensions.manager.filter.WasProcessedFilter;
 import net.sf.basedb.util.extensions.manager.processor.MarkAsProcessedProcessor;
@@ -208 +209 @@
   /**
     Get the major version.
-  */
-  public static String getMajorVersion()
+    @since 3.0 (was returning a String in 2.x)
+  */
+  public static int getMajorVersion()
   {
     return Version.getMajor();
@@ -216 +218 @@
   /**
     Get the minor version.
-  */
-  public static String getMinorVersion()
+    @since 3.0 (was returning a String in 2.x)
+  */
+  public static int getMinorVersion()
   {
     return Version.getMinor();
@@ -225 +228 @@
   /**
     Get the maintenance version.
-  */
-  public static String getMaintenanceVersion()
+    @since 3.0 (was returning a String in 2.x)
+  */
+  public static int getMaintenanceVersion()
   {
     return Version.getMaintenance();
@@ -239 +243 @@
   }
 
+  /**
+    Get the version suffix (eg. "-dev").
+    @since 3.0
+  */
+  public String getVersionSuffix()
+  {
+    return Version.getSuffix();
+  }
+  
   /**
     Get the BASE version string. It is created by combining
@@ -245 +258 @@
   public static String getVersionString()
   {
-    return "BASE " + getMajorVersion() + "." + getMinorVersion() +
-      "." + getMaintenanceVersion() + " (build #" + getBuild() +
+    return "BASE " + Version.getMajor() + "." + Version.getMinor() +
+      "." + Version.getMaintenance() + Version.getSuffix() + " (build #" + Version.getBuild() +
       "; schema #" + Application.getSchemaVersion()+")";
   }
   
+  private static int schemaVersion = -2;
   /**
     Get the current database schema version number.
@@ -259 +273 @@
     org.hibernate.Session session = null;
     org.hibernate.Transaction tx = null;
-    int schemaVersion = -2;
-    try
-    {
-      session = HibernateUtil.newSession();
-      schemaVersion++;
-      tx = HibernateUtil.newTransaction(session);
-      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_SCHEMA_VERSION");
-      schemaVersion = HibernateUtil.loadData(SchemaVersionData.class, query).getSchemaVersion();
-      HibernateUtil.commit(tx);
-    }
-    catch (Throwable t)
-    {
-      if (tx != null) HibernateUtil.rollback(tx); 
-      log.error("getSchemaVersion", t);
-    }
-    finally
-    {
-      if (session != null) HibernateUtil.close(session);
+    if (schemaVersion > 0) return schemaVersion;
+    
+    synchronized (Application.class)
+    {
+      schemaVersion = -2;
+      try
+      {
+        session = HibernateUtil.newSession();
+        schemaVersion++;
+        tx = HibernateUtil.newTransaction(session);
+        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_SCHEMA_VERSION");
+        schemaVersion = HibernateUtil.loadData(SchemaVersionData.class, query).getSchemaVersion();
+        HibernateUtil.commit(tx);
+      }
+      catch (Throwable t)
+      {
+        if (tx != null) HibernateUtil.rollback(tx); 
+        log.error("getSchemaVersion", t);
+      }
+      finally
+      {
+        if (session != null) HibernateUtil.close(session);
+      }     
     }
     return schemaVersion;
@@ -550 +569 @@
         // Filter that only load core extension points
         loader.setFilter(new ExtensionPointFilter("net\\.sf\\.basedb\\.core\\..*"));
-        xtManager.processFiles(new RegisterExtensionsProcessor(loader, results));
+        xtManager.processFiles(new RegisterExtensionsProcessor(loader, results), new ValidAndNewOrModifiedFilter(false));
         xtManager.processFiles(new MarkAsProcessedProcessor(), new WasProcessedFilter(results));
         

trunk/src/core/net/sf/basedb/core/Version.java

@@ -31 +31 @@
 
 import net.sf.basedb.util.FileUtil;
+import net.sf.basedb.util.Values;
 
 /**
@@ -43 +44 @@
 public class Version
 {
-  private static String major;
-  private static String minor;
-  private static String maintenance;
+  private static int major;
+  private static int minor;
+  private static int maintenance;
   private static int build;
+  private static String suffix;
   
   static
@@ -72 +74 @@
       Properties config = new Properties();
       config.load(is);
-      major = config.getProperty("major");
-      minor = config.getProperty("minor");
-      maintenance = config.getProperty("maintenance");
+      major = Values.getInt(config.getProperty("major"));
+      minor = Values.getInt(config.getProperty("minor"));
+      maintenance = Values.getInt(config.getProperty("maintenance"));
       build = parseBuildNumber(config.getProperty("build"));
+      suffix = config.getProperty("suffix", "");
     }
     catch (IOException ex)
@@ -89 +92 @@
   /**
     Get the major version.
+    @since 3.0 (was returning a String in 2.x)
   */
-  public static String getMajor()
+  public static int getMajor()
   {
     return major;
@@ -97 +101 @@
   /**
     Get the minor version.
+    @since 3.0 (was returning a String in 2.x)
   */
-  public static String getMinor()
+  public static int getMinor()
   {
     return minor;
@@ -104 +109 @@
   /**
     Get the maintentance version.
+    @since 3.0 (was returning a String in 2.x)
   */
-  public static String getMaintenance()
+  public static int getMaintenance()
   {
     return maintenance;
@@ -118 +124 @@
   }
   
+  /**
+    Get the version suffix string (eg "-dev" for development versions)
+    @since 3.0
+  */
+  public static String getSuffix()
+  {
+    return suffix;
+  }
+  
   public static String getVersion()
   {
-    return major+"."+minor+"."+maintenance + "(build " + build + ")";
+    return major+"."+minor+"."+maintenance + suffix + "(build " + build + ")";
   }
 
+  /**
+    Compare the given version string, which should be of the
+    form a.b or a.b.c, with the current BASE version. 
+    If they are exactly equal 0 is returned.
+    If the given string is less than the current version
+    -1 is returned, if the given string is greater than
+    the current version +1 is returned.
+    
+    @param version
+    @return 0, -1 or +1
+    @since 3.0
+    @throws InvalidDataException If the given string isn't correctly formatted
+  */
+  public static int compareWith(String version)
+  {
+    if (version == null) throw new NullPointerException("version");
+    Pattern p = Pattern.compile("(\\d+)\\.(\\d+)\\.?(\\d*)");
+    Matcher m = p.matcher(version);
+    if (!m.matches()) 
+    {
+      throw new InvalidDataException("Version is not correctly formatted: " + version);
+    }
+    
+    // Major and minor as a first step
+    int vMajor = Values.getInt(m.group(1));
+    int vMinor = Values.getInt(m.group(2));
+    if (vMajor != major) return vMajor < major ? -1 : 1;
+    if (vMinor != minor) return vMinor < minor ? -1 : 1;
+    
+    // Need to check maintenance as well (if given)
+    if (m.groupCount() > 2)
+    {
+      int vMaintenance = Values.getInt(m.group(3));
+      if (vMaintenance != maintenance) return vMaintenance < maintenance ? -1 : 1;
+    }
+    return 0;
+  }
+  
   /**
     Find the first digits in a string and return those as the build number.

trunk/src/core/net/sf/basedb/core/plugin/About.java

@@ -51 +51 @@
 
   /**
+    Get the minimum BASE version that the plug-in requires.
+    The returned value should be 2 or 3 numbers separated by
+    a dot (eg. 3.0, 3.1.2, etc). A null return value indicates
+    that the plug-in works with all BASE versions.
+    @return A string or null
+    @since 3.0
+  */
+  public String getMinBaseVersion();
+  
+  /**
+    Get the maximum BASE version were to plug-in no longer is
+    expected to work. The returned value should be 2 or 3 numbers separated
+    by a dot (eg. 3.0, 3.1.2, etc). A null return value indicates
+    that the plug-in works with all BASE versions.
+    @return A string or null
+    @since 3.0
+  */
+  public String getMaxBaseVersion();
+
+  
+  /**
     A description of the plugin and what it does. May return null.
   */

trunk/src/core/net/sf/basedb/core/plugin/AboutImpl.java

@@ -35 +35 @@
   private final String description;
   private final String version;
+  private final String minBaseVersion;
+  private final String maxBaseVersion;
   private final String copyright;
   private final String contact;
   private final String email;
   private final String url;
+  
+  
+  /**
+    Create a new about object without any min or max BASE version requirement.
+  */
+  public AboutImpl(String name, String description, String version, String copyright, String contact, String email, String url)
+  {
+    this(name, description, version, null, null, copyright, contact, email, url);
+  }
+
   
   /**
@@ -46 +58 @@
     @param description A description of the plugin
     @param version The version of the plugin
+    @param minBaseVersion The minium version of BASE that is required by the plugin
+    @param maxBaseVersion The maxium version of BASE that the plugin is expected to work with
     @param copyright A copyright notice
     @param contact Contact information for the plugin
@@ -51 +65 @@
     @param url An URL to get more inforamtion about the plugin
     @throws NullPointerException If the name is null
+    @since 3.0
   */
-  public AboutImpl(String name, String description, String version, String copyright, String contact, String email, String url)
+  public AboutImpl(String name, String description, String version, String minBaseVersion, String maxBaseVersion, String copyright, String contact, String email, String url)
   {
     if (name == null) throw new NullPointerException("The 'name' parameter mustn't be null.");
@@ -62 +77 @@
     this.url = url;
     this.version = version;
+    this.minBaseVersion = minBaseVersion;
+    this.maxBaseVersion = maxBaseVersion;
   }
 
@@ -68 +85 @@
     -------------------------------------------
   */
+  @Override
   public String getContact()
   {
@@ -73 +91 @@
   }
 
+  @Override
   public String getCopyright()
   {
@@ -78 +97 @@
   }
 
+  @Override
   public String getDescription()
   {
@@ -83 +103 @@
   }
 
+  @Override
   public String getEmail()
   {
@@ -88 +109 @@
   }
 
+  @Override
   public String getName()
   {
@@ -93 +115 @@
   }
 
+  @Override
   public String getUrl()
   {
@@ -98 +121 @@
   }
 
+  @Override
   public String getVersion()
   {
     return version;
   }
+  
+  @Override
+  public String getMinBaseVersion() 
+  {
+    return minBaseVersion;
+  }
+  
+  @Override
+  public String getMaxBaseVersion() 
+  {
+    return maxBaseVersion;
+  }
   // -------------------------------------------
 }

trunk/src/core/net/sf/basedb/core/xsd/extensions.xsd

@@ -30 +30 @@
     <xsd:complexType>
       <xsd:sequence>
+        <!-- global 'about' element -->
         <xsd:element name="about" type="aboutType" minOccurs="0" />
+        
+        <!-- 'extension-point' element -->
         <xsd:element name="extension-point" minOccurs="0" maxOccurs="unbounded">
           <xsd:complexType>
@@ -52 +55 @@
         </xsd:element>
         
+        <!-- 'extension' element -->
         <xsd:element name="extension" minOccurs="0" maxOccurs="unbounded">
           <xsd:complexType>
@@ -97 +101 @@
       <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1" />
       <xsd:element name="version" type="xsd:string" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="min-base-version" type="baseVersionType" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="max-base-version" type="baseVersionType" minOccurs="0" maxOccurs="1" />
       <xsd:element name="copyright" type="xsd:string" minOccurs="0" maxOccurs="1" />
       <xsd:element name="contact" type="xsd:string" minOccurs="0" maxOccurs="1" />
@@ -103 +109 @@
     </xsd:all>
   </xsd:complexType>
+  
+  <!-- A string matching BASE version number with or without patch number -->
+  <xsd:simpleType name="baseVersionType" >
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="\d\.\d+\.?\d*"></xsd:pattern>
+    </xsd:restriction>
+  </xsd:simpleType>
   
   <!-- 
@@ -121 +134 @@
     </xsd:sequence>
   </xsd:complexType>
-  
-  <xsd:group name="extends">
-    <xsd:sequence>
-      <xsd:element name="extends" minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute name="index" type="xsd:float" />
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-  
+
 </xsd:schema>

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

@@ -39 +39 @@
   private String description;
   private String version;
+  private String minBaseVersion;
+  private String maxBaseVersion;
   private String copyright;
   private String contact;
@@ -119 +121 @@
   }
 
+  @Override
+  public String getMinBaseVersion() 
+  {
+    return minBaseVersion;
+  }
+  public void setMinBaseVersion(String version)
+  {
+    this.minBaseVersion = version;
+  }
+
+  @Override
+  public String getMaxBaseVersion() 
+  {
+    return maxBaseVersion;
+  }
+  public void setMaxBaseVersion(String version)
+  {
+    this.maxBaseVersion = version;
+  }
+
+  
   /**
     Copy information from antoher <code>About</code> object
@@ -132 +155 @@
     description = overwrite || description == null ? from.getDescription() : description;
     version = overwrite || version == null ? from.getVersion() : version;
+    minBaseVersion = overwrite || minBaseVersion == null ? from.getMinBaseVersion() : minBaseVersion;
+    maxBaseVersion = overwrite || maxBaseVersion == null ? from.getMaxBaseVersion() : maxBaseVersion;
     copyright = overwrite || copyright == null ? from.getCopyright() : copyright;
     contact = overwrite || contact == null ? from.getContact() : contact;

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

@@ -287 +287 @@
     {
       handleEvent(EventType.BEFORE_UNREGISTRATION, rep, null);
+      for (RegisteredExtension<?> rext : rep.getExtensions())
+      {
+        handleEvent(EventType.BEFORE_UNREGISTRATION, rep, rext);
+        extensions.remove(rext.getId());
+      }
       extensionPoints.remove(id);
     }
@@ -894 +899 @@
     private String description;
     private String version;
+    private String minBaseVersion;
+    private String maxBaseVersion;
     private String copyright;
     private String contact;
@@ -953 +960 @@
       return version;
     }
+    
+    @Override
+    public String getMinBaseVersion() 
+    {
+      return minBaseVersion;
+    }
+
+    @Override
+    public String getMaxBaseVersion() 
+    {
+      return maxBaseVersion;
+    }
     // ---------------------------------
 
@@ -963 +982 @@
       this.description = about.getDescription();
       this.version = about.getVersion();
+      this.minBaseVersion = about.getMinBaseVersion();
+      this.maxBaseVersion = about.getMaxBaseVersion();
       this.contact = about.getContact();
       this.copyright = about.getCopyright();

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

@@ -82 +82 @@
   private boolean hasError;
 
-  private volatile boolean hasValidated;
   private volatile boolean isValid;
   private Throwable validationError;
@@ -380 +379 @@
     Validate the XML file with the extension definitions.
   */
-  synchronized void validate()
-  {
-    if (hasValidated) return;
-    
+  synchronized boolean validate()
+  {
     log.info("Validating extensions in file: " + this);
-    hasValidated = false;
     isValid = false;
+    hasError = false;
     validationError = null;
-
+    jarLoader = null;
+    
     InputStream in = null;
     try
@@ -394 +392 @@
       in = getXmlStream();
       about = new XmlLoader().validateXmlFile(in, getName());
-    }
-    catch (RuntimeException ex)
-    {
-      log.error("Error validating extensions in file: " + this, ex);
-      validationError = ex;
-      throw ex;
+      log.info("Successfully validated extensions in file: " + this);
+      isValid = true;
     }
     catch (Throwable t)
@@ -405 +399 @@
       log.error("Error validating extensions in file: " + this, t);
       validationError = t;
-      throw new RuntimeException(t);
     }
     finally
     {
       FileUtil.close(in);
-      hasValidated = true;
-    }
-    log.info("Successfully validated extensions in file: " + this);
-    isValid = true;
+    }
+    return isValid;
   }
 
@@ -427 +418 @@
   public boolean hasError()
   {
-    return hasError;
+    return hasError || !isValid;
   }
   
@@ -541 +532 @@
   }
   
+  /**
+    Get the class loader used to load classes for the extension. Only JAR
+    files have class loaders so this method may return null.
+  */
   public ClassLoader getClassLoader()
     throws IOException
@@ -546 +541 @@
     if (jarLoader == null && isJar())
     {
-      jarLoader = (JarClassLoader)JarClassLoader.getInstance(getFile().getAbsolutePath());
+      jarLoader = (JarClassLoader)JarClassLoader.getInstance(getFile().getAbsolutePath(), true);
     }
     return jarLoader;
   }
-  
-
 
   /**
@@ -669 +662 @@
         xtFile.lastLength = xtFile.file.length();
       }
+      if (!xtFile.isValid)
+      {
+        // Cleanup to avoid leaking memory
+        xtFile.allObjects.clear();
+        xtFile.jarLoader = null;
+        xtFile.objectMetadata.clear();
+      }
     }
     

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

@@ -220 +220 @@
       if (!xtFile.exists()) 
       {
-        log.info("File '" + xtFile + "' has been deleted.");
+        log.debug("File '" + xtFile + "' has been deleted.");
         unregisterAllObjects(xtFile);
         it.remove();
@@ -227 +227 @@
       else if (xtFile.isNew())
       {
+        numNew++;
+      }
+      else if (xtFile.checkModified())
+      {
+        log.debug("File '" + xtFile + "' is modified. Validating...");
         xtFile.validate();
-        numNew++;
-      }
-      else if (xtFile.checkModified())
-      {
-        xtFile.validate();
+        log.debug("File '" + xtFile + "' is " + (xtFile.isValid() ? "valid" : "invalid"));
         numModified++;
       }
@@ -305 +306 @@
     if (files != null && files.length > 0)
     {
-      log.info("Found " + files.length + " file(s)");
+      log.debug("Found " + files.length + " files");
       for (File file : files)
       {
         if (ignore.contains(file))
         {
-          log.info("File '" + file + "' is ignored.");
+          log.debug("File '" + file + "' is ignored.");
           continue; // with the next file
         }
@@ -318 +319 @@
         if (xtFile != null)
         {
-          log.info("File '" + xtFile + "' is a known file.");
+          log.debug("File '" + xtFile + "' is a known file.");
         }
         else
@@ -327 +328 @@
         }
       }
+      log.info("Found " + numNew + " files");
     }
     else
@@ -389 +391 @@
       installedObjects.put(key, xtFile);
     }
-    else
+    else if (!xtFile.equals(xtOther))
     {
       throw new ItemAlreadyExistsException(key.toDescription() + " is defined in '" + xtOther.getName() + "'");
@@ -442 +444 @@
   {
     if (processor == null) throw new NullPointerException("processor");
+    log.info("Processing files with processor: " + processor);
 
     // 1. Filter files with the given filter
@@ -448 +451 @@
     {
       filtered = new ArrayList<ExtensionsFile>(xtFiles.size());
-      log.debug("Filtering files with filter: " + filter);
+      log.info("Filtering files with filter: " + filter);
       for (ExtensionsFile xtFile : xtFiles.values())
       {
@@ -481 +484 @@
       }
       processor.done(this);
-      log.debug("All files processed successfully with processor: " + processor);
+      log.debug("All files processed with processor: " + processor);
     }
     catch (Throwable t)
     {
-      log.warn("Error when processing extensions with " + processor, t);
+      log.error("Error when processing extensions with " + processor, t);
       processor.done(null, t);
     }

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

@@ -62 +62 @@
   public boolean evaluate(ExtensionsFile xtFile)
   {
-    if (!xtFile.isValid() || xtFile.hasError()) 
+    if (!xtFile.isValid() || (xtFile.hasError() && !allowUnmodified)) 
     {
       log.info("File has errors (skipping): " + xtFile);

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

@@ -24 +24 @@
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
@@ -117 +118 @@
     {
       log.info("Loading extensions from file: " + xtFile);
+      FileData data = new FileData();
+      data.writeableFile = wFile;
+      allData.add(data);
       in = xtFile.getXmlStream();
       loader.loadXmlFile(in, xtFile.getName(), xtFile.getClassLoader(), true);
-      FileData data = new FileData();
-      data.writeableFile = wFile;
       data.extensionPoints = new ArrayList<ExtensionPoint<?>>(loader.getExtensionPoints());
       data.extensions = new ArrayList<Extension<?>>(loader.getExtensions());
@@ -126 +128 @@
       log.info("Loaded " + data.extensionPoints.size() + "/" + data.extensions.size() + 
           " extensions from file: " + xtFile);
-      allData.add(data);
     }
     catch (Exception ex)
@@ -134 +135 @@
       if (results != null)
       {
-        results.addErrorMessage(xtFile, "Failed to load extensions:" + ex.getMessage());
+        results.addErrorMessage(xtFile, "Failed to load extension(s): " + ex.getMessage());
       }
       log.error("Failed to load extensions from file: " + xtFile, ex);
@@ -218 +219 @@
       ExtensionsFile xtFile = wFile.getExtensionsFile();
 
-      // NOTE! Do not register files with an error
-      if (xtFile.hasError())
-      {
-        log.debug("Skipping file with error: " + xtFile);
-        continue; // with the next file
-      }
-      
       if (!forceUpdate && (!xtFile.wasModified() || xtFile.isNew()))
       {
         log.debug("Skipping new or unmodified file: " + xtFile);
         continue;
+      }
+
+      // Unregister all extensions if the file has an error
+      if (xtFile.hasError())
+      {
+        data.extensions = Collections.emptyList();
+        data.extensionPoints = Collections.emptyList();
       }
       
@@ -405 +406 @@
       if (forceUpdate || !registry.extensionPointIsRegistered(ep.getId()))
       {
+        log.debug("Registering extension point: " + ep);
         ExtensionPointKey key = new ExtensionPointKey(ep);
         data.writeableFile.registerObject(key, ep);
@@ -425 +427 @@
   private boolean unregisterExtensionPoint(FileData data, ExtensionPoint ep, Registry registry)
   {
+    log.debug("Unregistering extension point: " + ep);
     unregisterFactory(data, ep.getRendererFactory());
     unregisterFactory(data, ep.getErrorHandlerFactory());
@@ -444 +447 @@
       if (forceUpdate || !registry.extensionIsRegistered(ext.getId()))
       {
+        log.debug("Registering extension: " + ext);
         ExtensionKey key = new ExtensionKey(ext);
         data.writeableFile.registerObject(key, ext);
@@ -464 +468 @@
   private boolean unregisterExtension(FileData data, Extension ext, Registry registry)
   {
+    log.debug("Unregistering extension: " + ext);
     unregisterFactory(data, ext.getRendererFactory());
     unregisterFactory(data, ext.getActionFactory());

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

@@ -25 +25 @@
 import net.sf.basedb.util.extensions.ExtensionPoint;
 import net.sf.basedb.util.extensions.Registry;
+import net.sf.basedb.util.extensions.manager.ExtensionKey;
+import net.sf.basedb.util.extensions.manager.ExtensionPointKey;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile;
 import net.sf.basedb.util.extensions.manager.ExtensionsFileProcessor;
 import net.sf.basedb.util.extensions.manager.ExtensionsManager;
+import net.sf.basedb.util.extensions.manager.FactoryParametersKey;
 import net.sf.basedb.util.extensions.manager.ProcessResults;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile.WriteableExtensionsFile;
@@ -85 +88 @@
     try
     {
+      wFile.open();
       int num = 0;
       Registry registry = manager.getRegistry();
       for (ExtensionPoint ep : xtFile.getObjectsOfClass(ExtensionPoint.class))
       {
-        registry.unregisterExtensionPoint(ep.getId());
+        unregisterExtensionPoint(wFile, ep, registry);
         num++;
       }
       for (Extension ext : xtFile.getObjectsOfClass(Extension.class))
       {
-        registry.unregisterExtension(ext.getId());
+        unregisterExtension(wFile, ext, registry);
         num++;
       }
@@ -101 +105 @@
       if (results != null)
       {
-        results.setStatus(xtFile, "Deleted");
-        results.addMessage(xtFile, num + " extensions unregisterered.");
+        if (!xtFile.exists()) results.setStatus(xtFile, "Deleted");
+        if (num > 0) results.addMessage(xtFile, num + " extension(s) unregisterered.");
       }
       log.info("Unregistered  " + num + " extensions from file: " + xtFile);
@@ -115 +119 @@
       }
       log.error("Could not unregister extensions in file: " + xtFile, ex);
+    }
+    finally
+    {
+      wFile.close();
     }
   }
@@ -132 +140 @@
   {}
   // ----------------------------------------------------
+  
+  /**
+    Unregister the given extension including factory metadata etc.
+  */
+  private void unregisterExtension(WriteableExtensionsFile wFile, Extension ext, Registry registry)
+  {
+    unregisterFactory(wFile, ext.getRendererFactory());
+    unregisterFactory(wFile, ext.getActionFactory());
+    ExtensionKey key = new ExtensionKey(ext);
+    wFile.unregisterObject(key);
+    registry.unregisterExtension(ext.getId());
+  }
+
+  /**
+    Unregister the given extension point including factory metadata etc.
+  */
+  private void unregisterExtensionPoint(WriteableExtensionsFile wFile, ExtensionPoint ep, Registry registry)
+  {
+    unregisterFactory(wFile, ep.getRendererFactory());
+    unregisterFactory(wFile, ep.getErrorHandlerFactory());
+    ExtensionPointKey key = new ExtensionPointKey(ep);
+    wFile.unregisterObject(key);
+    registry.unregisterExtensionPoint(ep.getId());
+  }
+  
+  private void unregisterFactory(WriteableExtensionsFile wFile, Object factory)
+  {
+    if (factory == null) return;
+    wFile.unregisterMetadata(new FactoryParametersKey(factory));
+  }
+
   
   /**

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

@@ -41 +41 @@
 import org.jdom.output.XMLOutputter;
 
+import net.sf.basedb.core.BaseException;
 import net.sf.basedb.core.InvalidUseOfNullException;
 import net.sf.basedb.core.StringUtil;
+import net.sf.basedb.core.Version;
 import net.sf.basedb.core.plugin.About;
 import net.sf.basedb.util.ClassUtil;
@@ -273 +275 @@
     lastName = filename;
     About globalAbout = loadGlobalAbout(validatedDom);
+    verifyBaseVersion(globalAbout, true);
     return globalAbout;
   }
@@ -444 +447 @@
   {
     log.debug("Validating file: " + filename);
-    return XMLUtil.getSchemaValidatedXML(xmlFile, filename, namespace, schemaFileURL);
+    Document dom = XMLUtil.getSchemaValidatedXML(xmlFile, filename, namespace, schemaFileURL);
+    return dom;
+  }
+  
+  protected boolean verifyBaseVersion(About about, boolean throwException)
+  {
+    if (about == null) return true;
+    String minVersion = about.getMinBaseVersion();
+    String maxVersion = about.getMaxBaseVersion();
+    if (minVersion != null && Version.compareWith(minVersion) > 0)
+    {
+      if (throwException)
+      {
+        throw new BaseException("BASE version "+ minVersion + " or higher is required");
+      }
+      return false;
+    }
+    if (maxVersion != null && Version.compareWith(maxVersion) <= 0)
+    {
+      if (throwException)
+      {
+        throw new BaseException("BASE version "+ maxVersion + " or higher is not supported");
+      }
+      return false;
+    }
+    return true;
   }
   
@@ -472 +500 @@
       about.setDescription(Values.getStringOrNull(aboutTag.getChildText("description", ns)));
       about.setVersion(Values.getStringOrNull(aboutTag.getChildText("version", ns)));
+      about.setMinBaseVersion(Values.getStringOrNull(aboutTag.getChildText("min-base-version", ns)));
+      about.setMaxBaseVersion(Values.getStringOrNull(aboutTag.getChildText("max-base-version", ns)));
       about.setContact(Values.getStringOrNull(aboutTag.getChildText("contact", ns)));
       about.setCopyright(Values.getStringOrNull(aboutTag.getChildText("copyright", ns)));
@@ -672 +702 @@
           about.copy(globalAbout, false);
         }
-  
-        // <action-factory>
-        Element afTag = epTag.getChild("action-factory", ns);
-        ActionFactory af = null;
-        if (afTag != null)
+        
+        if (!verifyBaseVersion(about, false))
         {
-          af = createFactory(afTag, classLoader, ActionFactory.class);
+          String min = about.getMinBaseVersion();
+          String max = about.getMaxBaseVersion();
+          log.info("Extension '" + id + "' require BASE version between " + 
+            (min == null ? "*" : min) + " and " + (max == null ? "*" : max) 
+          );
         }
-      
-        // <renderer-factory>
-        Element rfTag = epTag.getChild("renderer-factory", ns);
-        RendererFactory rf = null;
-        if (rfTag != null)
+        else
         {
-          rf = createFactory(rfTag, classLoader, RendererFactory.class);
-        }
+          // <action-factory>
+          Element afTag = epTag.getChild("action-factory", ns);
+          ActionFactory af = null;
+          if (afTag != null)
+          {
+            af = createFactory(afTag, classLoader, ActionFactory.class);
+          }
         
-        String commonIdPrefix = null;
-        if (extensionPoints.size() > 1)
-        {
-          // We need to calculate the common id prefix for the extension points
-          // so that we can create unique extension id:s
-          commonIdPrefix = StringUtil.getCommonPrefix(extensionPoints);
-        }
-        
-        for (int i = 0; i < extensionPoints.size(); ++i)
-        {
-          epId = extensionPoints.get(i);
-          float index = indexes.get(i);
-          ExtensionBean<Action> ext = new ExtensionBean<Action>();
-          temp.add(ext);
-          numLoaded++;
-          
-          String thisId = id;
-          if (commonIdPrefix != null)
+          // <renderer-factory>
+          Element rfTag = epTag.getChild("renderer-factory", ns);
+          RendererFactory rf = null;
+          if (rfTag != null)
           {
-            thisId += ":" + epId.substring(commonIdPrefix.length());
+            rf = createFactory(rfTag, classLoader, RendererFactory.class);
           }
           
-          ext.setId(thisId);
-          ext.setExtends(epId);
-          ext.setIndex(index);
-          ext.setAbout(about);
-          ext.setActionFactory(af);
-          ext.setRendererFactory(rf);
+          String commonIdPrefix = null;
+          if (extensionPoints.size() > 1)
+          {
+            // We need to calculate the common id prefix for the extension points
+            // so that we can create unique extension id:s
+            commonIdPrefix = StringUtil.getCommonPrefix(extensionPoints);
+          }
+          
+          for (int i = 0; i < extensionPoints.size(); ++i)
+          {
+            epId = extensionPoints.get(i);
+            float index = indexes.get(i);
+            ExtensionBean<Action> ext = new ExtensionBean<Action>();
+            temp.add(ext);
+            numLoaded++;
+            
+            String thisId = id;
+            if (commonIdPrefix != null)
+            {
+              thisId += ":" + epId.substring(commonIdPrefix.length());
+            }
+            
+            ext.setId(thisId);
+            ext.setExtends(epId);
+            ext.setIndex(index);
+            ext.setAbout(about);
+            ext.setActionFactory(af);
+            ext.setRendererFactory(rf);
+          }
         }
       }

trunk/src/info/net/sf/basedb/info/VersionInfo.java

@@ -35 +35 @@
   private static final long serialVersionUID = 9189853948028180946L;
 
-  private String major;
-  private String minor;
-  private String maintenance;
+  private int major;
+  private int minor;
+  private int maintenance;
   private int build;
   private int schema;
@@ -64 +64 @@
     @return Returns the maintenance version
     @see net.sf.basedb.core.Application#getMaintenanceVersion()
+    @since 3.0 (was returning a String in 2.x)
   */
-  public String getMaintenance()
+  public int getMaintenance()
   {
     return maintenance;
   }
 
-  public void setMaintenance(String maintenance) 
+  public void setMaintenance(int maintenance) 
   {
     this.maintenance = maintenance;
@@ -78 +79 @@
     @return Returns the major version
     @see net.sf.basedb.core.Application#getMajorVersion()
+    @since 3.0 (was returning a String in 2.x)
   */
-  public String getMajor() 
+  public int getMajor() 
   {
     return major;
   }
 
-  public void setMajor(String major) 
+  public void setMajor(int major) 
   {
     this.major = major;
@@ -92 +94 @@
     @return Returns the minor version
     @see net.sf.basedb.core.Application#getMinorVersion()
+    @since 3.0 (was returning a String in 2.x)
   */
-  public String getMinor() 
+  public int getMinor() 
   {
     return minor;
   }
 
-  public void setMinor(String minor) 
+  public void setMinor(int minor) 
   {
     this.minor = minor;

trunk/www/admin/extensions/details.jsp

@@ -463 +463 @@
               List<String> messages = fileResults.getMessages();
               Throwable validationError = file.getValidationError();
+              %>
+              <ul style="padding-left: 20px; margin: 0px; text-align: left;" class="error">
+              <%
+              if (validationError != null)
+              {
+                %>
+                <li><%=validationError.getClass().getSimpleName()%>: <%=HTML.niceFormat(validationError.getMessage())%>
+                <%
+              }
               for (String msg : messages)
               {
@@ -469 +478 @@
                 <%
               }
-              if (validationError != null)
-              {
-                %>
-                <li><%=HTML.niceFormat(validationError.getMessage())%>
-                <%
-              }
+              %>
+              </ul>
+              <%
             }
             else

trunk/www/admin/extensions/index.jsp

@@ -34 +34 @@
   import="net.sf.basedb.util.extensions.Extension"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
-  import="net.sf.basedb.clients.web.extensions.ExtensionsFile"
   import="java.util.List"
 %>

trunk/www/admin/extensions/scan_results.jsp

@@ -109 +109 @@
     {
       ExtensionsFile extFile = fileResults.getExtensionsFile();
-      boolean isError = fileResults.hasError();
       String detailsId = Integer.toString(extFile.hashCode());
       List<String> messages = fileResults.getMessages();
-      boolean hasMessages = messages != null && messages.size() > 0;
       Throwable validationError = extFile.getValidationError();
+      boolean hasMessages = (messages != null && messages.size() > 0) || validationError != null;
       %>
       <tr>
         <td class="prompt"><%=extFile.getName() %></td>
-        <td><%=isError ? "Error" : fileResults.getStatus() %>
+        <td><%=fileResults.getStatus() %>
         <base:icon 
           id="<%="icon." + detailsId %>" 
@@ -123 +122 @@
           onclick="<%="showDetails('" + detailsId + "')" %>" 
           visible="<%=hasMessages%>"
-          />
+        />
         </td>
       </tr>
       <%
-      if (hasMessages || validationError != null)
+      if (hasMessages)
       {
         %>
         <tr id="details.<%=detailsId %>" style="display:none;">
           <td></td><td>
+          <ul style="padding-left: 20px; margin: 0px; text-align: left;">
           <%
           for (String msg : messages)
@@ -142 +142 @@
           {
             %>
-            <li><%=HTML.niceFormat(validationError.getMessage())%>
+            <li><%=validationError.getClass().getSimpleName()%>: <%=HTML.niceFormat(validationError.getMessage())%>
             <%
           }
           %>
+          </ul>
           </td>
         </tr>