@@ -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> |
@@ -50,36 +50,6 @@ |
</target> |
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/> |
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
- <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/> |
- <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> |
- <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> |
- <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> |
- <condition property="platform.javac" value="${platform.home}/bin/javac"> |
- <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> |
- </condition> |
- <property name="platform.javac" value="${platform.javac.tmp}"/> |
- <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> |
- <condition property="platform.java" value="${platform.home}/bin/java"> |
- <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> |
- </condition> |
- <property name="platform.java" value="${platform.java.tmp}"/> |
- <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> |
- <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> |
- <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> |
- </condition> |
- <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> |
- <fail unless="platform.home">Must set platform.home</fail> |
- <fail unless="platform.bootcp">Must set platform.bootcp</fail> |
- <fail unless="platform.java">Must set platform.java</fail> |
- <fail unless="platform.javac">Must set platform.javac</fail> |
- <fail if="platform.invalid"> |
- The J2SE Platform is not correctly set up. |
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. |
- Either open the project in the IDE and setup the Platform with the same name or add it manually. |
- For example like this: |
- ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file) |
- or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) |
- </fail> |
<condition property="have.tests"> |
<or> |
<available file="${test.src.dir}"/> |
@@ -221,6 +191,15 @@ |
<length length="0" string="${endorsed.classpath}" when="greater"/> |
</and> |
</condition> |
+ <condition else="false" property="jdkBug6558476"> |
+ <and> |
+ <matches pattern="1\.[56]" string="${java.specification.version}"/> |
+ <not> |
+ <os family="unix"/> |
+ </not> |
+ </and> |
+ </condition> |
+ <property name="javac.fork" value="${jdkBug6558476}"/> |
<condition property="junit.available"> |
<or> |
<available classname="org.junit.Test" classpath="${run.test.classpath}"/> |
@@ -315,7 +294,7 @@ |
<property location="${build.dir}/empty" name="empty.dir"/> |
<mkdir dir="${empty.dir}"/> |
<mkdir dir="@{apgeneratedsrcdir}"/> |
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
<src> |
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
<include name="*"/> |
@@ -352,7 +331,7 @@ |
<sequential> |
<property location="${build.dir}/empty" name="empty.dir"/> |
<mkdir dir="${empty.dir}"/> |
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
<src> |
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
<include name="*"/> |
@@ -429,7 +408,7 @@ |
<attribute default="" name="testmethods"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
<syspropertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -452,7 +431,7 @@ |
<element name="customize" optional="true"/> |
<sequential> |
<property name="run.jvmargs.ide" value=""/> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
<batchtest todir="${build.test.results.dir}"> |
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
<filename name="@{testincludes}"/> |
@@ -492,7 +471,7 @@ |
</fileset> |
</union> |
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> |
- <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-erosion" testname="TestNG tests" workingDir="${basedir}"> |
+ <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-erosion" testname="TestNG tests" workingDir="${basedir}"> |
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> |
<propertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -570,7 +549,7 @@ |
<attribute default="" name="testmethods"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
<syspropertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -595,7 +574,7 @@ |
<element name="customize" optional="true"/> |
<sequential> |
<property name="run.jvmargs.ide" value=""/> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
<batchtest todir="${build.test.results.dir}"> |
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
<filename name="@{testincludes}"/> |
@@ -719,7 +698,7 @@ |
<attribute default="${debug.classpath}" name="classpath"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
+ <java classname="@{classname}" fork="true"> |
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
<jvmarg line="${runmain.jvmargs}"/> |
<classpath> |
@@ -751,9 +730,6 @@ |
<classpath> |
<path path="@{classpath}"/> |
</classpath> |
- <bootclasspath> |
- <path path="${platform.bootcp}"/> |
- </bootclasspath> |
</nbjpdastart> |
</sequential> |
</macrodef> |
@@ -774,9 +750,7 @@ |
</macrodef> |
</target> |
<target name="-init-debug-args"> |
- <exec executable="${platform.java}" outputproperty="version-output"> |
- <arg value="-version"/> |
- </exec> |
+ <property name="version-output" value="java version "${ant.java.version}"/> |
<condition property="have-jdk-older-than-1.4"> |
<or> |
<contains string="${version-output}" substring="java version "1.0"/> |
@@ -802,7 +776,7 @@ |
<attribute default="${application.args.param}" name="args"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
+ <java classname="@{classname}" fork="true"> |
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
<jvmarg line="${debug-args-line}"/> |
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
@@ -1237,9 +1211,6 @@ |
<sourcepath> |
<path path="${web.docbase.dir}"/> |
</sourcepath> |
- <bootclasspath> |
- <path path="${platform.bootcp}"/> |
- </bootclasspath> |
</nbjpdaconnect> |
</target> |
<target if="do.display.browser.debug.old" name="debug-display-browser-old"> |
@@ -1362,7 +1333,7 @@ |
--> |
<target depends="init" if="have.sources" name="javadoc-build"> |
<mkdir dir="${dist.javadoc.dir}"/> |
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
+ <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
<classpath> |
<path path="${javac.classpath}:${j2ee.platform.classpath}"/> |
</classpath> |