Changeset 7932 for mauRepo/newmoon

Timestamp:

05/07/11 17:05:59 (10 years ago)

Author:

mnagni

Message:

Fixed an error when the registryMapping was NULL
Updated Newmoon up to the Fullmoon rev. 2249
Partially decoupled the default dirs from the custom one
Partially reorganized the structure

Location:

mauRepo/newmoon

Files:

• pom.xml (modified) (1 diff)
• src/main/java/ndg/services/newmoon/DBManager.java (modified) (2 diffs)
• src/main/java/ndg/services/newmoon/NewmoonManager.java (modified) (3 diffs)
• src/main/java/ndg/services/newmoon/XMIEncoder.java (modified) (3 diffs)

mauRepo/newmoon/pom.xml

@@ -4 +4 @@
         <groupId>ndg.services.newmoon</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
 
         <organization>

mauRepo/newmoon/src/main/java/ndg/services/newmoon/DBManager.java

@@ -153 +153 @@
          * (providing that collection does not already exist.
          * 
-         * @param collectionName
+         * @param collection
          *            the name of the collection to create.
          * 
@@ -340 +340 @@
          *            the parent Collection. If <code>null</code> the root
          *            collection, that is the collection having path
-         *            {@link #ROOT_COLLECTION_PATH}, is used.
+         *            {@link NewmoonManager.NM_PARAM#ROOT_COLLECTION_PATH}, is used.
          * @param the
          *            path relative to the parent's path

mauRepo/newmoon/src/main/java/ndg/services/newmoon/NewmoonManager.java

@@ -100 +100 @@
                                 "EncodeReport"), DEFAULT_CONFORMANCE_REPORT_NAME("ConformanceTestReport"), CONFORMANCE_TEST_DIR(
                                 "conformanceDir"), ENCODE_DIR("encodeDir"), RESOURCE_NAME("defaultResourceName"), OUTPUT_DIR(
-                                "exportDir");
+                                "exportDir"), EXECUTION_DIR("execution-directory");
 
                 private final String name;
@@ -294 +294 @@
                         String xqueryDir, File outputDir) {
                 InputStream ret = null;
+                if (xqueryDir == null) {
+                        return null;
+                }
                 try {
                         String moduleCollectionName = collectionName.getCollectionName() + "/" + FilenameUtils.getName(xqueryDir);
@@ -390 +393 @@
                         File tmpFile = null;
                         try {
-                                tmpFile = new File(exportDir, "encoded-" + item);
+                                tmpFile = new File(exportDir, item);
                                 writer = new FileWriter(tmpFile);
                                 writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");

mauRepo/newmoon/src/main/java/ndg/services/newmoon/XMIEncoder.java

@@ -51 +51 @@
                 
                 //Prepare the outputDir
-                File outputDir = new File(nm.getVariables(NM_PARAM.WORKING_DIRECTORY), nm.getVariables(NM_PARAM.OUTPUT_DIR));
+                File outputDir = new File(nm.getVariables(NM_PARAM.EXECUTION_DIR), nm.getVariables(NM_PARAM.OUTPUT_DIR));
                 outputDir.mkdir();
                 outputdirPath = outputDir.getPath();
@@ -59 +59 @@
                                 nm.getVariables(NM_PARAM.ROOT_COLLECTION_URI));
                 
-                File xmiDoc = new File(nm.getVariables(NM_PARAM.WORKING_DIRECTORY), nm.getVariables(NM_PARAM.XMI_DOC));
+                File xmiDoc = new File(nm.getVariables(NM_PARAM.EXECUTION_DIR), nm.getVariables(NM_PARAM.XMI_DOC));
                 
                 String resourceName = nm.getVariables(NM_PARAM.RESOURCE_NAME);          
@@ -92 +92 @@
                                 nm.getVariables(NM_PARAM.ENCODE_DIR), outputDir);
                 
+                DBManager.getInstance().mapDBCollection(null);
                 nm.exportGeneratedResource(MODULE_NAME.SCHEMA_ENCODING.getModuleName() + "/" + schemaEncoding + "/working", outputDir);
         }