Changeset 7936

Timestamp:

11/07/11 11:00:49 (8 years ago)

Author:

mnagni

Message:

Simplified the ZIP structure.
Added a new sample test
Promoted to 1.1.1

Location:

mauRepo/NewmoonJSP

Files:

• .settings/org.eclipse.wst.common.component (modified) (1 diff)
• pom.xml (modified) (2 diffs)
• src/main/java/ndg/newmoon/web/NewmoonContextListener.java (modified) (2 diffs)
• src/main/java/ndg/newmoon/web/XMIEncoderHelper.java (modified) (2 diffs)
• src/main/webapp/WEB-INF/rules/conformance-test/ISO19136-V3.2-AnxE_XMI-V1.1/pre/pre-001.xq (modified) (4 diffs)
• src/main/webapp/WEB-INF/rules/schema-encoding/xmi11ea/process-002.xq (modified) (4 diffs)
• src/main/webapp/pages/encodeXMI.xhtml (modified) (1 diff)
• src/main/webapp/pages/myCustomPackage.zip (added)
• src/main/webapp/pages/toEncode.zip (deleted)

mauRepo/NewmoonJSP/.settings/org.eclipse.wst.common.component

@@ -2 +2 @@
 <project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="NewmoonJSP">
-        <wb-resource deploy-path="/" source-path="/target/newmoon"/>
     </wb-module>
 </project-modules>

mauRepo/NewmoonJSP/pom.xml

@@ -4 +4 @@
         <groupId>ndg.services.newmoon</groupId>
         <artifactId>newmoon-web</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
         <packaging>war</packaging>
 
@@ -110 +110 @@
                         <groupId>ndg.services.newmoon</groupId>
                         <artifactId>core</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
                         <exclusions>
                                 <exclusion>

mauRepo/NewmoonJSP/src/main/java/ndg/newmoon/web/NewmoonContextListener.java

@@ -17 +17 @@
         public static final String NM_RULES_SCHEMA_ENCODING = "nm.rules.schema.encoding";
         public static final String NM_REPORT_STYLESHEET = "nm.report.schema";
