Changeset 5608

Timestamp:

Apr 15, 2011, 10:42:40 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1593: Extension system for the core API

Added possibility to disable external extensions since this can interfere with test programs.

Location:

trunk

Files:

• config/dist/base.config (modified) (2 diffs)
• config/dist/log4j.properties (modified) (2 diffs)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• src/test/TestUtil.java (modified) (3 diffs)

trunk/config/dist/base.config

@@ -183 +183 @@
 
 
+# =======================
+# Plug-ins and extensions
+# =======================
+
+# The path to the directory where external plugins are installed
+plugins.dir=/usr/local/base2/plugins
+
+# Set this flag to disable all external extensions
+extensions.disabled = false
+
+
 # ===============
 # General section
@@ -189 +200 @@
 # The path to the directory where uploaded files are stored
 userfiles = /usr/local/base2/files
-
-# The path to the directory where external plugins are installed
-plugins.dir=/usr/local/base2/plugins
 
 # Number of minutes to keep permission information for the logged

trunk/config/dist/log4j.properties

@@ -40 +40 @@
 
 ### Extensions API
+#log4j.logger.net.sf.basedb.util.extensions=debug
 #log4j.logger.net.sf.basedb.clients.web.extensions=debug
 
@@ -45 +46 @@
 #log4j.logger.net.sf.basedb.util.overview=debug
 
-# -----------------
-# Migration loggers
-# -----------------
-#log4j.logger.net.sf.basedb.clients.migrate=warn
-log4j.logger.net.sf.basedb.clients.migrate=warn
 
 # -----------------

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

@@ -561 +561 @@
         xtManager.addURI(Application.class.getResource("/core-extensions.xml").toURI());
         
-        // Add plugins directory to the manager
-        xtManager.addDirectory(pluginsDirectory);
+        if (!Config.getBoolean("extensions.disabled"))
+        {
+          // Add plugins directory to the manager (unless disabled)
+          xtManager.addDirectory(pluginsDirectory);
+        }
         
         // Register and load core extensions

trunk/src/test/TestUtil.java

@@ -27 +27 @@
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.Version;
 import net.sf.basedb.util.MD5;
 
@@ -152 +153 @@
     {
       Config.setProperty("plugins.dir", System.getProperty("user.dir"));
+      Config.setProperty("extensions.disabled", "true");
       showDbInfo();
       Application.start(false);
@@ -285 +287 @@
     String message = 
       "--System information-----------------------------\n" + 
-      "BASE     : " + Application.getMajorVersion() + "." +
-        Application.getMinorVersion() + "." + 
-        Application.getMaintenanceVersion() + "\n" + 
+      "BASE     : " + Version.getMajor() + "." +
+        Version.getMinor() + "." + Version.getMaintenance() + Version.getSuffix() + "\n" + 
       "Database : " + database + "\n" + 
       "Dialect  : " + Config.getString("db.dialect") + "\n" +