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:59:20 UTC
svn commit: r1073355 [6/8] - in /incubator/easyant/plugins/trunk: ./
abstract-coverage/ abstract-coverage/src/main/resources/ abstract-test/
abstract-test/src/main/resources/ antcontrib-activator/
antcontrib-activator/src/main/resources/ antunit/ antun...
Modified: incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant (original)
+++ incubator/easyant/plugins/trunk/osgi-bundle/src/main/resources/osgi-bundle.ant Tue Feb 22 14:59:17 2011
@@ -15,115 +15,115 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#osgi-bundle" xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
+
+ <ea:core-version requiredrevision="[0.8,+]" />
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
- <ea:parameter property="target.artifacts.main.bundle.name" required="true"
- description="main artifact file name" />
- <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
- default="${target.artifacts}/${target.artifacts.main.bundle.name}.jar"/>
- <taskdef name="bundle"
- classname="net.luminis.build.plugin.bnd.BuildTask"
- classpathref="org.apache.easyant.plugins#osgi-bundle.classpath" />
- </target>
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+ <ea:parameter property="target.artifacts.main.bundle.name" required="true"
+ description="main artifact file name" />
+ <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
+ default="${target.artifacts}/${target.artifacts.main.bundle.name}.jar"/>
+ <taskdef name="bundle"
+ classname="net.luminis.build.plugin.bnd.BuildTask"
+ classpathref="org.apache.easyant.plugins#osgi-bundle.classpath" />
+ </target>
- <target name=":bundle" depends="validate, compile,prepare-package" phase="package">
- <dirname file="${target.artifacts.main.bundle.name}" property="target.artifacts.main.bundle.dir" />
- <mkdir dir="${target.artifacts.main.bundle.dir}"/>
+ <target name=":bundle" depends="validate, compile,prepare-package" phase="package">
+ <dirname file="${target.artifacts.main.bundle.name}" property="target.artifacts.main.bundle.dir" />
+ <mkdir dir="${target.artifacts.main.bundle.dir}"/>
- <condition property="is.osgi.bundle.empty">
- <or>
- <isset property="osgi.export.package"/>
- <isset property="osgi.private.package"/>
- <isset property="osgi.include.resource"/>
- </or>
- </condition>
-
- <fail unless="is.osgi.bundle.empty">
-Missing property
-*******************************************************************************
+ <condition property="is.osgi.bundle.empty">
+ <or>
+ <isset property="osgi.export.package"/>
+ <isset property="osgi.private.package"/>
+ <isset property="osgi.include.resource"/>
+ </or>
+ </condition>
+
+ <fail unless="is.osgi.bundle.empty">
+Missing property
+*******************************************************************************
At least one of the following property must be set :
- osgi.export.package : The packages that will be exported by the bundle.
- osgi.private.package : The private packages of the generated bundle (i.e. packages that are not exported).
- osgi.include.resource : Resource to include in the generated bundle.
-*******************************************************************************
- </fail>
-
- <!-- Should we provide a way to fill the following properties in interractive mode? -->
- <ea:parameter property="osgi.bundle.classpath" default="" description="The (internal) bundle classpath (corresponds to OSGi manifest header 'Bundle-Classpath')."/>
- <ea:parameter property="osgi.bundle.copyright" default="" description="Copyright header (corresponds to OSGi manifest header 'Bundle-Copyright')."/>
- <ea:parameter property="osgi.bundle.description" default="" description="Bundle description text (corresponds to OSGi manifest header 'Bundle-Description')."/>
- <ea:parameter property="osgi.bundle.name" default="" description="Name of the bundle (corresponds to OSGi manifest header 'Bundle-Name')."/>
- <ea:parameter property="osgi.bundle.native.code" default="" description="Native code specification (corresponds to OSGi manifest header 'Bundle-NativeCode'). "/>
- <ea:parameter property="osgi.export.package" default="" description="The packages that will be exported by the bundle."/>
- <ea:parameter property="osgi.export.service" default="" description="The OSGi R3 'Export-Service' header, deprecated for R4 "/>
- <ea:parameter property="osgi.import.package" default="" description="The packages that will be imported by the bundle."/>
- <ea:parameter property="osgi.dynamic.import.package" default="" description="The packages that should be dynamically import when needed."/>
- <ea:parameter property="osgi.import.service" default="" description="The OSGi R3 'Import-Service' header, deprecated for R4."/>
- <ea:parameter property="osgi.bundle.vendor" default="" description="Vendor name (corresponds to OSGi manifest header 'Bundle-Vendor')."/>
- <ea:parameter property="osgi.bundle.version" default="${version}" description="Bundle version (corresponds to OSGi manifest header 'Bundle-Version')."/>
- <ea:parameter property="osgi.bundle.doc.url" default="" description="URL pointing to documentation about the created bundle (corresponds to OSGi manifest header 'Bundle-DocURL')."/>
- <ea:parameter property="osgi.bundle.contact.address" default="" description="Vendor's contact address (corresponds to OSGi manifest header 'Bundle-ContactAddress')."/>
- <ea:parameter property="osgi.bundle.activator" default="" description="The bundle activator class (corresponds to OSGi manifest header 'Bundle-Activator')."/>
- <ea:parameter property="osgi.bundle.required.execution.env" default="" description="List of execution environments (corresponds to OSGi manifest header 'Bundle-RequiredExecutionEnvironment')."/>
- <ea:parameter property="osgi.bundle.symbolic.name" default="" description="The (unique, non-localizable) symbolic name of the bundle, based on reverse domain name convention (corresponds to OSGi manifest header 'Bundle-SymbolicName')."/>
- <ea:parameter property="osgi.bundle.localization" default="" description="Location in the bundle where localization files can be found (corresponds to OSGi manifest header 'Bundle-Localization')."/>
- <ea:parameter property="osgi.bundle.require.bundle" default="" description="Required exports from another bundle (corresponds to OSGi manifest header 'Require-Bundle')."/>
- <ea:parameter property="osgi.bundle.fragment.host" default="" description="Host bundle (for fragment bundles only, corresponds to OSGi manifest header 'Fragment-Host')."/>
- <!--
- <ea:parameter property="osgi.bundle.manifest.version" default="" description="deprecated and ignored Bundle-ManifestVersion is always '2' (R4 bundle) "/>
- <ea:parameter property="osgi.service.component" default="" description="??? Undocumented"/>
- -->
- <ea:parameter property="osgi.bundle.license" default="" description="Manifest header for bundle license."/>
- <ea:parameter property="osgi.private.package" default="" description="The private packages of the generated bundle (i.e. packages that are not exported)."/>
- <!--
- <ea:parameter property="osgi.ignore.package" default="" description="??? Undocumented"/>
- -->
- <ea:parameter property="osgi.include.resource" default="" description="Resource to include in the generated bundle."/>
- <ea:parameter property="osgi.include.resource.header" default="" description="Whether to include the include-resource header in the manifest."/>
- <ea:parameter property="osgi.additional.manifest" default="${manifest.file}" description="Specify an additional manifest file"/>
-
- <!-- Override this path if you need to customize what will be included in the osgi-bundle
- <bundle> ant task allow you to make bundle from another JAR, or a list of DIRECTORY.
- This is quite strange but you can't use <fileset>.
- If you need to make a bundle of classes you should set here a directory with <filelist>
- -->
- <path id="osgi.classpath">
- <filelist><file name="${target.main.classes}"/></filelist>
- </path>
-
- <bundle outputDir="${target.artifacts}"
- bundleClassPath="${osgi.bundle.classpath}"
- bundleCopyright="${osgi.bundle.copyright}"
- bundleDescription="${osgi.bundle.description}"
- bundleName="${osgi.bundle.name}"
- bundleNativeCode="${osgi.bundle.native.code}"
- exportpackage="${osgi.export.package}"
- exportService="${osgi.export.service}"
- importPackage="${osgi.import.package}"
- dynamicImportPackage="${osgi.dynamic.import.package}"
- importService="${osgi.import.service}"
- bundleVendor="${osgi.bundle.vendor}"
- bundleVersion="${osgi.bundle.version}"
- bundleDocUrl="${osgi.bundle.doc.url}"
- bundleContactAddress="${osgi.bundle.contact.address}"
- bundleActivator="${osgi.bundle.activator}"
- bundleRequiredExecutionEnvironment="${osgi.bundle.required.execution.env}"
- bundleSymbolicName="${osgi.bundle.symbolic.name}"
- bundleLocalization="${osgi.bundle.localization}"
- requireBundle="${osgi.bundle.require.bundle}"
- fragmentHost="${osgi.bundle.fragment.host}"
- bundleLicense="${osgi.bundle.license}"
- privatePackage="${osgi.private.package}"
- includeResource="${osgi.include.resource}"
- includeIncludeResourceHeader="${osgi.include.resource.header}"
- additionalManifest="${osgi.additional.manifest}"
- filename="${target.artifacts.main.bundle.name}"
- classpathRefId="osgi.classpath"/>
- </target>
-
- <target name="doit" depends=":bundle" />
+*******************************************************************************
+ </fail>
+
+ <!-- Should we provide a way to fill the following properties in interractive mode? -->
+ <ea:parameter property="osgi.bundle.classpath" default="" description="The (internal) bundle classpath (corresponds to OSGi manifest header 'Bundle-Classpath')."/>
+ <ea:parameter property="osgi.bundle.copyright" default="" description="Copyright header (corresponds to OSGi manifest header 'Bundle-Copyright')."/>
+ <ea:parameter property="osgi.bundle.description" default="" description="Bundle description text (corresponds to OSGi manifest header 'Bundle-Description')."/>
+ <ea:parameter property="osgi.bundle.name" default="" description="Name of the bundle (corresponds to OSGi manifest header 'Bundle-Name')."/>
+ <ea:parameter property="osgi.bundle.native.code" default="" description="Native code specification (corresponds to OSGi manifest header 'Bundle-NativeCode'). "/>
+ <ea:parameter property="osgi.export.package" default="" description="The packages that will be exported by the bundle."/>
+ <ea:parameter property="osgi.export.service" default="" description="The OSGi R3 'Export-Service' header, deprecated for R4 "/>
+ <ea:parameter property="osgi.import.package" default="" description="The packages that will be imported by the bundle."/>
+ <ea:parameter property="osgi.dynamic.import.package" default="" description="The packages that should be dynamically import when needed."/>
+ <ea:parameter property="osgi.import.service" default="" description="The OSGi R3 'Import-Service' header, deprecated for R4."/>
+ <ea:parameter property="osgi.bundle.vendor" default="" description="Vendor name (corresponds to OSGi manifest header 'Bundle-Vendor')."/>
+ <ea:parameter property="osgi.bundle.version" default="${version}" description="Bundle version (corresponds to OSGi manifest header 'Bundle-Version')."/>
+ <ea:parameter property="osgi.bundle.doc.url" default="" description="URL pointing to documentation about the created bundle (corresponds to OSGi manifest header 'Bundle-DocURL')."/>
+ <ea:parameter property="osgi.bundle.contact.address" default="" description="Vendor's contact address (corresponds to OSGi manifest header 'Bundle-ContactAddress')."/>
+ <ea:parameter property="osgi.bundle.activator" default="" description="The bundle activator class (corresponds to OSGi manifest header 'Bundle-Activator')."/>
+ <ea:parameter property="osgi.bundle.required.execution.env" default="" description="List of execution environments (corresponds to OSGi manifest header 'Bundle-RequiredExecutionEnvironment')."/>
+ <ea:parameter property="osgi.bundle.symbolic.name" default="" description="The (unique, non-localizable) symbolic name of the bundle, based on reverse domain name convention (corresponds to OSGi manifest header 'Bundle-SymbolicName')."/>
+ <ea:parameter property="osgi.bundle.localization" default="" description="Location in the bundle where localization files can be found (corresponds to OSGi manifest header 'Bundle-Localization')."/>
+ <ea:parameter property="osgi.bundle.require.bundle" default="" description="Required exports from another bundle (corresponds to OSGi manifest header 'Require-Bundle')."/>
+ <ea:parameter property="osgi.bundle.fragment.host" default="" description="Host bundle (for fragment bundles only, corresponds to OSGi manifest header 'Fragment-Host')."/>
+ <!--
+ <ea:parameter property="osgi.bundle.manifest.version" default="" description="deprecated and ignored Bundle-ManifestVersion is always '2' (R4 bundle) "/>
+ <ea:parameter property="osgi.service.component" default="" description="??? Undocumented"/>
+ -->
+ <ea:parameter property="osgi.bundle.license" default="" description="Manifest header for bundle license."/>
+ <ea:parameter property="osgi.private.package" default="" description="The private packages of the generated bundle (i.e. packages that are not exported)."/>
+ <!--
+ <ea:parameter property="osgi.ignore.package" default="" description="??? Undocumented"/>
+ -->
+ <ea:parameter property="osgi.include.resource" default="" description="Resource to include in the generated bundle."/>
+ <ea:parameter property="osgi.include.resource.header" default="" description="Whether to include the include-resource header in the manifest."/>
+ <ea:parameter property="osgi.additional.manifest" default="${manifest.file}" description="Specify an additional manifest file"/>
+
+ <!-- Override this path if you need to customize what will be included in the osgi-bundle
+ <bundle> ant task allow you to make bundle from another JAR, or a list of DIRECTORY.
+ This is quite strange but you can't use <fileset>.
+ If you need to make a bundle of classes you should set here a directory with <filelist>
+ -->
+ <path id="osgi.classpath">
+ <filelist><file name="${target.main.classes}"/></filelist>
+ </path>
+
+ <bundle outputDir="${target.artifacts}"
+ bundleClassPath="${osgi.bundle.classpath}"
+ bundleCopyright="${osgi.bundle.copyright}"
+ bundleDescription="${osgi.bundle.description}"
+ bundleName="${osgi.bundle.name}"
+ bundleNativeCode="${osgi.bundle.native.code}"
+ exportpackage="${osgi.export.package}"
+ exportService="${osgi.export.service}"
+ importPackage="${osgi.import.package}"
+ dynamicImportPackage="${osgi.dynamic.import.package}"
+ importService="${osgi.import.service}"
+ bundleVendor="${osgi.bundle.vendor}"
+ bundleVersion="${osgi.bundle.version}"
+ bundleDocUrl="${osgi.bundle.doc.url}"
+ bundleContactAddress="${osgi.bundle.contact.address}"
+ bundleActivator="${osgi.bundle.activator}"
+ bundleRequiredExecutionEnvironment="${osgi.bundle.required.execution.env}"
+ bundleSymbolicName="${osgi.bundle.symbolic.name}"
+ bundleLocalization="${osgi.bundle.localization}"
+ requireBundle="${osgi.bundle.require.bundle}"
+ fragmentHost="${osgi.bundle.fragment.host}"
+ bundleLicense="${osgi.bundle.license}"
+ privatePackage="${osgi.private.package}"
+ includeResource="${osgi.include.resource}"
+ includeIncludeResourceHeader="${osgi.include.resource.header}"
+ additionalManifest="${osgi.additional.manifest}"
+ filename="${target.artifacts.main.bundle.name}"
+ classpathRefId="osgi.classpath"/>
+ </target>
+
+ <target name="doit" depends=":bundle" />
</project>
Modified: incubator/easyant/plugins/trunk/package-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-jar/module.ivy Tue Feb 22 14:59:17 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.plugins" module="package-jar" revision="0.1">
- <description>This module provides jar packaging feature. </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="package-jar" revision="0.1">
+ <description>This module provides jar packaging feature. </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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant (original)
+++ incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant Tue Feb 22 14:59:17 2011
@@ -15,54 +15,54 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#package-jar"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="compile" />
- <ea:parameter phase="package" />
-
- <ea:parameter property="target.artifacts.main.jar.name" required="true"
- description="main artifact file name" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+ <ea:parameter phase="package" />
+
+ <ea:parameter property="target.artifacts.main.jar.name" required="true"
+ description="main artifact file name" />
- <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
- <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
- default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
+ <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+
+ <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
+ default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
- <ea:parameter property="target.main.classes" required="true"
- description="directory where compiled classes that should be packaged are" />
-
- <ea:parameter property="manifest.file" required="true"
- description="the file used to generate manifest" />
-
- <ea:parameter property="package.jar.includes.pattern" default="**/*"
- description="Pattern describing files included in the output jar" />
- <ea:parameter property="package.jar.excludes.pattern" default=""
- description="Pattern describing files excluded in the output jar" />
+ <ea:parameter property="target.main.classes" required="true"
+ description="directory where compiled classes that should be packaged are" />
+
+ <ea:parameter property="manifest.file" required="true"
+ description="the file used to generate manifest" />
+
+ <ea:parameter property="package.jar.includes.pattern" default="**/*"
+ description="Pattern describing files included in the output jar" />
+ <ea:parameter property="package.jar.excludes.pattern" default=""
+ description="Pattern describing files excluded in the output jar" />
- <ea:parameter property="package.metainf.basedir" default="${basedir}"
- description="basedir of the metainf fileset"/>
- <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
- description="Pattern describing files included in the META-INF of the package"/>
- <ea:parameter property="package.metainf.excludes.pattern" default=""
- description="Pattern describing files excluded in the META-INF of the package"/>
+ <ea:parameter property="package.metainf.basedir" default="${basedir}"
+ description="basedir of the metainf fileset"/>
+ <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
+ description="Pattern describing files included in the META-INF of the package"/>
+ <ea:parameter property="package.metainf.excludes.pattern" default=""
+ description="Pattern describing files excluded in the META-INF of the package"/>
- <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
- </target>
-
- <target name=":jar" depends="validate, compile,prepare-package" description="package project as a JAR"
- phase="package" unless="skip.jar.package">
- <mkdir dir="${target.artifacts}" />
- <jar destfile="${target.main.artifact}" manifest="${manifest.file}"
- basedir="${target.main.classes}" includes="${package.jar.includes.pattern}"
- excludes="${package.jar.excludes.pattern}">
- <metainf refid="package.metainf.fileset"/>
- </jar>
- </target>
+ <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+
+ </target>
+
+ <target name=":jar" depends="validate, compile,prepare-package" description="package project as a JAR"
+ phase="package" unless="skip.jar.package">
+ <mkdir dir="${target.artifacts}" />
+ <jar destfile="${target.main.artifact}" manifest="${manifest.file}"
+ basedir="${target.main.classes}" includes="${package.jar.includes.pattern}"
+ excludes="${package.jar.excludes.pattern}">
+ <metainf refid="package.metainf.fileset"/>
+ </jar>
+ </target>
- <target name="doit" depends=":jar" />
+ <target name="doit" depends=":jar" />
</project>
Modified: incubator/easyant/plugins/trunk/package-test-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-test-jar/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-test-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-test-jar/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,35 +15,35 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="package-test-jar" revision="0.1">
- <description>
- <p>This module provides jar packaging feature for tests.</p>
- <p>
- You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy file.
- Example :
- <code type="xml">
- <plugin name="package-test-jar" rev="0.1" as="test-jar"/>
- <bindtarget target="test-jar:jar" tophase="package"/>
- </code>
- Or as a nested element of the plugin
- <code type="xml">
- <plugin name="package-test-jar" rev="0.1" as="test-jar">
- <!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
- <bindtarget target=":jar" tophase="package"/>
- </plugin>
- </code>
-
- </p>
-
- </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="package-test-jar" revision="0.1">
+ <description>
+ <p>This module provides jar packaging feature for tests.</p>
+ <p>
+ You can bind targets of this plugin to package phase by using bindtarget element in your module.ivy file.
+ Example :
+ <code type="xml">
+ <plugin name="package-test-jar" rev="0.1" as="test-jar"/>
+ <bindtarget target="test-jar:jar" tophase="package"/>
+ </code>
+ Or as a nested element of the plugin
+ <code type="xml">
+ <plugin name="package-test-jar" rev="0.1" as="test-jar">
+ <!-- here, the target prefix is not mandatory as easyant can determine it from plugin element -->
+ <bindtarget target=":jar" tophase="package"/>
+ </plugin>
+ </code>
+
+ </p>
+
+ </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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/package-test-jar/src/main/resources/package-test-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-test-jar/src/main/resources/package-test-jar.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-test-jar/src/main/resources/package-test-jar.ant (original)
+++ incubator/easyant/plugins/trunk/package-test-jar/src/main/resources/package-test-jar.ant Tue Feb 22 14:59:17 2011
@@ -15,62 +15,62 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#package-test-jar"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="compile" />
- <ea:parameter phase="package" />
-
- <ea:parameter property="target.artifacts.test.jar.name" required="true"
- description="test artifact file name" />
-
- <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
- <ea:parameter property="test.jar.file" required="false" description="the location of the test jar file"
- default="${target.artifacts}/${target.artifacts.test.jar.name}"/>
-
- <ea:parameter property="target.test.classes" required="true"
- description="directory where compiled classes that should be packaged are" />
-
- <ea:parameter property="manifest.file" required="true"
- description="the file used to generate manifest" />
-
- <ea:parameter property="test.jar.includes.pattern" default="**/*"
- description="Pattern describing files included in the test jar" />
- <ea:parameter property="test.jar.excludes.pattern" default=""
- description="Pattern describing files excluded in the test jar" />
-
- <ea:parameter property="package.metainf.basedir" default="${basedir}"
- description="basedir of the metainf fileset"/>
- <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
- description="Pattern describing files included in the META-INF of the package"/>
- <ea:parameter property="package.metainf.excludes.pattern" default=""
- description="Pattern describing files excluded in the META-INF of the package"/>
-
- <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
- <condition property="has.src.test">
- <or>
- <available file="${src.test.java}" />
- <available file="${src.test.resources}" />
- </or>
- </condition>
-
- </target>
-
- <target name=":jar" depends="validate, test-compile" description="package test classes as a JAR"
- phase="package" if="has.src.test" unless="skip.test.package">
- <mkdir dir="${target.artifacts}" />
- <jar destfile="${test.jar.file}" manifest="${manifest.file}"
- basedir="${target.test.classes}" includes="${test.jar.includes.pattern}"
- excludes="${test.jar.excludes.pattern}">
- <metainf refid="package.metainf.fileset"/>
- </jar>
- <ea:registerartifact ext="jar" type="test-jar" classifier="test" settingsRef="${project.ivy.instance}"/>
- </target>
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+ <ea:parameter phase="package" />
+
+ <ea:parameter property="target.artifacts.test.jar.name" required="true"
+ description="test artifact file name" />
+
+ <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+
+ <ea:parameter property="test.jar.file" required="false" description="the location of the test jar file"
+ default="${target.artifacts}/${target.artifacts.test.jar.name}"/>
+
+ <ea:parameter property="target.test.classes" required="true"
+ description="directory where compiled classes that should be packaged are" />
+
+ <ea:parameter property="manifest.file" required="true"
+ description="the file used to generate manifest" />
+
+ <ea:parameter property="test.jar.includes.pattern" default="**/*"
+ description="Pattern describing files included in the test jar" />
+ <ea:parameter property="test.jar.excludes.pattern" default=""
+ description="Pattern describing files excluded in the test jar" />
+
+ <ea:parameter property="package.metainf.basedir" default="${basedir}"
+ description="basedir of the metainf fileset"/>
+ <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
+ description="Pattern describing files included in the META-INF of the package"/>
+ <ea:parameter property="package.metainf.excludes.pattern" default=""
+ description="Pattern describing files excluded in the META-INF of the package"/>
+
+ <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+
+ <condition property="has.src.test">
+ <or>
+ <available file="${src.test.java}" />
+ <available file="${src.test.resources}" />
+ </or>
+ </condition>
+
+ </target>
+
+ <target name=":jar" depends="validate, test-compile" description="package test classes as a JAR"
+ phase="package" if="has.src.test" unless="skip.test.package">
+ <mkdir dir="${target.artifacts}" />
+ <jar destfile="${test.jar.file}" manifest="${manifest.file}"
+ basedir="${target.test.classes}" includes="${test.jar.includes.pattern}"
+ excludes="${test.jar.excludes.pattern}">
+ <metainf refid="package.metainf.fileset"/>
+ </jar>
+ <ea:registerartifact ext="jar" type="test-jar" classifier="test" settingsRef="${project.ivy.instance}"/>
+ </target>
- <target name="doit" depends=":jar" />
+ <target name="doit" depends=":jar" />
</project>
Modified: incubator/easyant/plugins/trunk/package-war/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-war/module.ivy Tue Feb 22 14:59:17 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.plugins" module="package-war" revision="0.1">
- <description>This module provides war packaging feature. </description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="package-war" revision="0.1">
+ <description>This module provides war packaging feature. </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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant (original)
+++ incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant Tue Feb 22 14:59:17 2011
@@ -15,84 +15,84 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#package-war"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="compile" />
- <ea:parameter phase="package" />
-
- <ea:parameter property="target.artifacts.main.war.name" required="true"
- description="main artifact file name" />
- <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
-
-
- <ea:parameter property="target.main.classes" required="true"
- description="directory where compiled classes that should be packaged are" />
-
- <ea:parameter property="manifest.file" required="true"
- description="the file used to generate manifest" />
-
- <ea:parameter property="package.war.includes.pattern" default="**/*"
- description="Pattern describing files included in the output war" />
- <ea:parameter property="package.war.excludes.pattern" default=""
- description="Pattern describing files excluded in the output war" />
-
- <ea:parameter property="package.war.needxmlfile" default="false"
- description="Flag to indicate whether or not the web.xml file is needed. Iit should be set to false when generating servlet 2.5+ WAR files without a web.xml file."/>
-
- <ea:parameter property="src.main.webapp" required="true"
- description="directory where web resources files are stored (like pages, images, etc...)"/>
-
- <ea:parameter property="package.war.webxml.file" required="${package.war.needxmlfile}"
- description="The servlet configuration descriptor to use (WEB-INF/web.xml)."/>
-
- <ea:parameter property="package.metainf.basedir" default="${basedir}"
- description="basedir of the metainf fileset"/>
- <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
- description="Pattern describing files included in the META-INF of the package"/>
- <ea:parameter property="package.metainf.excludes.pattern" default=""
- description="Pattern describing files excluded in the META-INF of the package"/>
-
- <ea:parameter property="target.webinf.lib.dir" default="${target}/war/WEB-INF/lib"
- description="temp directory used to store artifacts that will be included in the WEB-INF lib directory"/>
- <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
- default="${target.artifacts}/${target.artifacts.main.war.name}"/>
-
- <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
-
- <mkdir dir="${target.artifacts}" />
-
- </target>
-
- <target name="-prepare-war" depends="validate" phase="prepare-package">
- <!-- copy cache main classpath to a temp directory and build the corresponding fileset -->
- <mkdir dir="${target.webinf.lib.dir}"/>
- <copy todir="${target.webinf.lib.dir}" flatten="true">
- <path refid="cache.main.classpath"/>
- </copy>
- <fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
- </target>
-
- <target name=":war" depends="validate, compile, prepare-package" description="package project as a WAR"
- phase="package">
- <ea:parameter phase="package" />
-
- <war destfile="${target.main.artifact}"
- manifest="${manifest.file}"
- needxmlfile="false"
- includes="${package.war.includes.pattern}"
- excludes="${package.war.excludes.pattern}">
- <fileset dir="${src.main.webapp}" includes="**/*" erroronmissingdir="false"/>
- <lib refid="webinf.lib.fileset" erroronmissingdir="false"/>
- <classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/>
- <metainf refid="package.metainf.fileset"/>
- </war>
- <ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
+ <ea:parameter phase="package" />
+
+ <ea:parameter property="target.artifacts.main.war.name" required="true"
+ description="main artifact file name" />
+ <ea:parameter property="target.artifacts" required="true" description="destination directory for target artifacts"/>
+
+
+ <ea:parameter property="target.main.classes" required="true"
+ description="directory where compiled classes that should be packaged are" />
+
+ <ea:parameter property="manifest.file" required="true"
+ description="the file used to generate manifest" />
+
+ <ea:parameter property="package.war.includes.pattern" default="**/*"
+ description="Pattern describing files included in the output war" />
+ <ea:parameter property="package.war.excludes.pattern" default=""
+ description="Pattern describing files excluded in the output war" />
+
+ <ea:parameter property="package.war.needxmlfile" default="false"
+ description="Flag to indicate whether or not the web.xml file is needed. Iit should be set to false when generating servlet 2.5+ WAR files without a web.xml file."/>
+
+ <ea:parameter property="src.main.webapp" required="true"
+ description="directory where web resources files are stored (like pages, images, etc...)"/>
+
+ <ea:parameter property="package.war.webxml.file" required="${package.war.needxmlfile}"
+ description="The servlet configuration descriptor to use (WEB-INF/web.xml)."/>
+
+ <ea:parameter property="package.metainf.basedir" default="${basedir}"
+ description="basedir of the metainf fileset"/>
+ <ea:parameter property="package.metainf.includes.pattern" default="NOTICE,LICENSE"
+ description="Pattern describing files included in the META-INF of the package"/>
+ <ea:parameter property="package.metainf.excludes.pattern" default=""
+ description="Pattern describing files excluded in the META-INF of the package"/>
+
+ <ea:parameter property="target.webinf.lib.dir" default="${target}/war/WEB-INF/lib"
+ description="temp directory used to store artifacts that will be included in the WEB-INF lib directory"/>
+ <ea:parameter property="target.main.artifact" required="false" description="the location of the main artifact"
+ default="${target.artifacts}/${target.artifacts.main.war.name}"/>
+
+ <fileset id="package.metainf.fileset" dir="${package.metainf.basedir}" includes="${package.metainf.includes.pattern}" excludes="${package.metainf.excludes.pattern}"/>
+
+ <mkdir dir="${target.artifacts}" />
+
+ </target>
+
+ <target name="-prepare-war" depends="validate" phase="prepare-package">
+ <!-- copy cache main classpath to a temp directory and build the corresponding fileset -->
+ <mkdir dir="${target.webinf.lib.dir}"/>
+ <copy todir="${target.webinf.lib.dir}" flatten="true">
+ <path refid="cache.main.classpath"/>
+ </copy>
+ <fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
+ </target>
+
+ <target name=":war" depends="validate, compile, prepare-package" description="package project as a WAR"
+ phase="package">
+ <ea:parameter phase="package" />
+
+ <war destfile="${target.main.artifact}"
+ manifest="${manifest.file}"
+ needxmlfile="false"
+ includes="${package.war.includes.pattern}"
+ excludes="${package.war.excludes.pattern}">
+ <fileset dir="${src.main.webapp}" includes="**/*" erroronmissingdir="false"/>
+ <lib refid="webinf.lib.fileset" erroronmissingdir="false"/>
+ <classes dir="${target.main.classes}" includes="**/*" erroronmissingdir="false"/>
+ <metainf refid="package.metainf.fileset"/>
+ </war>
+ <ea:registerartifact type="war" settingsRef="${project.ivy.instance}"/>
- </target>
+ </target>
- <target name="doit" depends=":war" />
+ <target name="doit" depends=":war" />
</project>
Modified: incubator/easyant/plugins/trunk/phases-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/phases-std/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/phases-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/phases-std/module.ivy Tue Feb 22 14:59:17 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.plugins" module="phases-std" revision="0.2">
- <description>Describes the standard phases of a build. These phase are directly inspired by maven 2 standard phases.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="phases-std" revision="0.2">
+ <description>Describes the standard phases of a build. These phase are directly inspired by maven 2 standard phases.</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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant (original)
+++ incubator/easyant/plugins/trunk/phases-std/src/main/resources/phases-std.ant Tue Feb 22 14:59:17 2011
@@ -14,103 +14,103 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#phases-std" xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <phase name="clean"
- description="delete any artifacts from previous builds"/>
-
- <phase name="validate"
- description="validate the project is correct and all necessary information is available" />
-
- <phase name="provision" depends="validate"
- description="supply provision required by this project" />
-
- <phase name="generate-sources" depends="validate"
- description="generate any source code for inclusion in compilation" />
-
- <phase name="process-sources" depends="generate-sources"
- description="process the source code, for example to filter any values" />
-
- <phase name="generate-resources" depends="validate"
- description="generate resources for inclusion in the package" />
-
- <phase name="process-resources" depends="generate-resources"
- description="copy and process the resources into the destination directory, ready for packaging" />
-
- <phase name="compile" depends="provision, process-sources"
- description="compile the source code of the project" />
-
- <phase name="process-classes" depends="compile"
- description="post-process the generated files from compilation, for example to do bytecode enhancement on Java classes" />
-
- <phase name="test-provision" depends="validate"
- description="supply provision required to test this project" />
-
- <phase name="test-generate-sources" depends="validate"
- description="generate any test source code for inclusion in compilation" />
-
- <phase name="test-process-sources" depends="test-generate-sources"
- description="process the test source code, for example to filter any values" />
-
- <phase name="test-generate-resources" depends="validate"
- description="create resources for testing" />
-
- <phase name="test-process-resources" depends="test-generate-resources"
- description="copy and process the resources into the test destination directory" />
-
- <phase name="test-compile" depends="process-classes, test-provision, test-process-sources"
- description="compile the test source code into the test destination directory" />
-
- <phase name="test" depends="test-compile, process-resources, test-process-resources"
- description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
-
- <phase name="prepare-package" depends="process-classes, process-resources"
- description="perform any operations necessary to prepare a package before the actual packaging. This often results in an unpacked, processed version of the package" />
-
- <phase name="package" depends="prepare-package"
- description="take the compiled code and package it in its distributable format, such as a JAR." />
-
- <phase name="pre-integration-test" depends="package"
- description="perform actions required before integration tests are executed. This may involve things such as setting up the required environment" />
-
- <phase name="integration-test" depends="pre-integration-test"
- description="process and deploy the package if necessary into an environment where integration tests can be run" />
+<project name="org.apache.easyant.plugins#phases-std" xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <phase name="clean"
+ description="delete any artifacts from previous builds"/>
+
+ <phase name="validate"
+ description="validate the project is correct and all necessary information is available" />
+
+ <phase name="provision" depends="validate"
+ description="supply provision required by this project" />
+
+ <phase name="generate-sources" depends="validate"
+ description="generate any source code for inclusion in compilation" />
+
+ <phase name="process-sources" depends="generate-sources"
+ description="process the source code, for example to filter any values" />
+
+ <phase name="generate-resources" depends="validate"
+ description="generate resources for inclusion in the package" />
+
+ <phase name="process-resources" depends="generate-resources"
+ description="copy and process the resources into the destination directory, ready for packaging" />
+
+ <phase name="compile" depends="provision, process-sources"
+ description="compile the source code of the project" />
+
+ <phase name="process-classes" depends="compile"
+ description="post-process the generated files from compilation, for example to do bytecode enhancement on Java classes" />
+
+ <phase name="test-provision" depends="validate"
+ description="supply provision required to test this project" />
+
+ <phase name="test-generate-sources" depends="validate"
+ description="generate any test source code for inclusion in compilation" />
+
+ <phase name="test-process-sources" depends="test-generate-sources"
+ description="process the test source code, for example to filter any values" />
+
+ <phase name="test-generate-resources" depends="validate"
+ description="create resources for testing" />
+
+ <phase name="test-process-resources" depends="test-generate-resources"
+ description="copy and process the resources into the test destination directory" />
+
+ <phase name="test-compile" depends="process-classes, test-provision, test-process-sources"
+ description="compile the test source code into the test destination directory" />
+
+ <phase name="test" depends="test-compile, process-resources, test-process-resources"
+ description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
+
+ <phase name="prepare-package" depends="process-classes, process-resources"
+ description="perform any operations necessary to prepare a package before the actual packaging. This often results in an unpacked, processed version of the package" />
+
+ <phase name="package" depends="prepare-package"
+ description="take the compiled code and package it in its distributable format, such as a JAR." />
+
+ <phase name="pre-integration-test" depends="package"
+ description="perform actions required before integration tests are executed. This may involve things such as setting up the required environment" />
+
+ <phase name="integration-test" depends="pre-integration-test"
+ description="process and deploy the package if necessary into an environment where integration tests can be run" />
- <phase name="post-integration-test" depends="integration-test"
- description="perform actions required after integration tests have been executed. This may including cleaning up the environment" />
-
- <phase name="verify" depends="test, post-integration-test"
- description="run any checks to verify the package is valid and meets quality criteria" />
-
- <phase name="generate-local-version" depends="validate"
- description="generate a local version number"/>
-
- <phase name="generate-shared-version" depends="validate"
- description="generate a version number for shared publication"/>
-
- <phase name="generate-release-version" depends="validate"
- description="generate a version number for a release"/>
-
- <phase name="prepare-publication" depends="provision"
- description="prepare publication"/>
-
- <phase name="publish-local" depends="generate-local-version, prepare-publication, package"
- description="publish the package into the local repository, for use as a dependency in other projects locally" />
+ <phase name="post-integration-test" depends="integration-test"
+ description="perform actions required after integration tests have been executed. This may including cleaning up the environment" />
+
+ <phase name="verify" depends="test, post-integration-test"
+ description="run any checks to verify the package is valid and meets quality criteria" />
+
+ <phase name="generate-local-version" depends="validate"
+ description="generate a local version number"/>
+
+ <phase name="generate-shared-version" depends="validate"
+ description="generate a version number for shared publication"/>
+
+ <phase name="generate-release-version" depends="validate"
+ description="generate a version number for a release"/>
+
+ <phase name="prepare-publication" depends="provision"
+ description="prepare publication"/>
+
+ <phase name="publish-local" depends="generate-local-version, prepare-publication, package"
+ description="publish the package into the local repository, for use as a dependency in other projects locally" />
- <phase name="publish-shared" depends="generate-shared-version, prepare-publication, package"
- description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
-
- <phase name="release" depends="generate-release-version, prepare-publication, verify"
- description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
+ <phase name="publish-shared" depends="generate-shared-version, prepare-publication, package"
+ description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
+
+ <phase name="release" depends="generate-release-version, prepare-publication, verify"
+ description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
- <phase name="report" description="generate report" />
-
- <!-- Documentation related phases -->
- <phase name="process-documentation-resources"
- description="copy and process the documentation resources into the destination directory"/>
-
- <phase name="documentation" depends="process-documentation-resources"
- description="generate documentation" />
+ <phase name="report" description="generate report" />
+
+ <!-- Documentation related phases -->
+ <phase name="process-documentation-resources"
+ description="copy and process the documentation resources into the destination directory"/>
+
+ <phase name="documentation" depends="process-documentation-resources"
+ description="generate documentation" />
</project>
Modified: incubator/easyant/plugins/trunk/rat/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/module.ivy (original)
+++ incubator/easyant/plugins/trunk/rat/module.ivy Tue Feb 22 14:59:17 2011
@@ -15,21 +15,21 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="rat"
- status="integration" revision="0.1">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- <ea:property name="retrieve.dependencies" value="true"/>
- </info>
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
- <conf name="test" visibility="private" 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" visibility="public" 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>
+ <info organisation="org.apache.easyant.plugins" module="rat"
+ status="integration" revision="0.1">
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <ea:property name="retrieve.dependencies" value="true"/>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
+ <conf name="test" visibility="private" 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" visibility="public" 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 name="rat" type="ant"/>
</publications>
- <dependencies>
- <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.7" conf="default->default" />
- </dependencies>
+ <dependencies>
+ <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.7" conf="default->default" />
+ </dependencies>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant (original)
+++ incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant Tue Feb 22 14:59:17 2011
@@ -15,46 +15,46 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins;rat"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
- <!--
- <ea:core-version requiredrevision="[0.7,+]" />
- -->
-
- <target name=":init" phase="validate">
- <typedef resource="org/apache/rat/anttasks/antlib.xml"
- uri="antlib:org.apache.rat.anttasks"
- classpathref="org.apache.easyant.plugins#rat.classpath" />
- <ea:parameter property="rat.report.dir" description="directory where rat report will be generated" default="${target.report}/rat"/>
- <ea:parameter property="rat.failOnError" description="specify if rat report should fail build if unknown licenses are found" default="true"/>
- <fileset id="rat.fileset" dir="${basedir}">
- <exclude name=".classpath" />
- <exclude name=".project" />
- <exclude name="target/**" />
- <exclude name="**/*.sha1" />
- <exclude name="**/*.md5" />
- </fileset>
-
- </target>
-
- <target name=":rat" description="generate rat report" depends=":init" phase="report">
- <mkdir dir="${rat.report.dir}"/>
- <echo>Generating rat report ...</echo>
- <property name="rat.report" value="${rat.report.dir}/rat-report.txt"/>
-
- <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
- <fileset refid="rat.fileset"/>
- </rat:report>
-
- <fail message="Some files have missing or incorrect license information. Check RAT report in ${rat.report} for more details!">
- <condition>
- <and>
- <not><resourcecontains resource="${rat.report}" substring="0 Unknown Licenses" casesensitive="false" /></not>
- <equals arg1="${rat.failOnError}" arg2="true"/>
- </and>
- </condition>
- </fail>
- </target>
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <!--
+ <ea:core-version requiredrevision="[0.7,+]" />
+ -->
+
+ <target name=":init" phase="validate">
+ <typedef resource="org/apache/rat/anttasks/antlib.xml"
+ uri="antlib:org.apache.rat.anttasks"
+ classpathref="org.apache.easyant.plugins#rat.classpath" />
+ <ea:parameter property="rat.report.dir" description="directory where rat report will be generated" default="${target.report}/rat"/>
+ <ea:parameter property="rat.failOnError" description="specify if rat report should fail build if unknown licenses are found" default="true"/>
+ <fileset id="rat.fileset" dir="${basedir}">
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ <exclude name="target/**" />
+ <exclude name="**/*.sha1" />
+ <exclude name="**/*.md5" />
+ </fileset>
+
+ </target>
+
+ <target name=":rat" description="generate rat report" depends=":init" phase="report">
+ <mkdir dir="${rat.report.dir}"/>
+ <echo>Generating rat report ...</echo>
+ <property name="rat.report" value="${rat.report.dir}/rat-report.txt"/>
+
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
+ <fileset refid="rat.fileset"/>
+ </rat:report>
+
+ <fail message="Some files have missing or incorrect license information. Check RAT report in ${rat.report} for more details!">
+ <condition>
+ <and>
+ <not><resourcecontains resource="${rat.report}" substring="0 Unknown Licenses" casesensitive="false" /></not>
+ <equals arg1="${rat.failOnError}" arg2="true"/>
+ </and>
+ </condition>
+ </fail>
+ </target>
</project>
Modified: incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml (original)
+++ incubator/easyant/plugins/trunk/rat/src/test/antunit/rat-test.xml Tue Feb 22 14:59:17 2011
@@ -15,32 +15,32 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins;rat-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <!-- Mocking required phase -->
- <phase name="validate"/>
- <phase name="report" depends="validate"/>
- <path id="org.apache.easyant.plugins#rat.classpath">
- <fileset dir="../../../lib/main"/>
- </path>
- <property name="target.report" value="${basedir}/target/report"/>
-
- <!-- Import your plugin -->
- <import file="../../main/resources/rat.ant"/>
-
- <!-- 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">
- <include name="**/target/**"/>
- <include name="**/lib/**"/>
- </delete>
- </target>
-
- <target name="setUp" depends="clean"/>
- <target name="tearDown" depends="clean"/>
-
- <target name="testRat">
- <antcall target=":rat" />
- <au:assertLogContains text="Generating rat report ..."/>
- </target>
+
+ <!-- Mocking required phase -->
+ <phase name="validate"/>
+ <phase name="report" depends="validate"/>
+ <path id="org.apache.easyant.plugins#rat.classpath">
+ <fileset dir="../../../lib/main"/>
+ </path>
+ <property name="target.report" value="${basedir}/target/report"/>
+
+ <!-- Import your plugin -->
+ <import file="../../main/resources/rat.ant"/>
+
+ <!-- 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">
+ <include name="**/target/**"/>
+ <include name="**/lib/**"/>
+ </delete>
+ </target>
+
+ <target name="setUp" depends="clean"/>
+ <target name="tearDown" depends="clean"/>
+
+ <target name="testRat">
+ <antcall target=":rat" />
+ <au:assertLogContains text="Generating rat report ..."/>
+ </target>
</project>
Modified: incubator/easyant/plugins/trunk/resources-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/resources-std/module.ivy Tue Feb 22 14:59:17 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.plugins" module="resources-std" revision="0.1">
- <description>This module provides basic resources management, a la maven.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="resources-std" revision="0.1">
+ <description>This module provides basic resources management, a la maven.</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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant (original)
+++ incubator/easyant/plugins/trunk/resources-std/src/main/resources/resources-std.ant Tue Feb 22 14:59:17 2011
@@ -15,86 +15,86 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#resources-std"
- xmlns:ea="antlib:org.apache.easyant">
-
- <ea:core-version requiredrevision="[0.8,+]" />
-
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="process-resources" />
- <ea:parameter phase="test-process-resources" />
-
- <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
- description="directory where main resources files are stored" />
+ xmlns:ea="antlib:org.apache.easyant">
+
+ <ea:core-version requiredrevision="[0.8,+]" />
+
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="process-resources" />
+ <ea:parameter phase="test-process-resources" />
+
+ <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
+ description="directory where main resources files are stored" />
<ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
description="directory with unit test resource files (configuration files, data files, etc)" />
<ea:parameter property="src.test.integration.resources" default="${basedir}/src/integration-test/resources"
description="directory for integration test resources (configuration files, data files, etc)"/>
- <ea:parameter property="target.main.classes" required="true"
- description="destination directory where main resources should be put" />
- <ea:parameter property="target.test.classes" required="true"
- description="destination directory where test resources should be put" />
-
- <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
- description="destination directory where integration test resources should be put" />
-
-
- <ea:parameter property="resources.std.includes.pattern" default="**/*"
- description="Pattern describing files included in compilation process" />
- <ea:parameter property="resources.std.excludes.pattern" default=""
- description="Pattern describing files excluded in compilation process" />
- <ea:parameter property="resources.std.include.emptydir" default="true"
- description="Specify if empty directory should be copied as resources"/>
-
- <ea:parameter property="resources.std.test.includes.pattern" default="**/*"
- description="Pattern describing files included in test compilation process" />
- <ea:parameter property="resources.std.test.excludes.pattern" default=""
- description="Pattern describing files excluded in test compilation process" />
-
- <ea:parameter property="resources.std.test.integration.includes.pattern" default="**/*"
- description="Pattern describing files included in integration test compilation process" />
- <ea:parameter property="resources.std.test.integration.excludes.pattern" default=""
- description="Pattern describing files excluded in integration test compilation process" />
-
- <filterset id="src.main.resources.filter"/>
- <filterset id="src.test.resources.filter"/>
- <filterset id="src.test.integration.resources.filter"/>
- </target>
+ <ea:parameter property="target.main.classes" required="true"
+ description="destination directory where main resources should be put" />
+ <ea:parameter property="target.test.classes" required="true"
+ description="destination directory where test resources should be put" />
+
+ <ea:parameter property="target.test.integration.classes" default="${basedir}/target/integration-test/classes"
+ description="destination directory where integration test resources should be put" />
+
+
+ <ea:parameter property="resources.std.includes.pattern" default="**/*"
+ description="Pattern describing files included in compilation process" />
+ <ea:parameter property="resources.std.excludes.pattern" default=""
+ description="Pattern describing files excluded in compilation process" />
+ <ea:parameter property="resources.std.include.emptydir" default="true"
+ description="Specify if empty directory should be copied as resources"/>
+
+ <ea:parameter property="resources.std.test.includes.pattern" default="**/*"
+ description="Pattern describing files included in test compilation process" />
+ <ea:parameter property="resources.std.test.excludes.pattern" default=""
+ description="Pattern describing files excluded in test compilation process" />
+
+ <ea:parameter property="resources.std.test.integration.includes.pattern" default="**/*"
+ description="Pattern describing files included in integration test compilation process" />
+ <ea:parameter property="resources.std.test.integration.excludes.pattern" default=""
+ description="Pattern describing files excluded in integration test compilation process" />
+
+ <filterset id="src.main.resources.filter"/>
+ <filterset id="src.test.resources.filter"/>
+ <filterset id="src.test.integration.resources.filter"/>
+ </target>
<target name="-check-resources">
<available file="${src.main.resources}" property="has.src.main.resources" />
<available file="${src.test.resources}" property="has.src.test.resources" />
<available file="${src.test.integration.resources}" property="has.src.test.integration.resources" />
</target>
-
- <target name=":copy-resources" depends="validate,-check-resources" if="has.src.main.resources"
- phase="process-resources">
- <mkdir dir="${target.main.classes}" />
+
+ <target name=":copy-resources" depends="validate,-check-resources" if="has.src.main.resources"
+ phase="process-resources">
+ <mkdir dir="${target.main.classes}" />
<copy todir="${target.main.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.main.resources}" includes="${resources.std.includes.pattern}" excludes="${resources.std.excludes.pattern}"/>
- <filterset refid="src.main.resources.filter"/>
+ <filterset refid="src.main.resources.filter"/>
</copy>
- </target>
-
- <target name=":copy-test-resources" depends="validate,-check-resources" if="has.src.test.resources"
- phase="test-process-resources">
- <mkdir dir="${target.test.classes}" />
+ </target>
+
+ <target name=":copy-test-resources" depends="validate,-check-resources" if="has.src.test.resources"
+ phase="test-process-resources">
+ <mkdir dir="${target.test.classes}" />
<copy todir="${target.test.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.test.resources}" includes="${resources.std.test.includes.pattern}" excludes="${resources.std.test.excludes.pattern}"/>
- <filterset refid="src.test.resources.filter"/>
+ <filterset refid="src.test.resources.filter"/>
</copy>
- </target>
-
- <target name=":copy-test-integration-resources" depends="validate,-check-resources" if="has.src.test.integration.resources"
- phase="test-process-resources">
- <mkdir dir="${target.test.integration.classes}" />
+ </target>
+
+ <target name=":copy-test-integration-resources" depends="validate,-check-resources" if="has.src.test.integration.resources"
+ phase="test-process-resources">
+ <mkdir dir="${target.test.integration.classes}" />
<copy todir="${target.test.integration.classes}" includeEmptyDirs="${resources.std.include.emptydir}">
<fileset dir="${src.test.integration.resources}" includes="${resources.std.test.integration.includes.pattern}" excludes="${resources.std.test.integration.excludes.pattern}"/>
- <filterset refid="src.test.integration.resources.filter"/>
+ <filterset refid="src.test.integration.resources.filter"/>
</copy>
- </target>
+ </target>
-
- <target name="doit" depends=":copy-resources, :copy-test-resources, :copy-test-integration-resources" />
+
+ <target name="doit" depends=":copy-resources, :copy-test-resources, :copy-test-integration-resources" />
</project>
Modified: incubator/easyant/plugins/trunk/run-java/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/module.ivy (original)
+++ incubator/easyant/plugins/trunk/run-java/module.ivy Tue Feb 22 14:59:17 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.plugins" module="run-java" revision="0.1">
- <description>This module provides java bytecode execution feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="run-java" revision="0.1">
+ <description>This module provides java bytecode execution feature.</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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>
Modified: incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant (original)
+++ incubator/easyant/plugins/trunk/run-java/src/main/resources/run-java.ant Tue Feb 22 14:59:17 2011
@@ -16,36 +16,36 @@
-->
<project name="org.apache.easyant.plugins#run-java" xmlns:ea="antlib:org.apache.easyant">
- <ea:core-version requiredrevision="[0.8,+]" />
+ <ea:core-version requiredrevision="[0.8,+]" />
- <target name=":init" phase="validate">
- <ea:parameter phase="validate" />
- <ea:parameter phase="compile" />
+ <target name=":init" phase="validate">
+ <ea:parameter phase="validate" />
+ <ea:parameter phase="compile" />
- <ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
+ <ea:parameter property="target.main.classes" required="true" description="directory where main compiled classes are" />
- <ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
- <ea:parameter property="run.main.classname" required="true" default="${project.main.classname}">
+ <ea:parameter property="project.main.classname" description="Used to define the project main class. The mainclass will then be used by many plugins (manifest, run-java, etc...)" />
+ <ea:parameter property="run.main.classname" required="true" default="${project.main.classname}">
Name of the main class to run.
By default this property take the same value as 'project.main.classname' property.
If you are looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead.
- </ea:parameter>
+ </ea:parameter>
- <ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
+ <ea:parameter path="compile.main.classpath" required="true" description="path used to compile main sources" />
- <path id="run.main.classpath">
- <pathelement location="${target.main.classes}" />
- <path refid="compile.main.classpath" />
- </path>
+ <path id="run.main.classpath">
+ <pathelement location="${target.main.classes}" />
+ <path refid="compile.main.classpath" />
+ </path>
- </target>
+ </target>
- <target name=":run" depends="validate, compile, process-resources" description="run the application">
- <available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
- <fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname' property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
+ <target name=":run" depends="validate, compile, process-resources" description="run the application">
+ <available classname="${run.main.classname}" property="is.run.main.classname.configured" classpathref="run.main.classpath"/>
+ <fail unless="is.run.main.classname.configured" message="the 'run.main.classname' property is not properly configured. By default this property take the same value as 'project.main.classname' property. If you're looking for a way to reference your mainclass one time for all plugins you should set project.main.classname instead."/>
- <java classpathref="run.main.classpath" classname="${run.main.classname}" />
- </target>
+ <java classpathref="run.main.classpath" classname="${run.main.classname}" />
+ </target>
- <target name=":doit" depends=":init, :run" />
+ <target name=":doit" depends=":init, :run" />
</project>
Modified: incubator/easyant/plugins/trunk/scaladoc/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/scaladoc/module.ivy?rev=1073355&r1=1073354&r2=1073355&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/scaladoc/module.ivy (original)
+++ incubator/easyant/plugins/trunk/scaladoc/module.ivy Tue Feb 22 14:59:17 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.plugins" module="scaladoc" revision="0.1">
- <description>This module provides scaladoc feature.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <info organisation="org.apache.easyant.plugins" module="scaladoc" revision="0.1">
+ <description>This module provides scaladoc feature.</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"/>
- </publications>
+ <publications>
+ <artifact type="ant"/>
+ </publications>
</ivy-module>