initial work but cant resolve the JDT compiler
diff --git a/common/artifact.xml b/common/artifact.xml
index ce78cce..3eaa358 100644
--- a/common/artifact.xml
+++ b/common/artifact.xml
@@ -15,20 +15,15 @@
xmlns:bundlor="antlib:com.springsource.bundlor.ant">
<!-- Main targets -->
- <target name="javadoc-all" depends="ivy.init, resolve.compile, src.init" if="src.exists"
- description="Creates javadoc documentation for all classes.">
- <java-doc input.dir="${main.java.dir}" output.dir="${javadoc-all.output.dir}" classpath.id="compile.classpath"
- access="private"/>
+ <target name="javadoc-all" depends="ivy.init, resolve.compile, src.init" if="src.exists" description="Creates javadoc documentation for all classes.">
+ <java-doc input.dir="${main.java.dir}" output.dir="${javadoc-all.output.dir}" classpath.id="compile.classpath" access="private"/>
</target>
- <target name="javadoc-api" depends="ivy.init, resolve.compile, src.init" if="src.exists"
- description="Creates javadoc documentation for all classes.">
- <java-doc input.dir="${main.java.dir}" output.dir="${javadoc-api.output.dir}" classpath.id="compile.classpath"
- access="protected" exclude.package.names="${javadoc.exclude.package.names}"/>
+ <target name="javadoc-api" depends="ivy.init, resolve.compile, src.init" if="src.exists" description="Creates javadoc documentation for all classes.">
+ <java-doc input.dir="${main.java.dir}" output.dir="${javadoc-api.output.dir}" classpath.id="compile.classpath" access="protected" exclude.package.names="${javadoc.exclude.package.names}"/>
</target>
- <target name="jar" depends="ivy.init, resolve.compile, compile.init, jar.init"
- description="Creates a JAR file containing the output of a compilation of the source tree.">
+ <target name="jar" depends="ivy.init, resolve.compile, compile.init, jar.init" description="Creates a JAR file containing the output of a compilation of the source tree.">
<delete quiet="true" file="${ivy.output.file}"/>
<mkdir dir="${ivy.output.dir}"/>
<delete quiet="true" file="${jar.output.file}"/>
@@ -36,11 +31,12 @@
<delete quiet="true" file="${source-jar.output.file}"/>
<mkdir dir="${source-jar.output.dir}"/>
- <compile classpath.id="compile.classpath" input.dir="${main.java.dir}" output.dir="${main.output.dir}"
- resources.dir="${main.resources.dir}"/>
- <ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false"
- pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
+ <compile classpath.id="compile.classpath" input.dir="${main.java.dir}" output.dir="${main.output.dir}" resources.dir="${main.resources.dir}"/>
+
+ <ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false" pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
+
<antcall target="bundlor"/>
+
<jar destfile="${jar.output.file}" basedir="${main.output.dir}" index="true" filesetmanifest="merge">
<manifest>
<attribute name="Bundle-ManifestVersion" value="2"/>
diff --git a/common/common.properties b/common/common.properties
index ca179db..4de3377 100644
--- a/common/common.properties
+++ b/common/common.properties
@@ -65,7 +65,6 @@
wab.lib.dir=${wab.staging.dir}/WEB-INF/lib
# Compiler Properties
-org.springframework.build.ant.version=1.1.0.RELEASE
org.eclipse.jdt.core.compiler.batch.version=3.6.1
build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
compile.debug=true
diff --git a/common/quality.xml b/common/quality.xml
index 8d8bb23..8ca7ffe 100644
--- a/common/quality.xml
+++ b/common/quality.xml
@@ -11,7 +11,7 @@
* VMware Inc. - initial contribution
******************************************************************************
-->
-<project name="quality-common" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:osgi="antlib:org.springframework.build.osgi">
+<project name="quality-common" xmlns:ivy="antlib:org.apache.ivy.ant" >
<!-- Main targets -->
<target name="test" depends="jar, test.pre, test.do, test.post" description="Executes all tests resulting from a compilation of the test tree returning test success metrics."/>
diff --git a/resource/common.xml b/resource/common.xml
index 0244cf9..fd53f42 100644
--- a/resource/common.xml
+++ b/resource/common.xml
@@ -11,7 +11,7 @@
* VMware Inc. - initial contribution
******************************************************************************
-->
-<project name="common-resource" xmlns:s="antlib:org.springframework.build">
+<project name="common-resource" >
<import file="../common/common.xml"/>
diff --git a/standard/artifact.xml b/standard/artifact.xml
index ac93830..8870904 100644
--- a/standard/artifact.xml
+++ b/standard/artifact.xml
@@ -19,19 +19,9 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
- <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.ant"
- revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
conf="runtime" type="jar" inline="true" log="download-only"/>
- <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
- <classpath>
- <path refid="spring.ant.classpath"/>
- <path refid="ecj.classpath"/>
- </classpath>
- </taskdef>
</target>
</project>
diff --git a/standard/common.xml b/standard/common.xml
index 042c6b7..876396f 100644
--- a/standard/common.xml
+++ b/standard/common.xml
@@ -9,9 +9,10 @@
*
* Contributors:
* VMware Inc. - initial contribution
+ *
******************************************************************************
-->
-<project name="common-standard" xmlns:s="antlib:org.springframework.build">
+<project name="common-standard" >
<import file="../common/common.xml"/>
@@ -22,14 +23,14 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
- <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
+ <javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
+ debug="${compile.debug}" debugLevel="${compile.debug.level}" includeantruntime="false" >
<compilerarg line="${compiler.args}"/>
<src path="@{input.dir}"/>
<include name="**/*.java"/>
<include name="*.java"/>
<classpath refid="@{classpath.id}"/>
- </s:javac>
+ </javac>
<copy todir="@{output.dir}">
<fileset dir="@{input.dir}" erroronmissingdir="false">
<exclude name="**/*.java"/>
diff --git a/wab/artifact.xml b/wab/artifact.xml
index 5b4dc1a..e4b1cb5 100644
--- a/wab/artifact.xml
+++ b/wab/artifact.xml
@@ -56,19 +56,9 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
- <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.ant"
- revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
conf="runtime" type="jar" inline="true" log="download-only"/>
- <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
- <classpath>
- <path refid="spring.ant.classpath"/>
- <path refid="ecj.classpath"/>
- </classpath>
- </taskdef>
</target>
<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
diff --git a/wab/common.xml b/wab/common.xml
index 5f23b2f..a6a07cf 100644
--- a/wab/common.xml
+++ b/wab/common.xml
@@ -12,7 +12,7 @@
* SAP AG - initial contribution
******************************************************************************
-->
-<project name="common-wab" xmlns:s="antlib:org.springframework.build">
+<project name="common-wab" >
<import file="../common/common.xml"/>
@@ -23,14 +23,14 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
- <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
+ <javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
+ debug="${compile.debug}" debugLevel="${compile.debug.level}" includeantruntime="false">
<compilerarg line="${compiler.args}"/>
<src path="@{input.dir}"/>
<include name="**/*.java"/>
<include name="*.java"/>
<classpath refid="@{classpath.id}"/>
- </s:javac>
+ </javac>
<copy todir="@{output.dir}">
<fileset dir="@{input.dir}" erroronmissingdir="false">
<exclude name="**/*.java"/>
diff --git a/wab/quality.xml b/wab/quality.xml
index 8f11c43..b0694c5 100644
--- a/wab/quality.xml
+++ b/wab/quality.xml
@@ -12,7 +12,7 @@
* SAP AG - initial contribution
******************************************************************************
-->
-<project name="quality-wab" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:osgi="antlib:org.springframework.build.osgi">
+<project name="quality-wab" xmlns:ivy="antlib:org.apache.ivy.ant" >
<import file="common.xml"/>
<import file="../common/quality.xml"/>
diff --git a/war/artifact.xml b/war/artifact.xml
index a880b3e..cafc320 100644
--- a/war/artifact.xml
+++ b/war/artifact.xml
@@ -55,19 +55,9 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
- <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.ant"
- revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
conf="runtime" type="jar" inline="true" log="download-only"/>
- <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
- <classpath>
- <path refid="spring.ant.classpath"/>
- <path refid="ecj.classpath"/>
- </classpath>
- </taskdef>
</target>
<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
diff --git a/war/common.xml b/war/common.xml
index ba9825d..febb036 100644
--- a/war/common.xml
+++ b/war/common.xml
@@ -9,9 +9,10 @@
*
* Contributors:
* VMware Inc. - initial contribution
+ *
******************************************************************************
-->
-<project name="common-war" xmlns:s="antlib:org.springframework.build">
+<project name="common-war" >
<import file="../common/common.xml"/>
@@ -22,14 +23,14 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
- <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
+ <javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
+ debug="${compile.debug}" debugLevel="${compile.debug.level}" includeantruntime="false">
<compilerarg line="${compiler.args}"/>
<src path="@{input.dir}"/>
<include name="**/*.java"/>
<include name="*.java"/>
<classpath refid="@{classpath.id}"/>
- </s:javac>
+ </javac>
<copy todir="@{output.dir}">
<fileset dir="@{input.dir}" erroronmissingdir="false">
<exclude name="**/*.java"/>
diff --git a/war/quality.xml b/war/quality.xml
index 08cbac5..2dd88a8 100644
--- a/war/quality.xml
+++ b/war/quality.xml
@@ -11,7 +11,7 @@
* VMware Inc. - initial contribution
******************************************************************************
-->
-<project name="quality-war" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:osgi="antlib:org.springframework.build.osgi">
+<project name="quality-war" xmlns:ivy="antlib:org.apache.ivy.ant" >
<import file="common.xml"/>
<import file="../common/quality.xml"/>
diff --git a/weaving-external/artifact.xml b/weaving-external/artifact.xml
index a5c33ca..24ab9af 100644
--- a/weaving-external/artifact.xml
+++ b/weaving-external/artifact.xml
@@ -49,20 +49,9 @@
module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime"
type="jar" inline="true" log="download-only"/>
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/>
-
- <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.ant"
- revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
conf="runtime" type="jar" inline="true" log="download-only"/>
- <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
- <classpath>
- <path refid="spring.ant.classpath"/>
- <path refid="ecj.classpath"/>
- </classpath>
- </taskdef>
</target>
<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
diff --git a/weaving-external/common.xml b/weaving-external/common.xml
index ebccde4..7eac0aa 100644
--- a/weaving-external/common.xml
+++ b/weaving-external/common.xml
@@ -9,9 +9,10 @@
*
* Contributors:
* VMware Inc. - initial contribution
+ *
******************************************************************************
-->
-<project name="common-weaving-external" xmlns:s="antlib:org.springframework.build">
+<project name="common-weaving-external" >
<import file="../common/common.xml"/>
@@ -22,14 +23,14 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
- <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
+ <javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
+ debug="${compile.debug}" debugLevel="${compile.debug.level}" includeantruntime="false">
<compilerarg line="${compiler.args}"/>
<src path="@{input.dir}"/>
<include name="**/*.java"/>
<include name="*.java"/>
<classpath refid="@{classpath.id}"/>
- </s:javac>
+ </javac>
<copy todir="@{output.dir}">
<fileset dir="@{input.dir}" erroronmissingdir="false">
<exclude name="**/*.java"/>
diff --git a/weaving/artifact.xml b/weaving/artifact.xml
index c00d919..58cc697 100644
--- a/weaving/artifact.xml
+++ b/weaving/artifact.xml
@@ -26,20 +26,9 @@
module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime"
type="jar" inline="true" log="download-only"/>
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/>
-
- <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
- organisation="org.springframework.build" module="org.springframework.build.ant"
- revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
- log="download-only"/>
<ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt"
module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}"
conf="runtime" type="jar" inline="true" log="download-only"/>
- <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
- <classpath>
- <path refid="spring.ant.classpath"/>
- <path refid="ecj.classpath"/>
- </classpath>
- </taskdef>
</target>
<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
diff --git a/weaving/common.xml b/weaving/common.xml
index 2611ba4..10326b1 100644
--- a/weaving/common.xml
+++ b/weaving/common.xml
@@ -9,9 +9,10 @@
*
* Contributors:
* VMware Inc. - initial contribution
+ *
******************************************************************************
-->
-<project name="common-weaving" xmlns:s="antlib:org.springframework.build">
+<project name="common-weaving" >
<import file="../common/common.xml"/>
@@ -22,14 +23,14 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
- <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
+ <javac destdir="@{output.dir}" source="${source.version}" target="${target.version}"
+ debug="${compile.debug}" debugLevel="${compile.debug.level}" includeantruntime="false">
<compilerarg line="${compiler.args}"/>
<src path="@{input.dir}"/>
<include name="**/*.java"/>
<include name="*.java"/>
<classpath refid="@{classpath.id}"/>
- </s:javac>
+ </javac>
<copy todir="@{output.dir}">
<fileset dir="@{input.dir}" erroronmissingdir="false">
<exclude name="**/*.java"/>