+        public static final String WEB_INF = "nm.web.inf";
 
         /**
@@ -41 +42 @@
                 
                 String webInfPath = event.getServletContext().getRealPath("/WEB-INF");
+                event.getServletContext().setAttribute(WEB_INF, webInfPath);            
                 event.getServletContext().setAttribute(TMP_DIR, webInfPath + "/tmpDir");
                 if (LOG.isInfoEnabled()) {

mauRepo/NewmoonJSP/src/main/java/ndg/newmoon/web/XMIEncoderHelper.java

@@ -176 +176 @@
                         xmi = xmis[0];
                 }
-                base = FilenameUtils.getBaseName(xmi.getParent());
-
+                String executionPath = FilenameUtils.getBaseName(xmi.getParent());
+                // = "xmi-samples/zippedSample2";
                 String testDir = (String) sc.getAttribute(NewmoonContextListener.NM_RULES_CONFORMANCE)
                                 + "/ISO19136-V3.2-AnxE_XMI-V1.1";
                 String encodeDir = (String) sc.getAttribute(NewmoonContextListener.NM_RULES_SCHEMA_ENCODING) + "/xmi11ea";
                 //String workingPath = (String) sc.getAttribute(NewmoonContextListener.TMP_DIR);
-                String workingPath = xmi.getParent();
                 // the first part of the baseDir contains the uploaded ZIP file, the
                 // second is the unpack dir
@@ -197 +196 @@
                 // ---- mandatory parameters ----//
                 // hidden
-                params.put(NM_PARAM.WORKING_DIRECTORY, workingPath);
+                params.put(NM_PARAM.WORKING_DIRECTORY, (String) sc.getAttribute(NewmoonContextListener.WEB_INF));
+                params.put(NM_PARAM.EXECUTION_DIR, sc.getAttribute(NewmoonContextListener.TMP_DIR) + "/" + executionPath);
+                
+                //params.put(NM_PARAM.WORKING_DIRECTORY, workingPath);
                 // hidden retrieved from the user uploaded file
                 params.put(NM_PARAM.XMI_DOC, sample);

mauRepo/NewmoonJSP/src/main/webapp/WEB-INF/rules/conformance-test/ISO19136-V3.2-AnxE_XMI-V1.1/pre/pre-001.xq

@@ -35 +35 @@
 declare variable $root-collection-path as xs:string external;
 declare variable $working-directory as xs:string external;
-declare variable $base-directory as xs:string external;
+declare variable $execution-directory as xs:string external;
 declare variable $query-path as xs:string external;
 declare variable $dependency-register-path as xs:string external;
@@ -58 +58 @@
         else if (starts-with($path, "file://"))
             then $path
-            else concat("file://", $working-directory, "/", $path)
+                else if (starts-with($path, "request://"))            
+            then concat("file://", $execution-directory, "/", substring-after($path, "request://"))
+        else 
+                concat("file://", $working-directory, "/", $path)
         return $ret
 };
@@ -66 +69 @@
 {
         let $collection := mod-db:get-mapping-collection(),
+                $defReg := concat("file://", replace($working-directory, "\\", "/"), "/", $mod-co:default-register-path),
                 $registers := (
                         if (empty($dependency-register-path) or $dependency-register-path eq "") then
-                                ($mod-co:default-register-path)
+                                ($defReg)
                         else
-                                ($dependency-register-path, $mod-co:default-register-path)
+                                (concat("file://", replace($execution-directory, "\\", "/"), "/", $dependency-register-path), $defReg)
                 ),
                 $registers := (
@@ -79 +83 @@
                                         $collection,
                                         concat("Register", $i, ".xml"),
-                                        xs:anyURI(concat("file://", replace($working-directory, "\\", "/"), "/", $path))
+                                        xs:anyURI($path)
                                 )
                 ),

mauRepo/NewmoonJSP/src/main/webapp/WEB-INF/rules/schema-encoding/xmi11ea/process-002.xq

@@ -32 +32 @@
 declare variable $xmldb-password as xs:string external;
 declare variable $working-directory as xs:string external;
+declare variable $execution-directory as xs:string external;
 declare variable $query-path as xs:string external;
 declare variable $dependency-register-path as xs:string external;
 declare variable $gml-version as xs:string external;
+
+declare function local:resolve-dependency-register-path($paths as xs:string*) as xs:string*
+{
+    for $path in $paths
+    let $ret := 
+        if (starts-with($path, "http://") or starts-with($path, "https://"))
+        then $path
+        else if (starts-with($path, "file://"))
+            then $path
+                else if (starts-with($path, "request://"))            
+            then concat("file://", $execution-directory, "/", substring-after($path, "request://"))
+        else 
+                concat("file://", $working-directory, "/", $path)    
+        return $ret
+};
 
 (:
@@ -47 +63 @@
 {
         let $collection := mod-db:get-mapping-collection(),
+                $defReg := concat("file://", replace($working-directory, "\\", "/"), "/", $mod-co:default-register-path),
                 $registers := (
                         if (empty($dependency-register-path) or $dependency-register-path eq "") then
-                                ($mod-co:default-register-path)
+                                ($defReg)
                         else
-                                ($dependency-register-path, $mod-co:default-register-path)
+                                (concat("file://", replace($execution-directory, "\\", "/"), "/", $dependency-register-path), $defReg)
                 ),
                 $registers := (
@@ -60 +77 @@
                                         $collection,
                                         concat("Register", $i, ".xml"),
-                                        xs:anyURI(concat("file://", replace($working-directory, "\\", "/"), "/", $path))
+                                        xs:anyURI($path)
                                 )
                 ),
@@ -68 +85 @@
                                 for $pck in doc($path)//pckr:package
                                 return (
-                                        $pck/pckr:implementation[@binding eq concat("GML ", $gml-version)]/pckr:classMap/@location,
-                                        $pck/pckr:implementation[@binding eq "any"]/pckr:classMap/@location
+                                        local:resolve-dependency-register-path($pck/pckr:implementation[@binding eq concat("GML ", $gml-version)]/pckr:classMap/@location),
+                                        local:resolve-dependency-register-path($pck/pckr:implementation[@binding eq "any"]/pckr:classMap/@location)
                                 )
                 )

mauRepo/NewmoonJSP/src/main/webapp/pages/encodeXMI.xhtml

@@ -138 +138 @@
                     </f:facet>
                     To learn about the structure of the zip file to upload please check <a
-                                        href="toEncode.zip"><b>this</b></a> sample file
+                                        href="myCustomPackage.zip"><b>this</b></a> sample file
                                                  
         </pn:panel>