Displaying differences for changeset
 
display as  

lib/WepsReportData.jar

 

nbproject/ant-deploy.xml

@@ -20,18 +20,30 @@
     </target>
     <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
         <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
-        <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"
-                 classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
-        <deploy url="${tomcat.url}/manager" username="${tomcat.username}"
+        <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask">
+            <classpath>
+                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
+                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
+                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
+                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
+            </classpath>
+        </taskdef>
+        <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
                 password="${tomcat.password}" path="${Context(path)}"
                 war="${deploy.ant.archive}"/>
         <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/>
     </target>
     <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
         <echo message="Undeploying ${Context(path)}"/>
-        <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
-                classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
-        <undeploy url="${tomcat.url}/manager" username="${tomcat.username}" 
+        <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask">
+            <classpath>
+                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
+                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
+                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
+                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
+            </classpath>
+        </taskdef>
+        <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}" 
                   password="${tomcat.password}" path="${Context(path)}"/>
     </target>
 </project>

nbproject/build-impl.xml~

@@ -1014,8 +1014,8 @@
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1033,8 +1033,8 @@
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

nbproject/project.properties

@@ -50,7 +50,7 @@
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.6-web
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.3.1.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar
 j2ee.server.type=Tomcat
 jar.compress=false
 javac.classpath=\

src/java/bin/lin-amd64/WEPS Report Parameters 2012-10-11.json

@@ -169,5 +169,15 @@
     { "name":"stir_energy.line", "type":"INTEGER", "units":null, "description":"integer row index not in text file" }, 
     { "name":"stir_energy.operation", "type":"VARCHAR(50)", "units":null, "description":"operation name" }, 
     { "name":"stir_energy.runid", "type":"INTEGER", "units":null, "description":"Index for the run" }, 
-    { "name":"stir_energy.stir", "type":"DOUBLE", "units":null, "description":"operation STIR" }
+    { "name":"stir_energy.stir", "type":"DOUBLE", "units":null, "description":"operation STIR" },
+    { "name":"output.gross_lossoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.gross_lossoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.tot_lossoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.tot_lossoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.crp_saltoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.crp_saltoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.suspenoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.suspenoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.pm10output._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+    { "name":"output.pm10output._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"}
 ]}
\ No newline at end of file

src/java/bin/lin-amd64/weps_report.json

@@ -162,5 +162,15 @@
 { "name":"stir_energy.line", "type":"INTEGER", "dim": ["stir_energy.line"], "description":"integer row index not in text file"}, 
 { "name":"stir_energy.operation", "type":"VARCHAR(50)", "dim": ["stir_energy.line"], "description":"operation name"}, 
 { "name":"stir_energy.runid", "type":"INTEGER", "dim": ["stir_energy.line"], "description":"Index for the run"}, 
-{ "name":"stir_energy.stir", "type":"DOUBLE", "dim": ["stir_energy.line"], "description":"operation STIR"}
+{ "name":"stir_energy.stir", "type":"DOUBLE", "dim": ["stir_energy.line"], "description":"operation STIR"},
+{ "name":"output.gross_lossoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.gross_lossoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.tot_lossoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.tot_lossoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.crp_saltoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.crp_saltoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.suspenoutput._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.suspenoutput._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.pm10output._lowerlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"},
+{ "name":"output.pm10output._upperlimit", "type":"INTEGER", "dim": ["output.line"], "description": "1 if below lower limit for this value, 0 otherwise"}
 ]
\ No newline at end of file

src/java/d/rusle2/climateQuery.sh

@@ -1,1 +1,2 @@
-curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8081/csip/d/rusle2/climate/1.0 -d @./climateReqEpa1.json
+#curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8081/csip/d/rusle2/climate/1.0 -d @./climateReqEpa1.json
+curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8090/csip-erosion/d/rusle2/climate/1.0 -d @./climateReqEpa1.json

src/java/m/weps/V1_2.java

@@ -717,7 +717,7 @@
         reportdata.m_sUnits = "US";
 
         // Load the file data.
-        reportdata.loadFiles();
+        reportdata.loadFiles(getWorkspaceDir().toString());
 
 //        // Dump the loaded data as text for debugging purposes.
 //        LOG.info("hash map output=" + con.toString());