@@ -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> |
@@ -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"/> |
@@ -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 |
@@ -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 |