You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2011/02/22 14:51:30 UTC
svn commit: r1073348 - in /incubator/easyant/buildtypes/trunk: ./
build-osgi-bundle-java/ build-osgi-bundle-java/src/main/resources/
build-std-ant-plugin/ build-std-ant-plugin/src/main/resources/
build-std-groovy/ build-std-groovy/src/main/resources/ b...
Author: hibou
Date: Tue Feb 22 14:51:30 2011
New Revision: 1073348
URL: http://svn.apache.org/viewvc?rev=1073348&view=rev
Log:
4 spaces in place of tabulations
Modified:
incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/module.ivy
incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.properties
incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.properties
incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy
incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.properties
incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.properties
incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy
incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.properties
incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
incubator/easyant/buildtypes/trunk/meta-build/module.ivy
incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant
incubator/easyant/buildtypes/trunk/module.ivy
incubator/easyant/buildtypes/trunk/parent.ivy
Modified: incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-osgi-bundle-java" revision="0.1">
- <description>A standard build for osgi bundle modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-osgi-bundle-java" revision="0.1">
+ <description>A standard build for osgi bundle modules, relying on standard phases, and providing compilation, execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.ant Tue Feb 22 14:51:30 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-osgi-bundle-java"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-osgi-bundle-java..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-osgi-bundle-java..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-osgi-bundle-java.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-osgi-bundle-java.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
-
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#osgi-bundle;0.1" as="osgi" />
-
- <target name="doit" depends="verify" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#osgi-bundle;0.1" as="osgi" />
+
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.properties?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.properties (original)
+++ incubator/easyant/buildtypes/trunk/build-osgi-bundle-java/src/main/resources/build-osgi-bundle-java.properties Tue Feb 22 14:51:30 2011
@@ -35,4 +35,4 @@ target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1">
- <description>A standard build for true ant plugins, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1">
+ <description>A standard build for true ant plugins, relying on standard phases, and providing compilation, execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant Tue Feb 22 14:51:30 2011
@@ -15,27 +15,27 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-ant-plugin"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-ant-plugin..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-ant-plugin..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-ant-plugin.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
-
- <target name="doit" depends="verify" />
+ <property file="${org.apache.easyant.buildtypes#build-std-ant-plugin.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
+
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.properties?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.properties (original)
+++ incubator/easyant/buildtypes/trunk/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.properties Tue Feb 22 14:51:30 2011
@@ -38,4 +38,4 @@ target.report=${target}/report
release.resolver=easyant-shared-modules
shared.resolver=easyant-shared-modules
local.resolver=easyant-shared-modules
-project.ivy.instance=easyant.ivy.instance
\ No newline at end of file
+project.ivy.instance=easyant.ivy.instance
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,16 +15,16 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-std-groovy" revision="0.1">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-std-groovy" revision="0.1">
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.ant Tue Feb 22 14:51:30 2011
@@ -15,37 +15,37 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-groovy"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-groovy..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-groovy..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-groovy.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-std-groovy.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-groovy;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-groovy;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-groovy;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-groovy;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.properties?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.properties (original)
+++ incubator/easyant/buildtypes/trunk/build-std-groovy/src/main/resources/build-std-groovy.properties Tue Feb 22 14:51:30 2011
@@ -41,4 +41,4 @@ target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/buildtypes/trunk/build-std-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2">
- <description>A standard build for simple java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2">
+ <description>A standard build for simple java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.ant Tue Feb 22 14:51:30 2011
@@ -16,39 +16,39 @@
-->
<project name="org.apache.easyant.buildtypes#build-std-java" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
+ <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-java..." />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-java..." />
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-java.properties.file}" />
+ <property file="${org.apache.easyant.buildtypes#build-std-java.properties.file}" />
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
-
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.properties?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.properties (original)
+++ incubator/easyant/buildtypes/trunk/build-std-java/src/main/resources/build-std-java.properties Tue Feb 22 14:51:30 2011
@@ -34,4 +34,4 @@ target.artifacts.test.jar.name=${module.
target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,16 +15,16 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-std-scala" revision="0.1">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-std-scala" revision="0.1">
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.ant Tue Feb 22 14:51:30 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-scala"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-scala..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-std-scala.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-scala;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-scala;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-scala;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-scala;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.properties?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.properties (original)
+++ incubator/easyant/buildtypes/trunk/build-std-scala/src/main/resources/build-std-scala.properties Tue Feb 22 14:51:30 2011
@@ -42,4 +42,4 @@ target.report=${target}/report
manifest.file=${target}/MANIFEST.MF
-test.framework=junit
\ No newline at end of file
+test.framework=junit
Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-std-skeleton" revision="0.1">
- <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-std-skeleton" revision="0.1">
+ <description>A standard build skeleton, relying on standard phases, and providing unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-std-skeleton/src/main/resources/build-std-skeleton.ant Tue Feb 22 14:51:30 2011
@@ -15,29 +15,29 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-std-skeleton"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-std-skeleton..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
+ <property file="${org.apache.easyant.buildtypes#build-std-skeleton.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="org.apache.easyant.plugins#easyant-plugin-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#antunit;0.1" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#package-jar;0.1" as="jar" />
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,17 +15,17 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1">
- <description>A standard build for webapp java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1">
+ <description>A standard build for webapp java modules, relying on standard phases, and providing compilation, execution and unit tests</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant (original)
+++ incubator/easyant/buildtypes/trunk/build-webapp-java/src/main/resources/build-webapp-java.ant Tue Feb 22 14:51:30 2011
@@ -15,38 +15,38 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#build-webapp-java"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
- <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
-
- <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+ <echo message="Building ${ivy.organisation} ${ivy.module} with org.apache.easyant.buildtypes#build-webapp-java..."/>
+
+ <ea:import mrid="org.apache.easyant.plugins#phases-std;0.2" />
- <property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}" />
-
- <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
- <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
- <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
+ <property file="${org.apache.easyant.buildtypes#build-webapp-java.properties.file}" />
+
+ <ea:parameter property="version.strategy.plugin.org" description="Organisation name of the version strategy plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="version.strategy.plugin.module" description="Module name of the version strategy plugin" default="default-version-strategy"/>
+ <ea:parameter property="version.strategy.plugin.rev" description="Revision number of the version strategy plugin" default="0.1"/>
+ <ea:parameter property="version.strategy.plugin.mrid" description="Full mrid of the version strategy plugin" default="${version.strategy.plugin.org}#${version.strategy.plugin.module};${version.strategy.plugin.rev}"/>
- <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
- <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
- <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
- <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
+ <ea:parameter property="test.plugin.org" description="Organisation name of the test plugin" default="org.apache.easyant.plugins"/>
+ <ea:parameter property="test.plugin.module" description="Module name of the test plugin" default="test-${test.framework}"/>
+ <ea:parameter property="test.plugin.rev" description="Revision number of the test plugin" default="0.2"/>
+ <ea:parameter property="test.plugin.mrid" description="Full mrid of the test plugin" default="${test.plugin.org}#${test.plugin.module};${test.plugin.rev}"/>
-
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
-
- <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
- <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
- <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
- <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
- <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
- <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
- <ea:include mrid="${test.plugin.mrid}" as="test" />
- <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
- <ea:include mrid="org.apache.easyant.plugins#package-war;0.1" as="war" />
-
- <target name="doit" depends="verify" />
+
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean" />
+
+ <ea:include mrid="org.apache.easyant.plugins#ivy-provisioning;0.1" as="lib" />
+ <ea:include mrid="${version.strategy.plugin.mrid}" as="version" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-publication;0.1" as="publish" />
+ <ea:include mrid="org.apache.easyant.plugins#ivy-utils;0.1" as="ivy" />
+ <ea:include mrid="org.apache.easyant.plugins#resources-std;0.1" as="resources" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-java;0.1" as="compile" />
+ <ea:include mrid="org.apache.easyant.plugins#compile-test-java;0.1" as="compile-test" />
+ <ea:include mrid="${test.plugin.mrid}" as="test" />
+ <ea:include mrid="org.apache.easyant.plugins#manifest;0.1" as="manifest" />
+ <ea:include mrid="org.apache.easyant.plugins#package-war;0.1" as="war" />
+
+ <target name="doit" depends="verify" />
</project>
Modified: incubator/easyant/buildtypes/trunk/meta-build/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,18 +15,18 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="meta-build" revision="0.2">
- <description>This build type allows you to recursively build multi-module projects,
- with internal dependencies between modules.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.buildtypes" module="meta-build" revision="0.2">
+ <description>This build type allows you to recursively build multi-module projects,
+ with internal dependencies between modules.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
<conf name="test" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
<conf name="provided" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
</configurations>
- <publications>
- <artifact type="ant"/>
- <artifact type="properties"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ <artifact type="properties"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant Tue Feb 22 14:51:30 2011
@@ -15,18 +15,17 @@
limitations under the License.
-->
<project name="org.apache.easyant.buildtypes#meta-build"
- xmlns:ea="antlib:org.apache.easyant"
- xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <ea:include mrid="org.apache.easyant.plugins#phases-std;0.2"/>
-
- <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
+ xmlns:ea="antlib:org.apache.easyant"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:include mrid="org.apache.easyant.plugins#phases-std;0.2"/>
+
+ <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
- <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
- <ea:include mrid="org.apache.easyant.plugins#build-tools;0.2" as="meta"/>
+ <ea:include mrid="org.apache.easyant.plugins#clean-std;0.1" as="clean"/>
+ <ea:include mrid="org.apache.easyant.plugins#build-tools;0.2" as="meta"/>
- <target name="doit" depends="verify" />
+ <target name="doit" depends="verify" />
</project>
-
Modified: incubator/easyant/buildtypes/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/module.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/module.ivy Tue Feb 22 14:51:30 2011
@@ -15,10 +15,10 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
- <description>This module acts as orchestrator to build all easyant buildtypes.</description>
- <ea:build module="meta-build" revision="0.2"/>
- <!-- If we use build scoped repository easyant use it as a dictator resolver, this have side effects as we use same ivy instance to build the plugin and to resolve plugin dependencies -->
- <ea:property name="use.build.repository" value="false"/>
- </info>
+ <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
+ <description>This module acts as orchestrator to build all easyant buildtypes.</description>
+ <ea:build module="meta-build" revision="0.2"/>
+ <!-- If we use build scoped repository easyant use it as a dictator resolver, this have side effects as we use same ivy instance to build the plugin and to resolve plugin dependencies -->
+ <ea:property name="use.build.repository" value="false"/>
+ </info>
</ivy-module>
Modified: incubator/easyant/buildtypes/trunk/parent.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/parent.ivy?rev=1073348&r1=1073347&r2=1073348&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/parent.ivy (original)
+++ incubator/easyant/buildtypes/trunk/parent.ivy Tue Feb 22 14:51:30 2011
@@ -15,11 +15,11 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
- <description>This module acts as parent to share common stuff for subprojects.</description>
- <ea:plugin module="scm-svn" revision="0.1" as="scm" load-strategy="LOCAL">
- <ea:property name="scm.connection.baseurl" value="https://svn.easyant.org/buildtypes/trunk"/>
- <ea:property name="scm.tag.name" value="${ivy.module}-${version}"/>
- </ea:plugin>
- </info>
+ <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
+ <description>This module acts as parent to share common stuff for subprojects.</description>
+ <ea:plugin module="scm-svn" revision="0.1" as="scm" load-strategy="LOCAL">
+ <ea:property name="scm.connection.baseurl" value="https://svn.easyant.org/buildtypes/trunk"/>
+ <ea:property name="scm.tag.name" value="${ivy.module}-${version}"/>
+ </ea:plugin>
+ </info>
</ivy-module>