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 jl...@apache.org on 2012/10/16 21:33:21 UTC
svn commit: r1398999 [2/4] - in /incubator/easyant/plugins/trunk: javadoc/
javadoc/src/main/resources/ javadoc/src/test/antunit/ jetty-deploy/
jetty-deploy/src/main/resources/ jetty-deploy/src/test/antunit/ manifest/
manifest/src/main/resources/ manife...
Modified: incubator/easyant/plugins/trunk/offline/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/module.ivy (original)
+++ incubator/easyant/plugins/trunk/offline/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,18 +14,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="offline" revision="0.9">
- <description>This module offline features. You can define it as a system plugin in easyant-conf.xml. Offline features will allow you to retrieve all project dependencies and easyant modules (buildtypes, and plugins) used by the project in project in a subdirectory.</description>
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-<ea:plugin module="antunit" revision="0.9"/>
- </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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <description>This module offline features. You can define it as a system plugin in easyant-conf.xml. Offline
+ features will allow you to retrieve all project dependencies and easyant modules (buildtypes, and plugins)
+ used by the project in project in a subdirectory.</description>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+ <ea:plugin module="antunit" revision="0.9" />
+ </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="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant (original)
+++ incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant Tue Oct 16 21:33:19 2012
@@ -14,22 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#offline"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ac="antlib:net.sf.antcontrib"
+<project name="org.apache.easyant.plugins#offline" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ac="antlib:net.sf.antcontrib"
xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
<ea:parameter property="project.ivy.instance" default="project.ivy.instance" description="the ivy instance name for your project" />
- <ea:parameter property="project.buildscope.resolver" default="project.buildscope.repository" description="name of project build scope repository"/>
- <ea:parameter property="easyant.buildscope.resolver" default="easyant.buildscope.repository" description="name of easyant build scope resolver"/>
- <ea:parameter property="easyant.offline" default="false" description="specify if you're running easyant in offline mode"/>
- <ea:parameter property="offline.base.directory" default="${basedir}/offline/" description="specify offline base directory"/>
+ <ea:parameter property="project.buildscope.resolver" default="project.buildscope.repository"
+ description="name of project build scope repository" />
+ <ea:parameter property="easyant.buildscope.resolver" default="easyant.buildscope.repository"
+ description="name of easyant build scope resolver" />
+ <ea:parameter property="easyant.offline" default="false" description="specify if you're running easyant in offline mode" />
+ <ea:parameter property="offline.base.directory" default="${basedir}/offline/" description="specify offline base directory" />
<target name="offline:go-offline">
- <fail if="${easyant.offline}" message="can't run offline:go-offline when you are already offline"/>
- <ea:go-offline projectResolverName="${project.buildscope.resolver}" easyantResolverName="${easyant.buildscope.resolver}"/>
+ <fail if="${easyant.offline}" message="can't run offline:go-offline when you are already offline" />
+ <ea:go-offline projectResolverName="${project.buildscope.resolver}" easyantResolverName="${easyant.buildscope.resolver}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml (original)
+++ incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml Tue Oct 16 21:33:19 2012
@@ -14,41 +14,39 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;offline-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;offline-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="${basedir}/target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- 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/**"/>
- <include name="**/offline/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
+ <include name="**/offline/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <property name="easyant.file" value="${basedir}/sample-module.ivy"/>
- <ea:loadmodule buildModule="${easyant.file}"/>
+ <property name="easyant.file" value="${basedir}/sample-module.ivy" />
+ <ea:loadmodule buildModule="${easyant.file}" />
<!--<ea:configure-build-scoped-repository generateWrapperResoler="false" dictator="@{dictator}" name="${project.buildscope.resolver}" settingsRef="${project.ivy.instance}"/>
-->
</target>
- <target name="tearDown" depends="clean"/>
-
- <target name="test-offline:init" >
- <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance"/>
- <au:assertPropertyEquals name="project.buildscope.resolver" value="project.buildscope.repository"/>
- <au:assertPropertyEquals name="easyant.buildscope.resolver" value="easyant.buildscope.repository"/>
- <au:assertPropertyEquals name="easyant.offline" value="false"/>
- <au:assertPropertyEquals name="offline.base.directory" value="${basedir}/offline/"/>
+ <target name="tearDown" depends="clean" />
+
+ <target name="test-offline:init">
+ <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance" />
+ <au:assertPropertyEquals name="project.buildscope.resolver" value="project.buildscope.repository" />
+ <au:assertPropertyEquals name="easyant.buildscope.resolver" value="easyant.buildscope.repository" />
+ <au:assertPropertyEquals name="easyant.offline" value="false" />
+ <au:assertPropertyEquals name="offline.base.directory" value="${basedir}/offline/" />
</target>
@@ -59,27 +57,24 @@
<au:assertLogContains text=":: installing org.apache.easyant.plugins#rat;0.9 ::" />
<au:assertLogContains text=":: installing org.apache.rat#apache-rat-tasks;0.7 ::" />
- <property name="ea.repo" value="${offline.base.directory}/repository/easyant.buildscope.repository"/>
- <property name="project.repo" value="${offline.base.directory}/repository/project.buildscope.repository"/>
- <au:assertFileExists file="${ea.repo}"/>
- <au:assertFileExists file="${project.repo}"/>
- <au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ant"/>
- <au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ivy"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-javadoc.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-sources.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.ivy"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-javadoc.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-sources.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.ivy"/>
-
-
- <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.ivy"/>
- <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.jar"/>
- <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-javadoc.jar"/>
- <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-sources.jar"/>
+ <property name="ea.repo" value="${offline.base.directory}/repository/easyant.buildscope.repository" />
+ <property name="project.repo" value="${offline.base.directory}/repository/project.buildscope.repository" />
+ <au:assertFileExists file="${ea.repo}" />
+ <au:assertFileExists file="${project.repo}" />
+ <au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ant" />
+ <au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ivy" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-javadoc.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-sources.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.ivy" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-javadoc.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-sources.jar" />
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.ivy" />
+
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.ivy" />
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.jar" />
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-javadoc.jar" />
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-sources.jar" />
</target>
-
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/offline/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/test/antunit/sample-module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/test/antunit/sample-module.ivy (original)
+++ incubator/easyant/plugins/trunk/offline/src/test/antunit/sample-module.ivy Tue Oct 16 21:33:19 2012
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration">
- <ea:plugin module="rat" revision="0.9"/>
+ <ea:plugin module="rat" revision="0.9" />
</info>
- <dependencies>
- <dependency org="junit" name="junit" rev="4.4"/>
-
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.4" />
</dependencies>
-
-</ivy-module>
+</ivy-module>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/osgi-bundle/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/osgi-bundle/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/osgi-bundle/module.ivy (original)
+++ incubator/easyant/plugins/trunk/osgi-bundle/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,20 +14,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="osgi-bundle" revision="0.9">
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
<description>Provides osgi features.</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>
+ <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="ant" />
</publications>
<dependencies>
- <dependency org="net.luminis" name="osgi-bundle-ant" rev="0.2.0"/>
+ <dependency org="net.luminis" name="osgi-bundle-ant" rev="0.2.0" />
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -15,77 +15,96 @@
limitations under the License.
-->
<project name="org.apache.easyant.plugins#osgi-bundle" xmlns:ea="antlib:org.apache.easyant">
-
<ea:core-version requiredrevision="[0.9,+]" />
<target name="osgi-bundle:init">
- <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" />
+ <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>
<extension-point name="osgi-bundle:bundle-ready" />
<target name="osgi-bundle:bundle" depends="osgi-bundle:init,osgi-bundle:bundle-ready">
<dirname file="${target.artifacts.main.bundle.name}" property="target.artifacts.main.bundle.dir" />
- <mkdir dir="${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"/>
+ <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.
-*******************************************************************************
+ 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.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.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"/>
+ <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.
@@ -93,37 +112,21 @@ At least one of the following property m
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>
+ <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"/>
+ <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>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/package-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-jar/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="package-jar" revision="0.9">
- <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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" 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"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -14,36 +14,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#package-jar"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#package-jar" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9"/>
+ <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9" />
<target name="package-jar:init" depends="abstract-package:init,abstract-package:compute-metainf">
<ea:parameter property="target.artifacts.main.jar.name" default="${module.name}.jar" description="main artifact file name" />
-
- <ea:parameter property="target.main.artifact" description="the location of the main artifact" default="${target.artifacts}/${target.artifacts.main.jar.name}"/>
-
- <ea:parameter property="target.main.classes" required="true"
+ <ea:parameter property="target.main.artifact" 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="**/*"
+ <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=""
+ <ea:parameter property="package.jar.excludes.pattern" default=""
description="Pattern describing files excluded in the output jar" />
-
</target>
- <target name="package-jar:jar" depends="package-jar:init,abstract-package:package-ready" description="package project as a JAR" unless="skip.jar.package" extensionOf="abstract-package:package">
+ <target name="package-jar:jar" depends="package-jar:init,abstract-package:package-ready" description="package project as a JAR"
+ unless="skip.jar.package" extensionOf="abstract-package: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 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>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/package-jar/src/test/antunit/package-jar-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-jar/src/test/antunit/package-jar-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-jar/src/test/antunit/package-jar-test.xml (original)
+++ incubator/easyant/plugins/trunk/package-jar/src/test/antunit/package-jar-test.xml Tue Oct 16 21:33:19 2012
@@ -14,44 +14,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;package-jar-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;package-jar-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- 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/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <property name="target.main.classes" value="${target}/classes"/>
- <mkdir dir="${target.main.classes}"/>
- <property name="manifest.file" value="${target}/MANIFEST.MF"/>
- <echo file="${manifest.file}"/>
-
+ <property name="target.main.classes" value="${target}/classes" />
+ <mkdir dir="${target.main.classes}" />
+ <property name="manifest.file" value="${target}/MANIFEST.MF" />
+ <echo file="${manifest.file}" />
</target>
- <target name="tearDown" depends="clean"/>
-
+
+ <target name="tearDown" depends="clean" />
+
<target name="test-package-jar:init" depends="package-jar:init">
- <au:assertPropertyEquals name="target.artifacts.main.jar.name" value="${module.name}.jar"/>
- <au:assertPropertyEquals name="target.main.artifact" value="${target.artifacts}/${target.artifacts.main.jar.name}"/>
- <au:assertPropertyEquals name="package.jar.includes.pattern" value="**/*"/>
- <au:assertPropertyEquals name="package.jar.excludes.pattern" value=""/>
+ <au:assertPropertyEquals name="target.artifacts.main.jar.name" value="${module.name}.jar" />
+ <au:assertPropertyEquals name="target.main.artifact" value="${target.artifacts}/${target.artifacts.main.jar.name}" />
+ <au:assertPropertyEquals name="package.jar.includes.pattern" value="**/*" />
+ <au:assertPropertyEquals name="package.jar.excludes.pattern" value="" />
</target>
<target name="test-package-jar:jar" depends="package-jar:jar">
- <au:assertFileExists file="${target.artifacts}"/>
- <au:assertFileExists file="${target.main.artifact}"/>
+ <au:assertFileExists file="${target.artifacts}" />
+ <au:assertFileExists file="${target.main.artifact}" />
</target>
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/package-war/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/module.ivy (original)
+++ incubator/easyant/plugins/trunk/package-war/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="package-war" revision="0.9">
- <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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" 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"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -14,71 +14,61 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#package-war"
- xmlns:ac="antlib:net.sf.antcontrib"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#package-war" xmlns:ac="antlib:net.sf.antcontrib" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9"/>
+ <ea:import mrid="org.apache.easyant.plugins#abstract-package;0.9" />
<target name="package-war:init" depends="abstract-package:init,abstract-package:compute-metainf">
<ea:parameter property="target.artifacts.main.war.name" default="${module.name}.war" description="main artifact file name" />
- <ea:parameter property="target.main.artifact" default="${target.artifacts}/${target.artifacts.main.war.name}" description="the location of the main artifact"/>
-
- <ea:parameter property="target.main.classes" required="true"
+ <ea:parameter property="target.main.artifact" default="${target.artifacts}/${target.artifacts.main.war.name}"
+ description="the location of the main artifact" />
+ <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="**/*"
+ <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=""
+ <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" default="${basedir}/src/main/webapp" 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="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"/>
+ 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" default="${basedir}/src/main/webapp"
+ 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="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" />
<mkdir dir="${target.artifacts}" />
</target>
<target name="-package-war:prepare-war" depends="package-war:init">
- <mkdir dir="${target.webinf.lib.dir}"/>
+ <mkdir dir="${target.webinf.lib.dir}" />
<!-- check if cache.main.classpath is defined otherwise use lib.main.fileset -->
<ac:if>
- <isreference refid="cache.main.classpath"/>
+ <isreference refid="cache.main.classpath" />
<ac:then>
<copy todir="${target.webinf.lib.dir}" flatten="true">
- <path refid="cache.main.classpath"/>
+ <path refid="cache.main.classpath" />
</copy>
</ac:then>
<ac:else>
<copy todir="${target.webinf.lib.dir}" flatten="true">
- <fileset refid="lib.main.fileset"/>
+ <fileset refid="lib.main.fileset" />
</copy>
</ac:else>
</ac:if>
- <fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}"/>
+ <fileset id="webinf.lib.fileset" dir="${target.webinf.lib.dir}" />
</target>
- <target name="package-war:war" depends="package-war:init,-package-war:prepare-war" description="package project as a WAR" extensionOf="abstract-package: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"/>
+ <target name="package-war:war" depends="package-war:init,-package-war:prepare-war" description="package project as a WAR"
+ extensionOf="abstract-package: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>
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml (original)
+++ incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml Tue Oct 16 21:33:19 2012
@@ -14,55 +14,52 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;package-war-test"
- xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;package-war-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- 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/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
+
<target name="setUp" depends="clean">
- <property name="target.main.classes" value="${target}/classes"/>
- <mkdir dir="${target.main.classes}"/>
- <property name="manifest.file" value="${target}/MANIFEST.MF"/>
- <echo file="${manifest.file}"/>
+ <property name="target.main.classes" value="${target}/classes" />
+ <mkdir dir="${target.main.classes}" />
+ <property name="manifest.file" value="${target}/MANIFEST.MF" />
+ <echo file="${manifest.file}" />
</target>
- <target name="tearDown" depends="clean"/>
+ <target name="tearDown" depends="clean" />
<target name="test-package-war:init" depends="package-war:init">
- <au:assertPropertyEquals name="target.artifacts.main.war.name" value="${module.name}.war"/>
- <au:assertPropertyEquals name="target.main.artifact" value="${target.artifacts}/${target.artifacts.main.war.name}"/>
- <au:assertPropertyEquals name="package.war.includes.pattern" value="**/*"/>
- <au:assertPropertyEquals name="package.war.excludes.pattern" value=""/>
- <au:assertPropertyEquals name="package.war.needxmlfile" value="false"/>
- <au:assertPropertyEquals name="src.main.webapp" value="${basedir}/src/main/webapp"/>
+ <au:assertPropertyEquals name="target.artifacts.main.war.name" value="${module.name}.war" />
+ <au:assertPropertyEquals name="target.main.artifact" value="${target.artifacts}/${target.artifacts.main.war.name}" />
+ <au:assertPropertyEquals name="package.war.includes.pattern" value="**/*" />
+ <au:assertPropertyEquals name="package.war.excludes.pattern" value="" />
+ <au:assertPropertyEquals name="package.war.needxmlfile" value="false" />
+ <au:assertPropertyEquals name="src.main.webapp" value="${basedir}/src/main/webapp" />
<!--TODO:Test this property
<au:assertPropertyNotSet name="package.war.webxml.file" />
-->
- <au:assertPropertyEquals name="target.webinf.lib.dir" value="${target}/war/WEB-INF/lib"/>
- <au:assertFileExists file="${target.artifacts}"/>
+ <au:assertPropertyEquals name="target.webinf.lib.dir" value="${target}/war/WEB-INF/lib" />
+ <au:assertFileExists file="${target.artifacts}" />
</target>
<target name="test-package-war:prepare-war" depends="-package-war:prepare-war">
- <au:assertFileExists file="${target.webinf.lib.dir}"/>
- <au:assertReferenceSet refid="webinf.lib.fileset"/>
+ <au:assertFileExists file="${target.webinf.lib.dir}" />
+ <au:assertReferenceSet refid="webinf.lib.fileset" />
</target>
<target name="test-package-war:war" depends="package-war:war">
- <au:assertFileExists file="${target.main.artifact}"/>
+ <au:assertFileExists file="${target.main.artifact}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/phases-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/phases-std/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/phases-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/phases-std/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="phases-std" revision="0.9">
- <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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
+ <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"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -14,40 +14,25 @@
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">
-
+<project name="org.apache.easyant.plugins#phases-std" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.8,+]" />
-
- <extension-point name="clean"
- description="delete any artifacts from previous builds"/>
-
- <extension-point name="validate"
- description="validate the project is correct and all necessary information is available" />
-
- <extension-point name="compile"
- description="compile the source code of the project" />
-
- <extension-point name="test" depends="compile"
- description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
-
- <extension-point name="package" depends="compile"
- description="take the compiled code and package it in its distributable format, such as a JAR." />
-
- <extension-point name="integration-test"
- description="process and deploy the package if necessary into an environment where integration tests can be run" />
-
- <extension-point name="verify" depends="package, test, integration-test"
- description="run any checks to verify the package is valid and meets quality criteria" />
-
- <extension-point name="publish-local" depends="package"
- description="publish the package into the local repository, for use as a dependency in other projects locally" />
-
- <extension-point name="publish-shared" depends="package"
- description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
-
- <extension-point name="release" depends="verify"
- description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
+ <extension-point name="clean" description="delete any artifacts from previous builds" />
+ <extension-point name="validate" description="validate the project is correct and all necessary information is available" />
+ <extension-point name="compile" description="compile the source code of the project" />
+ <extension-point name="test" depends="compile"
+ description="run tests using a suitable unit testing framework. These tests should not require the code be packaged or deployed" />
+ <extension-point name="package" depends="compile"
+ description="take the compiled code and package it in its distributable format, such as a JAR." />
+ <extension-point name="integration-test"
+ description="process and deploy the package if necessary into an environment where integration tests can be run" />
+ <extension-point name="verify" depends="package, test, integration-test"
+ description="run any checks to verify the package is valid and meets quality criteria" />
+ <extension-point name="publish-local" depends="package"
+ description="publish the package into the local repository, for use as a dependency in other projects locally" />
+ <extension-point name="publish-shared" depends="package"
+ description="done in an integration environment, copies the final package to the remote repository for sharing with other developers and projects" />
+ <extension-point name="release" depends="verify"
+ description="done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects" />
<extension-point name="report" description="generate report" />
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/rat/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/rat/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/module.ivy (original)
+++ incubator/easyant/plugins/trunk/rat/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,21 +14,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="rat" status="integration" revision="0.9">
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
- <ea:property name="retrieve.dependencies" value="true"/>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" 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."/>
+ <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>
-
+ <artifact name="rat" type="ant" />
+ </publications>
<dependencies>
<dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.7" conf="default->default" />
</dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant (original)
+++ incubator/easyant/plugins/trunk/rat/src/main/resources/rat.ant Tue Oct 16 21:33:19 2012
@@ -14,19 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;rat"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ea="antlib:org.apache.easyant">
-
+<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.9,+]" />
<target name="rat:init">
- <typedef resource="org/apache/rat/anttasks/antlib.xml"
- uri="antlib:org.apache.rat.anttasks"
- classpathref="org.apache.easyant.plugins#rat.classpath" />
- <ea:parameter property="target.reports" default="${target}/reports" description="directory where report will be generated"/>
- <ea:parameter property="rat.report.dir" description="directory where rat report will be generated" default="${target.reports}/rat"/>
- <ea:parameter property="rat.failOnError" description="specify if rat report should fail build if unknown licenses are found" default="true"/>
+ <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:org.apache.rat.anttasks"
+ classpathref="org.apache.easyant.plugins#rat.classpath" />
+ <ea:parameter property="target.reports" default="${target}/reports" description="directory where report will be generated" />
+ <ea:parameter property="rat.report.dir" description="directory where rat report will be generated"
+ default="${target.reports}/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" />
@@ -37,22 +35,25 @@
</target>
<target name="rat:rat" description="generate rat report" depends="rat:init">
- <mkdir dir="${rat.report.dir}"/>
+ <mkdir dir="${rat.report.dir}" />
<echo>Generating rat report ...</echo>
- <ea:parameter property="rat.report.filename" default="rat-report.txt" description="rat report filename"/>
+ <ea:parameter property="rat.report.filename" default="rat-report.txt" description="rat report filename" />
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report.dir}/${rat.report.filename}">
- <fileset refid="rat.fileset"/>
+ <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!">
+ <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>
+ <and>
+ <not>
+ <resourcecontains resource="${rat.report}" substring="0 Unknown Licenses"
+ casesensitive="false" />
+ </not>
+ <equals arg1="${rat.failOnError}" arg2="true" />
+ </and>
</condition>
</fail>
</target>
-
-</project>
+</project>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -14,41 +14,38 @@
See the License for the specific language governing permissions and
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"
+<project name="org.apache.easyant.plugins;rat-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
- <!-- Import your plugin -->
- <property name="target" value="${basedir}/target/test-antunit"/>
+ <!-- Import your plugin -->
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
- <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources" />
- <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
+ <!-- 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/**"/>
+ <include name="**/target/**" />
+ <include name="**/lib/**" />
</delete>
</target>
-
- <target name="setUp" depends="clean"/>
- <target name="tearDown" depends="clean"/>
-
+
+ <target name="setUp" depends="clean" />
+ <target name="tearDown" depends="clean" />
+
<target name="test-rat:init" depends="rat:init">
- <au:assertPropertyEquals name="target.reports" value="${target}/.reports/rat"/>
- <au:assertPropertyEquals name="rat.report.dir" value="${target.reports}/rat"/>
- <au:assertPropertyEquals name="rat.failOnError" value="true"/>
- <au:assertReferenceSet refid="rat.fileset"/>
+ <au:assertPropertyEquals name="target.reports" value="${target}/.reports/rat" />
+ <au:assertPropertyEquals name="rat.report.dir" value="${target.reports}/rat" />
+ <au:assertPropertyEquals name="rat.failOnError" value="true" />
+ <au:assertReferenceSet refid="rat.fileset" />
</target>
<target name="test-rat:rat" depends="rat:rat">
- <au:assertFileExists file="${rat.report.ivy}"/>
- <au:assertLogContains text="Generating rat report ..."/>
- <au:assertPropertyEquals name="rat.report.filename" value="rat-report.txt"/>
- <au:assertFileExists file="${rat.report.dir}/${rat.report.filename}"/>
+ <au:assertFileExists file="${rat.report.ivy}" />
+ <au:assertLogContains text="Generating rat report ..." />
+ <au:assertPropertyEquals name="rat.report.filename" value="rat-report.txt" />
+ <au:assertFileExists file="${rat.report.dir}/${rat.report.filename}" />
</target>
-
-</project>
+</project>
\ No newline at end of file
Modified: incubator/easyant/plugins/trunk/resources-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/resources-std/module.ivy?rev=1398999&r1=1398998&r2=1398999&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/resources-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/resources-std/module.ivy Tue Oct 16 21:33:19 2012
@@ -14,17 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.plugins" module="resources-std" revision="0.9">
- <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>
+ <extends organisation="org.apache.easyant.plugins" module="parent-plugin" 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"/>
+ <artifact type="ant" />
</publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
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=1398999&r1=1398998&r2=1398999&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 Oct 16 21:33:19 2012
@@ -14,48 +14,43 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#resources-std"
- xmlns:ea="antlib:org.apache.easyant">
-
+<project name="org.apache.easyant.plugins#resources-std" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
<target name="resources-std:init">
<ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
- description="directory where main resources files are stored" />
+ 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" />
-
+ 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="${target}/integration-test/classes"
- description="destination directory where integration test resources should be put" />
+ 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.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"/>
+ 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"/>
+ <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="-resources-std:check-resources" depends="resources-std:init">
@@ -67,25 +62,27 @@
<target name="resources-std:copy-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.main.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"/>
+ <fileset dir="${src.main.resources}" includes="${resources.std.includes.pattern}" excludes="${resources.std.excludes.pattern}" />
+ <filterset refid="src.main.resources.filter" />
</copy>
</target>
- <target name="resources-std:copy-test-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.test.resources">
+ <target name="resources-std:copy-test-resources" depends="resources-std:init,-resources-std:check-resources"
+ if="has.src.test.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"/>
+ <fileset dir="${src.test.resources}" includes="${resources.std.test.includes.pattern}" excludes="${resources.std.test.excludes.pattern}" />
+ <filterset refid="src.test.resources.filter" />
</copy>
</target>
- <target name="resources-std:copy-test-integration-resources" depends="resources-std:init,-resources-std:check-resources" if="has.src.test.integration.resources">
+ <target name="resources-std:copy-test-integration-resources" depends="resources-std:init,-resources-std:check-resources"
+ if="has.src.test.integration.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"/>
+ <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" />
</copy>
</target>
-
-</project>
+</project>
\ No newline at end of file