Changeset 4439

Timestamp:

2003-05-30T15:10:30+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed incorrect use of File.separator in the path of something that will be found by the class loader.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/BuildOptions.java (modified) (1 diff)
• collection/Collection.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java

@@ -50 +50 @@
                 // And if that too fails, load the default argument templates
         if(build_arguments_element == null || import_arguments_element == null) {
-        Document build_document = Utility.parse("xml" + File.separator + "buildcol.xml", true);
+        Document build_document = Utility.parse("xml/buildcol.xml", true);
         build_arguments_element = build_document.getDocumentElement();
         build_document = null;
-        Document import_document = Utility.parse("xml" + File.separator + "import.xml", true);
+        Document import_document = Utility.parse("xml/import.xml", true);
         import_arguments_element = import_document.getDocumentElement();
         import_document = null;

trunk/gli/src/org/greenstone/gatherer/collection/Collection.java

@@ -81 +81 @@
     static final private String BUILD_CONFIG = "BuildConfig";
     /** The name of the collection xml template. */
-    static final private String COLLECTION_XML_TEMPLATE = "xml" + File.separator + "template.col";
+    static final private String COLLECTION_XML_TEMPLATE = "xml/template.col";
     /** The name of the directory mappings element. */
     static final private String DIRECTORY_MAPPINGS = "DirectoryMappings";

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -370 +370 @@
     public void createLockFile(File destination) {
     try {
-        Document default_lockfile = Utility.parse("xml" + File.separator + LOCK_FILE, true);
+        Document default_lockfile = Utility.parse("xml/" + LOCK_FILE, true);
         String user_name = System.getProperty("user.name");
         Element person_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "User");

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -118 +118 @@
     static final public String METADATA_EXTRACTED = "extracted.mds";
     /** The location the gatherer expects to find metadata set information. */
-    static final public String METADATA_SET_TEMPLATE = "xml" + File.separator + "template.mds";
-    static final public String METADATA_VALUE_TEMPLATE = "xml" + File.separator + "template.mdv";
+    static final public String METADATA_SET_TEMPLATE = "xml/template.mds";
+    static final public String METADATA_VALUE_TEMPLATE = "xml/template.mdv";
     static final public String METADATA_XML = "metadata.xml";
     static final public String NAME_ELEMENT = "Name";