Changeset 5606

Timestamp:

Apr 14, 2011, 9:45:23 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...

Servlets are now processed and loaded by the extensions system. Moved handling of settings to the core. Removed classes that are no longer used.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (15 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsDirectory.java (deleted)
• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsFile.java (deleted)
• src/clients/web/net/sf/basedb/clients/web/extensions/LoadServletsProcessor.java (added)
• src/clients/web/net/sf/basedb/clients/web/extensions/ScanResults.java (deleted)
• src/clients/web/net/sf/basedb/clients/web/extensions/ServletWrapperKey.java (added)
• src/clients/web/net/sf/basedb/clients/web/extensions/service/Services.java (modified) (5 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/service/ServicesEventHandler.java (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/servlet/ExtensionsServlet.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/Registry.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionKey.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionPointKey.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/extensions/manager/ExtensionsManager.java (modified) (17 diffs)
• src/core/net/sf/basedb/util/extensions/manager/FactoryParametersKey.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/ObjectKey.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/extensions/manager/Settings.java (moved) (moved from trunk/src/clients/web/net/sf/basedb/clients/web/extensions/Settings.java) (8 diffs)
• src/core/net/sf/basedb/util/extensions/manager/processor/RegisterExtensionsProcessor.java (modified) (7 diffs)
• src/core/net/sf/basedb/util/uri/ConnectionManagerUtil.java (modified) (2 diffs)
• www/admin/extensions/details.jsp (modified) (1 diff)
• www/admin/extensions/index.jsp (modified) (1 diff)

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

@@ -39 +39 @@
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.Client;
-import net.sf.basedb.core.Config;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Permission;
@@ -53 +52 @@
 import net.sf.basedb.util.extensions.Registry;
 import net.sf.basedb.util.extensions.events.EventType;
+import net.sf.basedb.util.extensions.manager.ExtensionKey;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile;
 import net.sf.basedb.util.extensions.manager.ExtensionsManager;
 import net.sf.basedb.util.extensions.manager.ObjectKey;
 import net.sf.basedb.util.extensions.manager.ProcessResults;
+import net.sf.basedb.util.extensions.manager.Settings;
 import net.sf.basedb.util.extensions.manager.filter.DeletedFilter;
 import net.sf.basedb.util.extensions.manager.filter.ValidAndNewOrModifiedFilter;
 import net.sf.basedb.util.extensions.manager.processor.DeleteResourcesProcessor;
 import net.sf.basedb.util.extensions.manager.processor.ExtractResourcesProcessor;
-import net.sf.basedb.util.extensions.manager.processor.MarkAsProcessedProcessor;
 import net.sf.basedb.util.extensions.manager.processor.UnregisterExtensionsProcessor;
+import net.sf.basedb.util.extensions.xml.ExtensionPointFilter;
 
 /**
@@ -118 +119 @@
   private static boolean initialised = false;
   
-  // The registry that holds information about installed extensions
+  // The main extensions manager, registry and settings
+  private static ExtensionsManager manager;
   private static Registry registry;
-  
-  // The main extensions manager
-  private static ExtensionsManager manager;
-  
-  // The directory where extension files are located
-  //private static ExtensionsDirectory extensionsDir;
-  
-  // Settings
   private static Settings settings;
   
@@ -144 +138 @@
     if (initialised) return;
     log.info("Initialising extensions controller");
-    //extensionsDir = directory;
     servletContext = context;
     
-    // Create registry
+    // Hook into core manager and registry
     manager = Application.getExtensionsManager();
-    registry = Application.getExtensionsManager().getRegistry();
+    registry = manager.getRegistry();
+    settings = manager.getSettings();
     
     // Register some extension points programmatically. This
@@ -157 +151 @@
     EditUtil.registerExtensionPoints(registry); // TabControls
     
+    // Add default web-client extension points and extensions
     manager.addURI(URI.create(ExtensionsControl.class.getResource("/web-extensions.xml").toString()));
 
-    // Load settings
-    File settingsFile = new File(Config.getConfigDirectory(), "settings.xml");
-    settings = new Settings(settingsFile);
-    //extensionsDir.addIgnore(settingsFile);
-    
     // Install extensions
-    //XmlLoader loader = new XmlLoader();
     lastScanResults = new ProcessResults(false, false);
     
-    // Filter that only load web extension points
-    //loader.setFilter(new ExtensionPointFilter("net\\.sf\\.basedb\\.clients\\.web\\..*"));
-
-    /*
-    final VariableConverter variableConverter = new VariableConverter();
-    variableConverter.setVariable("ROOT", servletContext.getContextPath());
-    variableConverter.setVariable("HOME", null);
-    variableConverter.setVariable("SERVLET_HOME", null);    
-    final PathConverter pathConverter = new PathConverter(servletContext.getContextPath(), null);
-
-    loader.addValueConverter(variableConverter);
-    loader.addValueConverter(pathConverter);
-    */
-
-    /*
-    manager.processFiles(new RegisterExtensionsProcessor(loader, false, lastScanResults)
-    {
-
-      @Override
-      public void processFile(ExtensionsManager manager,
-          WriteableExtensionsFile xtFile)
-      {
-        String homePath = servletContext.getContextPath() + RESOURCES_URL + "/" + xtFile.getExtensionsFile().getName();
-        //String servletHomePath = getServletsUrl(extFile);
-        variableConverter.setVariable("HOME", homePath);
-        //variableConverter.setVariable("SERVLET_HOME", servletHomePath);
-        pathConverter.setHome(homePath);
-
-        super.processFile(manager, xtFile);
-      }
-    });
-    */
-//    manager.processFiles(new ExtractResourcesProcessor(new java.io.File(servletContext.getRealPath(RESOURCES_URL)), false, Pattern.compile("resources/(.*)"), "$1", lastScanResults));
-    //lastScanResults = new ScanResults(true, false);
-    /*
-    lastScanResults = extensionsDir.installAndUpdateExtensions(registry, 
-      servletContext, false, false);
-    */
-    
+    // Initial scan
     scan(true, false);
-
     initialised = true;
     
-    Services.init(registry, settings);
+    Services.init();
     log.info("Extensions controller initialised successfully");
   }
@@ -225 +175 @@
     Services.close();
     registry = null;
-    //extensionsDir = null;
-    settings = null;
     servletContext = null;
     lastScanResults = null;
@@ -234 +182 @@
   
   
-  private static synchronized ProcessResults scan(boolean initialScan, boolean forceUpdate)
+  private static ProcessResults scan(boolean initialScan, boolean forceUpdate)
   {
     String rootPath = servletContext.getContextPath();
@@ -251 +199 @@
     int numRegistered = 0;
     
-    if (!initialScan)
-    {
-      // 1. Process files that has been deleted
-      DeletedFilter deleted = new DeletedFilter();
+    synchronized (manager)
+    {
+      if (!initialScan)
+      {
+        // 1. Process files that has been deleted
+        DeletedFilter deleted = new DeletedFilter();
+        
+        // 1a. Remove resources extracted from JAR files
+        DeleteResourcesProcessor deleteResources = new DeleteResourcesProcessor(resourceDir, results);
+        manager.processFiles(deleteResources, deleted);
+        
+        // 1b. Unregister all extensions from deleted files
+        UnregisterExtensionsProcessor unregister = new UnregisterExtensionsProcessor(results);
+        manager.processFiles(unregister, deleted);
+        numUnregistered = unregister.getNumUnregistered();
+      }
       
-      // 1a. Remove resources extracted from JAR files
-      DeleteResourcesProcessor deleteResources = new DeleteResourcesProcessor(resourceDir, results);
-      manager.processFiles(deleteResources, deleted);
+      // 2. Update the manager with new and modified files
+      manager.scanForNewAndUpdated();
+      numNewFiles = manager.getNumNew();
+      numModifiedFiles = manager.getNumModified();
+      numDeletedFiles = manager.getNumDeleted();
       
-      // 1b. Unregister all extensions from deleted files
-      UnregisterExtensionsProcessor unregister = new UnregisterExtensionsProcessor(results);
-      manager.processFiles(unregister, deleted);
-      numUnregistered = unregister.getNumUnregistered();
-    }
-    
-    // 2. Update the manager with new and modified files
-    manager.scanForNewAndUpdated();
-    numNewFiles = manager.getNumNew();
-    numModifiedFiles = manager.getNumModified();
-    numDeletedFiles = manager.getNumDeleted();
-    
-    if (initialScan || numNewFiles > 0 || numModifiedFiles > 0 || forceUpdate)
-    {
-      // Process files that are valid and new/updated (unless forceUpdate=true)
-      ValidAndNewOrModifiedFilter valid = new ValidAndNewOrModifiedFilter(initialScan || forceUpdate);
+      if (initialScan || numNewFiles > 0 || numModifiedFiles > 0 || forceUpdate)
+      {
+        // Process files that are valid and new/updated (unless forceUpdate=true)
+        ValidAndNewOrModifiedFilter valid = new ValidAndNewOrModifiedFilter(initialScan || forceUpdate);
+        
+        // 3. Load extension definitions
+        WebClientRegisterExtensionsProcessor registerExtensions = 
+          new WebClientRegisterExtensionsProcessor(rootPath, rootPath + RESOURCES_URL, rootPath + SERVLET_URL, results);
+        registerExtensions.setForceUpdate(forceUpdate);
+        if (initialScan)
+        {
+          // Filter that only load web extension points
+          registerExtensions.getXmlLoader().setFilter(new ExtensionPointFilter("net\\.sf\\.basedb\\.clients\\.web\\..*"));
+        }
+        manager.processFiles(registerExtensions, valid);
+
+        // 4. Extract web resources
+        ExtractResourcesProcessor extractResources = new ExtractResourcesProcessor(resourceDir, Pattern.compile("resources/(.*)"), "$1", results);
+        extractResources.setForceOverwrite(forceUpdate);
+        manager.processFiles(extractResources, valid);
+
+        // 5. Servlets
+        LoadServletsProcessor loadServlets = new LoadServletsProcessor(servletContext, results);
+        manager.processFiles(loadServlets, valid);
+        
+        // 6. Actual registration of all extensions
+        registerExtensions.finalizeRegistration(manager);
+        numRegistered = registerExtensions.getNumRegistered();
+      }
       
-      // 3. Load extension definitions
-      WebClientRegisterExtensionsProcessor registerExtensions = 
-        new WebClientRegisterExtensionsProcessor(rootPath, rootPath + RESOURCES_URL, rootPath + SERVLET_URL, results);
-      registerExtensions.setForceUpdate(forceUpdate);
-      manager.processFiles(registerExtensions, valid);
-
-      // 4. Extract web resources
-      ExtractResourcesProcessor extractResources = new ExtractResourcesProcessor(resourceDir, Pattern.compile("resources/(.*)"), "$1", results);
-      extractResources.setForceOverwrite(forceUpdate);
-      manager.processFiles(extractResources, valid);
-
-      // 5. Servlets
-      
-      // 6. Actual registration of all extensions
-      registerExtensions.finalizeRegistration(manager);
-      numRegistered = registerExtensions.getNumRegistered();
-    }
-    
-    // Reset the 'last modifed' status of all files and generated summary per file
-    manager.processFiles(new SetFileStatusProcessor(results));
-    results.setEnded();
+      // Reset the 'last modifed' status of all files and generated summary per file
+      manager.processFiles(new SetFileStatusProcessor(results));
+      results.setEnded();
+    }
     
     // Generate summary message, etc.
@@ -422 +380 @@
   public static String getHomeUrl(String extensionId)
   {
-    return null;
-    //return file == null ? null : extensionsDir.getResourcesUrl(file);
+    ExtensionsFile xtFile = manager.getFileByObjectKey(new ExtensionKey(extensionId));
+    return xtFile == null ? null : servletContext.getContextPath() + RESOURCES_URL + "/" + xtFile.getName();
   }
   
   /**
     Get the base URL for servlets in the extension with the given ID. The
-    URL is a local absolute UTL, eg. it includes the full path but not the
+    URL is a local absolute URL, eg. it includes the full path but not the
     protocol, server or port. The URL is usually something like:
     <p>
@@ -446 +404 @@
   public static String getServletUrl(String extensionId, String servletName)
   {
-    //ExtensionsFile file = extensionsDir.getFileByExtensionId(extensionId);
+    ExtensionsFile xtFile = manager.getFileByObjectKey(new ExtensionKey(extensionId));
     String servletPath = null;
-    /*
-    if (file != null)
-    {
-      servletPath = extensionsDir.getServletsUrl(file) + "/" + servletName;
-    }
-    */
+    if (xtFile != null)
+    {
+      servletPath = servletContext.getContextPath() + SERVLET_URL + "/" + xtFile.getName() + "/" + servletName;
+    }
     return servletPath;
   }
@@ -521 +477 @@
   /**
     Get the results of the last scan (manual or automatic).
-    @return A {@link ScanResults} object, or null if no scan
+    @return A {@link ProcessResults} object, or null if no scan
       has taken place
   */
@@ -701 +657 @@
   
   /**
-    Get information about the file a given extension or extension
-    point is defined in.
-    @param extensionId The ID of an extension or extension point
-    @return Information about the file the extension is defined in,
-      or null if no extension with the given ID is found
+    Find out which file the given object is defined in. 
+    
+    @param key An object key
+    @return Information about the file, or null if
+      the object can't be found
   */
   public ExtensionsFile getFileByObjectKey(ObjectKey key)
@@ -716 +672 @@
     If no file with the given name is found or if that file isn't an
     extensions file, nothing is done.
-    @param filename The filename which contains the extensions
+    @param fileuri The fileuri which contains the extensions
     @param enable TRUE to enable, FALSE to disable
   */
-  public void enableAllInFile(String filename, boolean enable)
-  {
-    checkPermission(Permission.WRITE, "File[" + filename + "]");
-    /*
-    ExtensionsFile file = null; //getFile(filename);
+  public void enableAllInFile(String fileuri, boolean enable)
+  {
+    checkPermission(Permission.WRITE, "File[" + fileuri + "]");
+
+    ExtensionsFile file = getFile(fileuri);
     if (file == null) 
     {
-      log.warn("File '" + filename + "' is not an extensions file");
+      log.warn("File '" + fileuri + "' is not an extensions file");
       return;
     }
     
-    Iterator<ExtensionPoint<?>> itp = file.getExtensionPoints();
-    while (itp.hasNext())
-    {
-      ExtensionPoint<?> ep = itp.next();
+    for (ExtensionPoint ep : file.getObjectsOfClass(ExtensionPoint.class))
+    {
       if (!enable) registry.handleEvent(BEFORE_DISABLE, ep, null);
       settings.enableExtensionPoint(ep.getId(), enable);
@@ -739 +693 @@
     }
 
-    Iterator<Extension<?>> itx = file.getExtensions();
-    while (itx.hasNext())
-    {
-      Extension<?> ext = itx.next();
+    for (Extension ext : file.getObjectsOfClass(Extension.class))
+    {
       ExtensionPoint ep = getExtensionPoint(ext.getExtends());
       if (!enable) registry.handleEvent(BEFORE_DISABLE, ep, ext);
@@ -748 +700 @@
       if (enable) registry.handleEvent(AFTER_ENABLE, ep, ext);
     }
-    */
   }
   

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/Services.java

@@ -23 +23 @@
 
 import net.sf.basedb.clients.web.extensions.ExtensionsControl;
-import net.sf.basedb.clients.web.extensions.Settings;
+import net.sf.basedb.core.Application;
 import net.sf.basedb.util.extensions.Extension;
 import net.sf.basedb.util.extensions.ExtensionsFilter;
 import net.sf.basedb.util.extensions.ExtensionsInvoker;
-import net.sf.basedb.util.extensions.Registry;
 import net.sf.basedb.util.extensions.SingleExtensionFilter;
 import net.sf.basedb.util.extensions.events.ExtensionPointEventFilter;
+import net.sf.basedb.util.extensions.manager.ExtensionsManager;
 
 /**
@@ -47 +47 @@
   
   private static boolean initialised;
-  private static Settings settings;
   
   /**
@@ -53 +52 @@
     is started up.
   */
-  public static synchronized void init(Registry registry, Settings s)
+  public static synchronized void init()
   {
     if (initialised) return;
     log.info("Initialising services");
-    settings = s;
+    ExtensionsManager manager = Application.getExtensionsManager();
     ExtensionsInvoker<ServiceControllerAction> invoker = getInvoker(null);
     invoker.render(new StartServiceRenderer());
-    registry.registerEventHandler(
-        new ServicesEventHandler(settings), 
+    manager.getRegistry().registerEventHandler(
+        new ServicesEventHandler(), 
         new ExtensionPointEventFilter(EXTENSION_POINT_ID));
     log.info("Initialising services done");
@@ -77 +76 @@
     ExtensionsInvoker<ServiceControllerAction> invoker = getInvoker(null);
     invoker.render(new StopServiceRenderer());
-    settings = null;
     initialised = false;
     log.info("Closing all services done");
@@ -114 +112 @@
   {
     ExtensionsFilter filter = extension == null ?
-        settings : new SingleExtensionFilter(extension.getId());
+        Application.getExtensionsManager().getSettings() : new SingleExtensionFilter(extension.getId());
     ExtensionsInvoker<?> invoker = ExtensionsControl.useExtensions(null, filter, EXTENSION_POINT_ID);
     invoker.setClearErrors(true);

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/ServicesEventHandler.java

@@ -23 +23 @@
 
 import net.sf.basedb.clients.web.extensions.ExtensionsControl;
-import net.sf.basedb.clients.web.extensions.Settings;
+import net.sf.basedb.core.Application;
 import net.sf.basedb.util.extensions.Extension;
 import net.sf.basedb.util.extensions.ExtensionPoint;
 import net.sf.basedb.util.extensions.events.EventHandler;
 import net.sf.basedb.util.extensions.events.EventType;
+import net.sf.basedb.util.extensions.manager.Settings;
 
 /**
@@ -44 +45 @@
     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.service.ServicesEventHandler");
 
-  private Settings settings;
+  private final Settings settings;
   
-  public ServicesEventHandler(Settings settings)
+  public ServicesEventHandler()
   {
-    this.settings = settings;
+    this.settings = Application.getExtensionsManager().getSettings();
   }
   

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/ExtensionsServlet.java

@@ -21 +21 @@
 package net.sf.basedb.clients.web.servlet;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.regex.Matcher;
@@ -34 +33 @@
 
 import net.sf.basedb.clients.web.extensions.ExtensionsControl;
-import net.sf.basedb.clients.web.extensions.ExtensionsDirectory;
-import net.sf.basedb.clients.web.extensions.ExtensionsFile;
 import net.sf.basedb.clients.web.extensions.RequestWrapper;
 import net.sf.basedb.clients.web.extensions.ServletWrapper;
+import net.sf.basedb.clients.web.extensions.ServletWrapperKey;
 import net.sf.basedb.util.Values;
+import net.sf.basedb.util.extensions.manager.ExtensionsFile;
 
 /**
@@ -74 +73 @@
     ServletConfig cfg = getServletConfig();
     ServletContext context = cfg.getServletContext();
-    /*
-    File extensionsDir = new File(context.getRealPath(ExtensionsControl.EXTENSIONS_URL));
-    File resourcesDir = new File(context.getRealPath(ExtensionsControl.RESOURCES_URL));
-    String rootUrl = context.getContextPath();
-    
-    ExtensionsDirectory extensions = new ExtensionsDirectory(
-        extensionsDir, resourcesDir, rootUrl, rootUrl + ExtensionsControl.RESOURCES_URL);
-    */
     ExtensionsControl.init(context);
   }
@@ -134 +125 @@
 
     ExtensionsControl ec = ExtensionsControl.get(null);
-    ExtensionsFile file = null; //ec.getFile(jarName);
+    ServletWrapperKey servletKey = new ServletWrapperKey(jarName, servletName);
+    ExtensionsFile file = ec.getFileByObjectKey(servletKey);
     if (file == null)
     {
@@ -146 +138 @@
     }
   
-    ServletWrapper wrapper = file.getServlet(servletName);
+    ServletWrapper wrapper = file.getObjectForKey(servletKey);
     if (wrapper == null)
     {

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

@@ -536 +536 @@
         // TODO -- should this be moved to a utility class? Probably...
         Registry xtRegistry = new Registry();
-        xtManager = new ExtensionsManager(xtRegistry);
+        java.io.File xtSettings = new java.io.File(pluginsDirectory, "settings.xml");
+        xtManager = new ExtensionsManager(xtRegistry, xtSettings);
         
         // Add core extension points and extensions

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

@@ -52 +52 @@
   @version 2.7
   @base.modified $Date:2008-03-20 12:15:25 +0100 (Thu, 20 Mar 2008) $
-  @see net.sf.basedb.clients.web.extensions.ExtensionsDirectory
 */
 public class Registry

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

@@ -60 +60 @@
   
   /*
+    From the ObjectKey interface
+    ----------------------------
+  */
+  @Override
+  public String toDescription()
+  {
+    return "Extension '" + id + "'";
+  }
+  // -----------------------------
+  
+  /*
     From the Object class
     ---------------------

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

@@ -60 +60 @@
   
   /*
+    From the ObjectKey interface
+    ----------------------------
+  */
+  @Override
+  public String toDescription()
+  {
+    return "Extension point '" + id + "'";
+  }
+  // -----------------------------
+
+  /*
     From the Object class
     ---------------------

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

@@ -689 +689 @@
     {
       checkClosed();
+      xtFile.manager.registerObject(key, this.xtFile);
       xtFile.allObjects.put(key, obj);
-      xtFile.manager.registerObject(key, this.xtFile);
     }
     
@@ -703 +703 @@
       checkClosed();
       xtFile.allObjects.remove(key);
-      xtFile.manager.unregisterObject(key);
+      xtFile.manager.unregisterObject(key, this.xtFile);
     }
     

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

@@ -36 +36 @@
 import java.util.TreeMap;
 
+import net.sf.basedb.core.ItemAlreadyExistsException;
 import net.sf.basedb.util.RegexpFileFilter;
 import net.sf.basedb.util.extensions.Registry;
@@ -56 +57 @@
     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.ExtensionsManager");
 
+  // Main registry for extensions
   private final Registry registry;
-
+  // Settings file
+  private final Settings settings;
   // Manually added ignore files
   private final Set<File> ignore;
@@ -65 +68 @@
   private final Map<URI, ExtensionsFile> xtFiles;
   // Map objects to the file they are defined in. The key is a unique object id.
-  private final Map<ObjectKey, ExtensionsFile> installedObjects;
+  private final Map<ObjectKey<?>, ExtensionsFile> installedObjects;
   
   private int numNew;
@@ -78 +81 @@
     @param registry
   */
-  public ExtensionsManager(Registry registry)
+  public ExtensionsManager(Registry registry, File settingsFile)
   {
     this.registry = registry;
+    this.settings = new Settings(this, settingsFile);
     this.ignore = new HashSet<File>();
     this.directories = new HashSet<File>();
     this.xtFiles = new TreeMap<URI, ExtensionsFile>(new JarFirstURIComparator());
-    this.installedObjects = new HashMap<ObjectKey, ExtensionsFile>();
+    this.installedObjects = new HashMap<ObjectKey<?>, ExtensionsFile>();
+    addIgnore(settingsFile);
   }
   
@@ -94 +99 @@
   {
     return registry;
+  }
+  
+  /**
+    Get the settings for the extension manager.
+  */
+  public Settings getSettings()
+  {
+    return settings;
   }
   
@@ -103 +116 @@
     @see #removeIgnore(File)
   */
-  public void addIgnore(File file)
+  public synchronized void addIgnore(File file)
   {
     if (file == null) return;
@@ -114 +127 @@
     @see #addIgnore(File)
   */
-  public void removeIgnore(File file)
+  public synchronized void removeIgnore(File file)
   {
     if (file == null) return;
@@ -130 +143 @@
       not previously known to the manager
   */
-  public int addDirectory(File dir)
+  public synchronized int addDirectory(File dir)
   {
     if (dir == null) throw new NullPointerException("dir");
@@ -147 +160 @@
     @return The extension file object representing the added file
   */
-  public ExtensionsFile addFile(File file)
+  public synchronized ExtensionsFile addFile(File file)
   {
     if (file == null) throw new NullPointerException("file");
@@ -168 +181 @@
     @return The extension file object representing the added uri
   */
-  public ExtensionsFile addURI(URI uri)
+  public synchronized ExtensionsFile addURI(URI uri)
   {
     if (uri == null) throw new NullPointerException("uri");
@@ -175 +188 @@
     return xtFile;
   }
-
-  /*
-  public void removeFile(ExtensionsFile xtFile)
-  {
-    xtFiles.remove(xtFile.getURI());
-    //ignore.remove(xtFile);
-    Iterator<ExtensionsFile> it = installedObjects.values().iterator();
-    while (it.hasNext())
-    {
-      if (it.next().equals(xtFile)) it.remove();
-    }
-  }
-  */
   
   private void addExtensionsFile(ExtensionsFile xtFile)
@@ -206 +206 @@
     @return The number of new + modified files that was found
   */
-  public int scanForNewAndUpdated()
+  public synchronized int scanForNewAndUpdated()
   {
     numNew = 0;
@@ -371 +371 @@
       or null if no object is found for the given key
   */
-  public ExtensionsFile getFileByObjectKey(ObjectKey key)
+  public ExtensionsFile getFileByObjectKey(ObjectKey<?> key)
   {
     return installedObjects.get(key);
@@ -380 +380 @@
     
     @param key The object key
-    @param xtFile The extensions file
-  */
-  void registerObject(ObjectKey key, ExtensionsFile xtFile)
-  {
-    installedObjects.put(key, xtFile);
-  }
-  
-  /**
-    Unregister an object.
+    @param xtFile The extensions file the object is defined in
+  */
+  void registerObject(ObjectKey<?> key, ExtensionsFile xtFile)
+  {
+    ExtensionsFile xtOther = installedObjects.get(key);
+    if (xtOther == null)
+    {
+      installedObjects.put(key, xtFile);
+    }
+    else
+    {
+      throw new ItemAlreadyExistsException(key.toDescription() + " is defined in '" + xtOther.getName() + "'");
+    }
+  }
+  
+  /**
+    Unregister an object. The given extensions file must match
+    be equal to the one that registered the object, otherwise
+    the unregistration is ignored.
+    
     @param key The object key
-  */
-  void unregisterObject(ObjectKey key)
-  {
-    installedObjects.remove(key);
+    @param xtFile The extensions file the object is defined in
+  */
+  void unregisterObject(ObjectKey<?> key, ExtensionsFile xtFile)
+  {
+    if (xtFile.equals(installedObjects.get(key)))
+    {
+      installedObjects.remove(key);
+    }
   }
   
@@ -408 +423 @@
   }
   
+  /**
+    Process all know file with the given processer.
+    @param processor A processor implementation, null is not allowed
+  */
   public void processFiles(ExtensionsFileProcessor processor)
   {
@@ -420 +439 @@
       limit which files are sent to the processor
   */
-  public void processFiles(ExtensionsFileProcessor processor, Filter<ExtensionsFile> filter)
+  public synchronized void processFiles(ExtensionsFileProcessor processor, Filter<ExtensionsFile> filter)
   {
     if (processor == null) throw new NullPointerException("processor");
@@ -479 +498 @@
   }
   
+  /**
+    Compare URI:s so that 'jar:' scheme always are listed first. This means
+    that the core defintion files are always displayed before any external
+    extensions.
+  */
   public static class JarFirstURIComparator
     implements Comparator<URI>

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

@@ -58 +58 @@
   
   /*
+    From the ObjectKey interface
+    ----------------------------
+  */
+  @Override
+  public String toDescription()
+  {
+    return "Factory '" + factory + "'";
+  }
+  // -----------------------------
+
+  
+  /*
     From the Object class
     ---------------------

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

@@ -32 +32 @@
   <p>
   
-  This interface doesn't have any methods. It is up to the 
-  actual implementations to decide what actually makes up
-  a key that can be used to identify an object. Implementors
+  It is up to the actual implementations to decide what actually 
+  makes up a key that can be used to identify an object. Implementors
   of this interface should implement <code>equals()</code> and
   <code>hashCode()</code> methods to only match with it's
@@ -47 +46 @@
 */
 public interface ObjectKey<O>
-{}
+{
+  /**
+    Get a string description of the key that is suitable for use
+    in (error) messages to users.
+  */
+  public String toDescription();
+}

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

@@ -20 +20 @@
   along with BASE. If not, see <http://www.gnu.org/licenses/>.
 */
-package net.sf.basedb.clients.web.extensions;
+package net.sf.basedb.util.extensions.manager;
 
 import java.io.BufferedInputStream;
@@ -40 +40 @@
 /**
   Class for keeping settings for the extensions system. Settings
-  are kept in the file <code>WEB-INF/extensions/settings.xml</code>.
+  are kept in the <code>settings.xml</code> file in the plug-ins
+  directory.
   <p>
 
@@ -64 +65 @@
 {
   
-  //private static final String AUTO_INSTALL = "auto-install";
-
-  //private final ExtensionsDirectory directory;
   private final File file;
+  private final ExtensionsManager manager;
   private boolean hasChanged;
   private Presets presets;
@@ -78 +77 @@
     it will be created if {@link #save()} is called. The settings file
     must be an XML file that can be read by the {@link Presets} class.
-    @param file The file to load/save settings in
+    @param file The file to load/save settings in. If null, settings only are 
+      kept in memory and are lost when the server is shutdown.
   */
-  public Settings(File file)
+  Settings(ExtensionsManager manager, File file)
   {
-//    this.directory = directory;
+    this.manager = manager;
     this.file = file;
     this.presets = new Presets();
-    if (file.exists())
+    if (file != null && file.isFile())
     {
       try
@@ -112 +112 @@
   {
     if (extensionPoint == null) return false;
-    //ExtensionsFile extFile = directory.getFileByExtensionId(extensionPoint.getId());
-    //if (extFile != null && (extFile.hasError() || !extFile.isValid())) return false;
+    ExtensionsFile xtFile = manager.getFileByObjectKey(new ExtensionPointKey(extensionPoint));
+    if (xtFile != null && (xtFile.hasError() || !xtFile.isValid())) return false;
     return disabledExtensionPoints.getSetting(extensionPoint.getId()) == null;
   }
@@ -121 +121 @@
   {
     if (extension == null) return false;
-    //ExtensionsFile extFile = directory.getFileByExtensionId(extension.getId());
-    //if (extFile != null && (extFile.hasError() || !extFile.isValid())) return false;
+    ExtensionsFile xtFile = manager.getFileByObjectKey(new ExtensionKey(extension));
+    if (xtFile != null && (xtFile.hasError() || !xtFile.isValid())) return false;
     return disabledExtensions.getSetting(extension.getId()) == null;
   }
@@ -155 +155 @@
   public synchronized void save()
   {
-    if (!hasChanged) return;
+    if (!hasChanged || file == null) return;
     try
     {
@@ -166 +166 @@
       throw new RuntimeException(ex);
     }
-    hasChanged = true;
+    hasChanged = false;
   }
 }

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

@@ -27 +27 @@
 
 import net.sf.basedb.util.FileUtil;
-import net.sf.basedb.util.extensions.Action;
 import net.sf.basedb.util.extensions.Extension;
 import net.sf.basedb.util.extensions.ExtensionPoint;
@@ -122 +121 @@
       FileData data = new FileData();
       data.writeableFile = wFile;
-      data.extensionPoints = new ArrayList<ExtensionPoint>(loader.getExtensionPoints());
-      data.extensions = new ArrayList<Extension>(loader.getExtensions());
+      data.extensionPoints = new ArrayList<ExtensionPoint<?>>(loader.getExtensionPoints());
+      data.extensions = new ArrayList<Extension<?>>(loader.getExtensions());
       numFiles++;
       log.info("Loaded " + data.extensionPoints.size() + "/" + data.extensions.size() + 
@@ -309 +308 @@
         {
           results.addErrorMessage(xtFile, 
-            "Could not register extension points: " + ex.getMessage());
+            "Could not register extension point(s): " + ex.getMessage());
         }
         log.error("Could not register extension points from file: " + xtFile, ex);
@@ -350 +349 @@
         {
           results.addErrorMessage(xtFile, 
-            "Could not register extension points: " + ex.getMessage());
+            "Could not register extension(s): " + ex.getMessage());
         }
         log.error("Could not register extension points from file: " + xtFile, ex);
@@ -402 +401 @@
   {
     int numRegistered = 0;
-    for (ExtensionPoint<Action> ep : data.extensionPoints)
+    for (ExtensionPoint<?> ep : data.extensionPoints)
     {
       if (forceUpdate || !registry.extensionPointIsRegistered(ep.getId()))
@@ -441 +440 @@
   {
     int numRegistered = 0;
-    for (Extension<Action> ext : data.extensions)
+    for (Extension<?> ext : data.extensions)
     {
       if (forceUpdate || !registry.extensionIsRegistered(ext.getId()))
@@ -503 +502 @@
   {
     WriteableExtensionsFile writeableFile;
-    List<Extension> extensions;
-    List<ExtensionPoint> extensionPoints;
+    List<Extension<?>> extensions;
+    List<ExtensionPoint<?>> extensionPoints;
   }
 

trunk/src/core/net/sf/basedb/util/uri/ConnectionManagerUtil.java

@@ -37 +37 @@
 import net.sf.basedb.util.extensions.Registry;
 import net.sf.basedb.util.extensions.SingleExtensionFilter;
+import net.sf.basedb.util.extensions.manager.ExtensionsManager;
 
 /**
@@ -200 +201 @@
   private static ExtensionsInvoker<ConnectionManagerFactory> getInvoker(ClientContext context, ExtensionsFilter filter)
   {
-    Registry registry = Application.getExtensionsManager().getRegistry();
+    ExtensionsManager manager = Application.getExtensionsManager();
+    if (filter == null) filter = manager.getSettings();
+    Registry registry = manager.getRegistry();
     return (ExtensionsInvoker<ConnectionManagerFactory>)registry.useExtensions(context, filter, EXTENSION_POINT_ID);
   }

trunk/www/admin/extensions/details.jsp

@@ -147 +147 @@
   function enableFile(enable)
   {
-    window.parent.frames['tree'].setChildIcons('<%=HTML.javaScriptEncode(fileuri)%>', enable);
+    window.parent.frames['tree'].setChildIcons('<%=HTML.javaScriptEncode(file != null ? file.getName() : "")%>', enable);
     var url = 'index.jsp?ID=<%=ID%>&cmd=EnableFile';
     url += '&fileuri=<%=HTML.urlEncode(fileuri)%>';

trunk/www/admin/extensions/index.jsp

@@ -84 +84 @@
   {
     dc = sc.newDbControl();
-    String filename = request.getParameter("filename");
+    String fileuri = request.getParameter("fileuri");
     boolean enable = Values.getBoolean(request.getParameter("enable"));
     ExtensionsControl ec = ExtensionsControl.get(dc);
-    ec.enableAllInFile(filename, enable);
+    ec.enableAllInFile(fileuri, enable);
     ec.saveSettings();
-    redirect = "details.jsp?ID=" + ID + "&filename=" + HTML.urlEncode(filename);
+    redirect = "details.jsp?ID=" + ID + "&fileuri=" + HTML.urlEncode(fileuri);
   }
   else if ("ManualScan".equals(cmd))