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/03 17:40:29 UTC
svn commit: r1393634 - in /incubator/easyant/plugins/trunk: ./
abstract-compile/src/main/resources/ abstract-package/src/main/resources/
abstract-provisioning/src/main/resources/ abstract-test/src/main/resources/
compile-groovy/src/main/resources/ comp...
Author: jlboudart
Date: Wed Oct 3 17:40:28 2012
New Revision: 1393634
URL: http://svn.apache.org/viewvc?rev=1393634&view=rev
Log:
Rename extension-point ending with 'finished'
documents extension-points
Modified:
incubator/easyant/plugins/trunk/abstract-compile/src/main/resources/abstract-compile.ant
incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant
incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant
incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant
incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant
incubator/easyant/plugins/trunk/module.ivy
incubator/easyant/plugins/trunk/package-jar/src/main/resources/package-jar.ant
incubator/easyant/plugins/trunk/package-war/src/main/resources/package-war.ant
incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
Modified: incubator/easyant/plugins/trunk/abstract-compile/src/main/resources/abstract-compile.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-compile/src/main/resources/abstract-compile.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-compile/src/main/resources/abstract-compile.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-compile/src/main/resources/abstract-compile.ant Wed Oct 3 17:40:28 2012
@@ -29,8 +29,8 @@
<ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.9" />
<!-- We expect at this point to have every source available, even the ones which are generated -->
- <extension-point name="abstract-compile:compile-ready" depends="abstract-provisioning:provisioning-finished"/>
- <extension-point name="abstract-compile:compile-finished" depends="abstract-compile:compile-ready"/>
+ <extension-point name="abstract-compile:compile-ready" depends="abstract-provisioning:provisioning" description="defines the requirements to compile. It's the good place if you want to process or generate sources"/>
+ <extension-point name="abstract-compile:compile" depends="abstract-compile:compile-ready" description="defines the compile step"/>
<!-- Creates a empty classpath for compilation if it doesn't exist yet -->
<ea:path pathid="compile.main.classpath" overwrite="false" />
Modified: incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant Wed Oct 3 17:40:28 2012
@@ -21,8 +21,8 @@
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-compile;0.9" />
- <extension-point name="abstract-package:package-ready" depends="abstract-compile:compile-finished"/>
- <extension-point name="abstract-package:package-finished" depends="abstract-package:package-ready" />
+ <extension-point name="abstract-package:package-ready" depends="abstract-compile:compile" description="defines package requirement"/>
+ <extension-point name="abstract-package:package" depends="abstract-package:package-ready" description="defines package step"/>
<target name="abstract-package:init">
<ea:parameter property="target.artifacts" default="${target}/artifacts" description="destination directory for target artifacts"/>
@@ -40,7 +40,7 @@
</target>
- <target name="abstract-package:register-main-artifact" extensionOf="abstract-package:package-finished" unless="${skip.register.main.artifact}">
+ <target name="abstract-package:register-main-artifact" extensionOf="abstract-package:package" unless="${skip.register.main.artifact}">
<ea:parameter property="target.main.artifact" required="true" description="the location of the main artifact"/>
<ea:parameter property="publish.main.type" default="jar" description="default type for main artifacts"/>
<ea:parameter property="publish.main.confs" default="default" description="default configurations for main artifacts"/>
Modified: incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-provisioning/src/main/resources/abstract-provisioning.ant Wed Oct 3 17:40:28 2012
@@ -20,8 +20,8 @@
<ea:core-version requiredrevision="[0.9,+]" />
- <extension-point name="abstract-provisioning:provisioning-ready" />
- <extension-point name="abstract-provisioning:provisioning-finished" depends="abstract-provisioning:provisioning-ready" />
+ <extension-point name="abstract-provisioning:provisioning-ready" description="defines provisioning requirements"/>
+ <extension-point name="abstract-provisioning:provisioning" depends="abstract-provisioning:provisioning-ready" description="defines provisioning step, usually it's a good place for loading libraries, populating classpath"/>
<ea:parameter property="lib.main" default="${basedir}/lib/main" description="directory where main libraries are picked up" />
<ea:parameter property="lib.test" default="${basedir}/lib/test" description="directory where test libraries are picked up" />
Modified: incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant Wed Oct 3 17:40:28 2012
@@ -20,13 +20,13 @@
<ea:core-version requiredrevision="[0.9,+]" />
- <extension-point name="abstract-test:test-ready" />
+ <extension-point name="abstract-test:test-ready" description="defines test requirements"/>
- <extension-point name="abstract-test:test-run" depends="abstract-test:test-ready"/>
+ <extension-point name="abstract-test:test-run" depends="abstract-test:test-ready" description="defines tests step"/>
- <extension-point name="abstract-test:integration-test-ready" />
+ <extension-point name="abstract-test:integration-test-ready" description="defines integration-test requirements"/>
- <extension-point name="abstract-test:integration-test-run" depends="abstract-test:integration-test-ready"/>
+ <extension-point name="abstract-test:integration-test-run" depends="abstract-test:integration-test-ready" description="defines integration-test step"/>
<ea:import mrid="org.apache.easyant.plugins#abstract-provisioning;0.9" />
@@ -35,7 +35,7 @@
<property name="skip.test.integration" value="true" />
</target>
- <target name="abstract-test:init" depends="abstract-provisioning:provisioning-finished">
+ <target name="abstract-test:init" depends="abstract-provisioning:provisioning">
<ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
description="directory with unit test resource files (configuration files, data files, etc)" />
Modified: incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant Wed Oct 3 17:40:28 2012
@@ -47,7 +47,7 @@
</target>
- <target name="compile-groovy:compile" depends="-compile-groovy:configure" if="has.src.main.groovy" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-groovy:compile" depends="-compile-groovy:configure" if="has.src.main.groovy" extensionOf="abstract-compile:compile">
<mkdir dir="${target.main.classes}" />
<!--
<groovyc> Attributes
Modified: incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-java/src/main/resources/compile-java.ant Wed Oct 3 17:40:28 2012
@@ -41,7 +41,7 @@
</target>
- <target name="compile-java:compile" depends="compile-java:init,abstract-compile:compile-ready" if="has.src.main.java" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-java:compile" depends="compile-java:init,abstract-compile:compile-ready" if="has.src.main.java" extensionOf="abstract-compile:compile">
<mkdir dir="${target.main.classes}" />
<javac srcdir="${src.main.java}"
destdir="${target.main.classes}"
Modified: incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-scala/src/main/resources/compile-scala.ant Wed Oct 3 17:40:28 2012
@@ -53,7 +53,7 @@
</ea:path>
</target>
- <target name="compile-scala:compile" depends="compile-scala:configure" if="has.src.main.scala" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-scala:compile" depends="compile-scala:configure" if="has.src.main.scala" extensionOf="abstract-compile:compile">
<mkdir dir="${target.main.classes}" />
<scalac srcdir="${src.main.scala}"
destdir="${target.main.classes}"
Modified: incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-groovy/src/main/resources/compile-test-groovy.ant Wed Oct 3 17:40:28 2012
@@ -52,7 +52,7 @@
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="resolved.groovy.classpath" />
</target>
- <target name="compile-test-groovy:compile" depends="compile-test-groovy:configure" if="has.src.test.groovy" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-groovy:compile" depends="compile-test-groovy:configure" if="has.src.test.groovy" extensionOf="abstract-compile:compile">
<ea:parameter property="test.compile.includes.pattern" default="**/*.groovy"
description="Pattern describing files included in test compilation process" />
<ea:parameter property="test.compile.excludes.pattern" default=""
@@ -62,7 +62,7 @@
<compile-groovy-tests prefix="test"/>
</target>
- <target name="compile-test-groovy:compile-integration" depends="compile-test-groovy:configure" if="has.src.test.integration.groovy" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-groovy:compile-integration" depends="compile-test-groovy:configure" if="has.src.test.integration.groovy" extensionOf="abstract-compile:compile">
<ea:parameter property="test.integration.compile.includes.pattern" default="**/*.groovy"
description="Pattern describing files included in integration test compilation process" />
<ea:parameter property="test.integration.compile.excludes.pattern" default=""
Modified: incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-java/src/main/resources/compile-test-java.ant Wed Oct 3 17:40:28 2012
@@ -50,7 +50,7 @@
</sequential>
</macrodef>
- <target name="compile-test-java:compile" depends="abstract-compile:compile-ready" if="has.src.test.java" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-java:compile" depends="abstract-compile:compile-ready" if="has.src.test.java" extensionOf="abstract-compile:compile">
<ea:parameter property="test.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.compile.java.source.version" default="${ant.java.version}"
@@ -63,7 +63,7 @@
<compile-java-tests prefix="test"/>
</target>
- <target name="compile-test-java:compile-integration" depends="abstract-compile:compile-ready" if="has.src.test.integration.java" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-java:compile-integration" depends="abstract-compile:compile-ready" if="has.src.test.integration.java" extensionOf="abstract-compile:compile">
<ea:parameter property="test.integration.compile.java.target.version" default="${ant.java.version}"
description="Specify a VM version for Generated class files (e.g., 1.1 or 1.2)." />
<ea:parameter property="test.integration.compile.java.source.version" default="${ant.java.version}"
Modified: incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant (original)
+++ incubator/easyant/plugins/trunk/compile-test-scala/src/main/resources/compile-test-scala.ant Wed Oct 3 17:40:28 2012
@@ -58,7 +58,7 @@
</sequential>
</macrodef>
- <target name="compile-test-scala:compile" depends="compile-test-scala:configure" if="has.src.test.scala" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-scala:compile" depends="compile-test-scala:configure" if="has.src.test.scala" extensionOf="abstract-compile:compile">
<ea:parameter property="test.compile.includes.pattern" default="**/*.scala"
description="Pattern describing files included in test compilation process" />
<ea:parameter property="test.compile.excludes.pattern" default=""
@@ -67,7 +67,7 @@
<compile-scala-tests prefix="test"/>
</target>
- <target name="compile-test-scala:compile-integration" depends="compile-test-scala:configure" if="has.src.test.integration.scala" extensionOf="abstract-compile:compile-finished">
+ <target name="compile-test-scala:compile-integration" depends="compile-test-scala:configure" if="has.src.test.integration.scala" extensionOf="abstract-compile:compile">
<ea:parameter property="test.integration.compile.includes.pattern" default="**/*.scala"
description="Pattern describing files included in integration test compilation process" />
<ea:parameter property="test.integration.compile.excludes.pattern" default=""
Modified: incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant (original)
+++ incubator/easyant/plugins/trunk/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant Wed Oct 3 17:40:28 2012
@@ -32,7 +32,7 @@
<!--
publish in build scoped repository before test
-->
- <target name="easyant-plugin-publication:before-test" depends="abstract-provisioning:provisioning-finished" extensionOf="abstract-test:test-ready" if="publish.plugin.before.test">
+ <target name="easyant-plugin-publication:before-test" depends="abstract-provisioning:provisioning" extensionOf="abstract-test:test-ready" if="publish.plugin.before.test">
<ea:configure-build-scoped-repository buildScopedRepositoryName="build" settingsRef="easyant.ivy.instance"/>
<ivy:publish artifactspattern="${target.artifacts}/[artifact](-[classifier]).[ext]" resolver="build" forcedeliver="true" overwrite="true" settingsRef="easyant.ivy.instance" />
</target>
Modified: incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-provisioning/src/main/resources/ivy-provisioning.ant Wed Oct 3 17:40:28 2012
@@ -66,7 +66,7 @@
</condition>
</target>
- <target name="ivy-provisioning:resolve" depends="-ivy-provisioning:resolve,-ivy-provisioning:resolve-main-confs,-ivy-provisioning:resolve-test-confs,-ivy-provisioning:resolve-provided-confs" description="resolve and retrieve dependencies with ivy" unless="skip.resolve" extensionOf="abstract-provisioning:provisioning-finished"/>
+ <target name="ivy-provisioning:resolve" depends="-ivy-provisioning:resolve,-ivy-provisioning:resolve-main-confs,-ivy-provisioning:resolve-test-confs,-ivy-provisioning:resolve-provided-confs" description="resolve and retrieve dependencies with ivy" unless="skip.resolve" extensionOf="abstract-provisioning:provisioning"/>
<target name="-ivy-provisioning:resolve-main-confs" depends="-ivy-provisioning:resolve" if="project.contains.main.confs">
<ivy:cachepath pathid="cache.main.classpath" conf="${main.confs}" settingsRef="${project.ivy.instance}"/>
Modified: incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-publication/src/main/resources/ivy-publication.ant Wed Oct 3 17:40:28 2012
@@ -21,13 +21,13 @@
<ea:core-version requiredrevision="[0.9,+]" />
- <extension-point name="ivy-publication:generate-release-version" />
+ <extension-point name="ivy-publication:generate-release-version" description="defines how to build release version number"/>
- <extension-point name="ivy-publication:generate-shared-version" />
+ <extension-point name="ivy-publication:generate-shared-version" description="defines how to build shared version number"/>
- <extension-point name="ivy-publication:generate-local-version" />
+ <extension-point name="ivy-publication:generate-local-version" description="defines how to build local version number"/>
- <extension-point name="ivy-publication:publish-ready" />
+ <extension-point name="ivy-publication:publish-ready" description="defines publication prerequisites"/>
<target name="-ivy-publication:init">
<ea:parameter property="release.resolver" default="shared"
Modified: incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant (original)
+++ incubator/easyant/plugins/trunk/ivy-utils/src/main/resources/ivy-utils.ant Wed Oct 3 17:40:28 2012
@@ -38,7 +38,7 @@
<!-- =================================
target: clean-report
================================= -->
- <target name="ivy-utils:report" depends="abstract-provisioning:provisioning-finished,ivy-utils:init" description="generate dependencies report">
+ <target name="ivy-utils:report" depends="abstract-provisioning:provisioning,ivy-utils:init" description="generate dependencies report">
<ea:parameter property="target.reports" default="${target}/reports" description="directory where report will be generated"/>
<ea:parameter property="target.report.ivy" default="${target.reports}/dependencies"
description="the directory where ivy report will be generated" />
Modified: incubator/easyant/plugins/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/module.ivy?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/module.ivy (original)
+++ incubator/easyant/plugins/trunk/module.ivy Wed Oct 3 17:40:28 2012
@@ -18,7 +18,5 @@
<info organisation="org.apache.easyant.plugins" module="plugins-orchestrator" revision="0.9" >
<description>This module acts as orchestrator to build all easyant plugins.</description>
<ea:build module="meta-build" revision="0.9"/>
- <!-- If we use build scoped repository easyant use it as a dictator resolver, this have side effects as we use same ivy instance to build the plugin and to resolve plugin dependencies -->
- <ea:property name="use.build.repository" value="false"/>
</info>
</ivy-module>
Modified: incubator/easyant/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=1393634&r1=1393633&r2=1393634&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 Wed Oct 3 17:40:28 2012
@@ -37,7 +37,7 @@
</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-finished">
+ <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}"
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=1393634&r1=1393633&r2=1393634&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 Wed Oct 3 17:40:28 2012
@@ -68,7 +68,7 @@
<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-finished">
+ <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"
Modified: incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant?rev=1393634&r1=1393633&r2=1393634&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant (original)
+++ incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant Wed Oct 3 17:40:28 2012
@@ -76,7 +76,7 @@
</ac:if>
</target>
- <target name="webstart:sign" depends="abstract-package:package-finished" if="webstart.sign.jar">
+ <target name="webstart:sign" depends="abstract-package:package" if="webstart.sign.jar">
<ea:parameter property="webstart.alias" required="true" description="the alias signer" />
<ea:parameter property="webstart.storepass" required="true" description="the keystore password" />
<ea:parameter property="webstart.keypass" default="${webstart.storepass}" description="the key password" />