Changeset 3765 for trunk

Timestamp:

Sep 21, 2007, 3:41:52 PM (16 years ago)

Author:

Martin Svensson

Message:

References #364, Correct inconsistent variable/property 'plugin.dir' becomes 'plugins.dir'

Location:

trunk

Files:

• config/dist/base.config (modified) (1 diff)
• doc/src/docbook/admindoc/plugin_installation.xml (modified) (1 diff)
• doc/src/docbook/appendix/base.config.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• src/test/TestExternalPluginInstaller.java (modified) (2 diffs)

trunk/config/dist/base.config

@@ -138 +138 @@
 
 # The path to the directory where external plugins are installed
-plugin.dir=/usr/local/base2/plugins
+plugins.dir=/usr/local/base2/plugins
 
 # Number of minutes to keep permission information for the logged

trunk/doc/src/docbook/admindoc/plugin_installation.xml

@@ -85 +85 @@
       and click on the &gbNew; button. The pop-up window that appears looks different
       depending on if
-      <property>plugin.dir</property>
+      <property>plugins.dir</property>
       in
       <filename>base.config</filename>

trunk/doc/src/docbook/appendix/base.config.xml

@@ -601 +601 @@
     </varlistentry>
     <varlistentry>
-      <term><property>plugin.dir</property></term>
+      <term><property>plugins.dir</property></term>
       <listitem>
         <para>

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

@@ -408 +408 @@
       log.info("plugins.autounload = " + autoUnloadPlugins);
       
-      String pluginDir = Config.getString("plugin.dir");
-      nonCorePluginDirectory = pluginDir != null ? new java.io.File(pluginDir) : null;
+      String pluginsDir = Config.getString("plugins.dir");
+      nonCorePluginDirectory = pluginsDir != null ? new java.io.File(pluginsDir) : null;
       log.info("plugins.dir = " + nonCorePluginDirectory);
       

trunk/src/test/TestExternalPluginInstaller.java

@@ -55 +55 @@
   
   /**
-    Test to find jar-files in directory specified in plugin.dir
+    Test to find jar-files in directory specified in plugins.dir
       @return List with files
    */
@@ -63 +63 @@
     if (pluginDir == null || !pluginDir.exists())
     {
-      write("--'plugin.dir' has not been set properbly in base.config");
+      write("--'plugins.dir' has not been set properbly in base.config");
       ok = false;
       return null;