Changeset 4122

Timestamp:

Feb 4, 2008, 1:14:02 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #913: Plug-in JAR paths should support paths relative to the plugins.dir setting in base.config

The windows problem should now be solved, but need to test it also.

File:

• trunk/src/core/net/sf/basedb/core/PluginDefinition.java (modified) (3 diffs)

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

@@ -127 +127 @@
     specified or if the path is null nothing is done. If the given path is 
     a subpath to the <code>plugins.dir</code> path the common path is replaced
-    with <code>%plugins.dir%</code> For example:
+    with <code>%plugins.dir%</code> and all path separator characters are
+    converted to '/'. For example:
     <pre class="code>"
 path          = /usr/local/base/plugins/myplugin.jar
 plugins.dir   = /usr/local/base/plugins
 relative path = %plugins.dir%/myplugin.jar
+
+//On windows
+path          = c:\base\plugins\mine\myplugin.jar
+plugins.dir   = c:\base\plugins
+relative path = %plugins.dir%/mine/myplugin.jar
 </pre>
 
@@ -146 +152 @@
     if (path.startsWith(pluginsDir))
     {
-      path = "%plugins.dir%" + path.substring(pluginsDir.length());
+      path = "%plugins.dir%" + path.substring(pluginsDir.length()).
+        replace(java.io.File.separatorChar, '/');
     }
     return path;
@@ -166 +173 @@
     if (path.startsWith("%plugins.dir%"))
     {
-      path = pluginsDir + path.substring("%plugins.dir%".length());
+      path = pluginsDir + path.substring("%plugins.dir%".length()).
+        replace('/', java.io.File.separatorChar);
     }
     return path;