@@ -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> |
@@ -1006,6 +1006,7 @@ |
</target> |
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/> |
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest"> |
+ <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.Jama-1.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.apache-mime4j-0.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1026,6 +1027,7 @@ |
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
</target> |
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> |
+ <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.Jama-1.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.apache-mime4j-0.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1400,7 +1402,7 @@ |
<mkdir dir="${build.test.results.dir}"/> |
</target> |
<target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> |
- <webproject2:test testincludes="**/*Test.java"/> |
+ <webproject2:test includes="${includes}" testincludes="**/*Test.java"/> |
</target> |
<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> |
<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> |