@@ -20,30 +20,18 @@ |
</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> |
- <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}" |
+ <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}" |
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> |
- <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}" |
+ <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}" |
password="${tomcat.password}" path="${Context(path)}"/> |
</target> |
</project> |
@@ -28,6 +28,7 @@ |
dist.javadoc.dir=${dist.dir}/javadoc |
endorsed.classpath= |
excludes= |
+file.reference.commons-io-2.3.jar=lib/commons-io-2.3.jar |
file.reference.jdom_1.1.jar=lib/jdom_1.1.jar |
file.reference.log4_1.2.15.jar=lib/log4_1.2.15.jar |
includes=** |
@@ -36,7 +37,8 @@ |
jar.index=${jnlp.enabled} |
javac.classpath=\ |
${file.reference.log4_1.2.15.jar}:\ |
- ${file.reference.jdom_1.1.jar} |
+ ${file.reference.jdom_1.1.jar}:\ |
+ ${file.reference.commons-io-2.3.jar} |
# Space-separated list of extra javac options |
javac.compilerargs= |
javac.deprecation=false |
@@ -4,6 +4,7 @@ |
*/ |
package wepsreportdata; |
|
+import usda.weru.util.Binaries; |
import usda.weru.weps.reports.query.*; |
|
/** |
@@ -19,6 +20,8 @@ |
* This utility will search for WEPS output files within this directory. |
*/ |
private String m_sInputDirectory = ""; |
+ private static final String DETAIL_SOURCE = "/wepsreportdata/detail.xml"; |
+ private static final String PATH_META = "tables/detail.xml"; |
|
public boolean setInputDirectory(String sInputDirectory) { |
// @todo Check to see if this directory exists. If not return false. |
@@ -95,6 +98,7 @@ |
public void loadOutputResultSet() { |
// @todo Check configuration options to see if we should load this file. |
try { |
+ Binaries.unpackResourceAbsolute(DETAIL_SOURCE, System.getProperty("user.dir") +"/"+ PATH_META); |
OutputResultSet resultset = new OutputResultSet(m_con, m_sInputDirectory, m_sUnits); |
resultset.fill(); |
} |