Changeset 4117

Timestamp:

Feb 1, 2008, 10:36:56 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #902: Support for multiple configuration files for raw data types and extended properties

Corrected a path problem on windows.

Location:

trunk/src/core/net/sf/basedb/core

Files:

• Application.java (modified) (2 diffs)
• ExtendedProperties.java (modified) (1 diff)

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

@@ -728 +728 @@
         for (java.io.File xmlFile : xmlFiles)
         {
-          String path = xmlFile.getAbsolutePath().replace(configDir, "");
+          String path = xmlFile.getAbsolutePath().replace(configDir, "").
+            replace(java.io.File.separatorChar, '/');
           files.add(path);
         }
@@ -756 +757 @@
         for (java.io.File xmlFile : xmlFiles)
         {
-          String path = xmlFile.getAbsolutePath().replace(configDir, "");
+          String path = xmlFile.getAbsolutePath().replace(configDir, "").
+            replace(java.io.File.separatorChar, '/');;
           files.add(path);
         }

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

@@ -121 +121 @@
       for (String xmlFile : files)
       {
+        log.debug("Loading extended properties from file: " + xmlFile);
         Document dom = XMLUtil.getValidatedXml(ExtendedProperties.class.getResource(xmlFile), dtdFile);
         loadClasses(usedNames, dom, xmlFile);