Update compile-java to expose main.sources[*] property
git-svn-id: https://svn.apache.org/repos/asf/ant/easyant/plugins/trunk@1507618 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compile-java/module.ivy b/compile-java/module.ivy
index ce6ed2d..38028b8 100644
--- a/compile-java/module.ivy
+++ b/compile-java/module.ivy
@@ -15,7 +15,7 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="compile-java" revision="0.9">
+ <info organisation="org.apache.easyant.plugins" module="compile-java" revision="0.10">
<extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" location="../parent.ivy" />
<description>This module provides java compilation feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
@@ -30,4 +30,4 @@
<publications>
<artifact type="ant" />
</publications>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/compile-java/src/main/resources/compile-java.ant b/compile-java/src/main/resources/compile-java.ant
index 1e2c6bf..e08c347 100644
--- a/compile-java/src/main/resources/compile-java.ant
+++ b/compile-java/src/main/resources/compile-java.ant
@@ -17,23 +17,25 @@
<project name="org.apache.easyant.plugins#compile-java" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:plugin module="abstract-compile" revision="0.9" />
-
- <target name="compile-java:init">
- <ea:parameter property="src.main.java" required="true" description="directory where sources to be compiled are" />
- <ea:parameter property="javac.debug.mode" default="true" description="javac debug mode, true or false" />
- <ea:parameter property="compile.java.includes.pattern" default="**/*.java"
- description="Pattern describing files included in compilation process" />
- <ea:parameter property="compile.java.excludes.pattern" default=""
- description="Pattern describing files excluded in compilation process" />
- <ea:parameter property="compile.java.target.version" default="${ant.java.version}"
- description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
- <ea:parameter property="compile.java.source.version" default="${ant.java.version}"
- description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
- <available file="${src.main.java}" property="has.src.main.java" />
- </target>
-
- <target name="compile-java:compile" depends="compile-java:init,abstract-compile:compile-ready" if="has.src.main.java"
+ <ea:plugin module="abstract-compile" revision="0.10" />
+
+ <ea:parameter property="src.main.java" default="${basedir}/src/main/java" description="directory where sources to be compiled are" />
+ <ea:parameter property="javac.debug.mode" default="false" description="javac debug mode, true or false" />
+ <ea:parameter property="compile.java.includes.pattern" default="**/*.java"
+ description="Pattern describing files included in compilation process" />
+ <ea:parameter property="compile.java.excludes.pattern" default=""
+ description="Pattern describing files excluded in compilation process" />
+ <ea:parameter property="compile.java.target.version" default="${ant.java.version}"
+ description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
+ <ea:parameter property="compile.java.source.version" default="${ant.java.version}"
+ description="Specify a value of the -source command-line switch; will be ignored by all implementations prior to javac1.4 (or modern when Ant is not running in a 1.3 VM) and jikes" />
+ <available file="${src.main.java}" property="has.src.main.java" />
+
+ <property name="main.sources" value="${src.main.java}"/>
+ <property name="main.sources.includes" value="${compile.java.includes.pattern}"/>
+ <property name="main.sources.excludes" value="${compile.java.excludes.pattern}"/>
+
+ <target name="compile-java:compile" depends="abstract-compile:compile-ready" if="has.src.main.java"
extensionOf="abstract-compile:compile">
<mkdir dir="${target.main.classes}" />
<javac srcdir="${src.main.java}" destdir="${target.main.classes}" debug="${javac.debug.mode}" source="${compile.java.source.version}"
diff --git a/compile-java/src/test/antunit/compile-java-test.xml b/compile-java/src/test/antunit/compile-java-test.xml
index 1809217..6d5f27b 100644
--- a/compile-java/src/test/antunit/compile-java-test.xml
+++ b/compile-java/src/test/antunit/compile-java-test.xml
@@ -24,9 +24,6 @@
<!-- import our local plugin -->
<ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <property name="src.main.java" value="${basedir}/src/main/java" />
- <property name="javac.debug.mode" value="false" />
-
<!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
<delete dir="${basedir}" includeemptydirs="true">
@@ -38,7 +35,7 @@
<target name="setUp" depends="clean" />
<target name="tearDown" depends="clean" />
- <target name="test-compile-java:init" depends="compile-java:init">
+ <target name="test-compile-java:init">
<au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java" />
<au:assertPropertyEquals name="javac.debug.mode" value="false" />
<au:assertPropertyEquals name="compile.java.includes.pattern" value="**/*.java" />
@@ -46,6 +43,10 @@
<au:assertPropertyEquals name="compile.java.target.version" value="${ant.java.version}" />
<au:assertPropertyEquals name="compile.java.source.version" value="${ant.java.version}" />
<au:assertPropertyEquals name="has.src.main.java" value="true" />
+
+ <au:assertPropertyEquals name="main.sources" value="${basedir}/src/main/java"/>
+ <au:assertPropertyEquals name="main.sources.includes" value="**/*.java"/>
+ <au:assertPropertyEquals name="main.sources.excludes" value=""/>
</target>
<target name="test-compile-java:compile" depends="compile-java:compile">
@@ -53,4 +54,4 @@
<au:assertFileExists file="${target.main.classes}/org/apache/easyant/example/Example.class" />
<au:assertFileExists file="${target.main.classes}/org/apache/easyant/example/Example2.class" />
</target>
-</project>
\ No newline at end of file
+</project>
