incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1091226 [3/3] - in /incubator/easyant/plugins/trunk: abstract-coverage/ abstract-coverage/src/main/resources/ abstract-test/ abstract-test/src/main/resources/ antcontrib-activator/ antcontrib-activator/src/main/resources/ antunit/ antunit/...
Date Mon, 11 Apr 2011 21:51:55 GMT
Modified: incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant (original)
+++ incubator/easyant/plugins/trunk/skeleton/src/main/resources/skeleton.ant Mon Apr 11 21:51:53
2011
@@ -19,12 +19,11 @@
     xmlns:ivy="antlib:org.apache.ivy.ant"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-   
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <dirname file="${ant.file.org.apache.easyant.plugins#skeleton}" property="ant.dir.org.apache.easyant.plugins#skeleton"
/>
-   
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
+
+    <target name="skeleton:init">
         <ea:parameter property="skeleton.default.basedir" default="${basedir}" description="define
the root path of your skeleton project" />
         <ea:parameter property="skeleton.default.excludes.pattern" default="target/**"
description="define the default excludes pattern used to package a project skeleton" />
         <ea:parameter property="skeleton.default.includes.pattern" default="" description="define
the default excludes pattern used to package a project skeleton" />
@@ -33,20 +32,19 @@
         <ea:parameter property="skeleton.default.revision" default="0.1" description="The
default revision if the skeleton that will be published"/>
         <ea:parameter property="skeleton.default.organisation" default="org.apache.easyant.skeletons"
description="The default organisation name of skeletons"/>
         <ea:parameter property="project.default.organisation" default="" description="The
default organisation name of generated project"/>
-       
+
         <ea:parameter property="skeleton.interactive.mode" default="true" description="specify
if easyant should ask questions instead of using -Dproperties" />
-               
+
         <condition property="skeleton.is.interactive">
             <istrue value="${skeleton.interactive.mode}"/>
         </condition>
-       
+
     </target>
-   
-   
+
     <!-- =================================
-                      target: generate             
-                     ================================= -->
-    <target name="-generate-usage">
+                 target: generate
+         ================================= -->
+    <target name="-skeleton:generate-usage">
         <echo level="info">This target will now create a new project from a project
skeleton.</echo>
         <echo level="info">This target can be called with -Dparameters, refer to the
skeleton plugin documentation to have more informations.</echo>
         <ac:if>
@@ -64,26 +62,26 @@
         </ac:if>
     </target>
 
-    <target name="-check-generate" if="skeleton.is.interactive">
+    <target name="-skeleton:check-generate" if="skeleton.is.interactive">
         <input message="Organisation name of the skeleton project" addproperty="skeleton.org"
defaultvalue="${skeleton.default.organisation}"/>
         <input message="Module name of the skeleton project" addproperty="skeleton.module"/>
         <input message="Revision number of the skeleton project" addproperty="skeleton.rev"/>
-       
+
         <input message="The path where the skeleton project will be unzipped" addproperty="skeleton.target.dir"
defaultvalue="${skeleton.default.basedir}"/>
-       
+
         <input message="Organisation name of YOUR project" addproperty="project.org" defaultvalue="${project.default.organisation}"/>
         <input message="Module name of YOUR project" addproperty="project.module"/>
         <input message="Revision number of YOUR project" addproperty="project.rev" defaultvalue="0.1"/>
     </target>
-   
-    <target name="-select" depends="validate" if="skeleton.is.interactive">
+
+    <target name="-skeleton:select" depends="skeleton:init" if="skeleton.is.interactive">
         <echo>Choose a skeleton in the following list:</echo>
         <ea:searchmodule organisation="org.apache.easyant.skeletons" module="*" revision="*"
propertyprefix="skeleton" settingsRef="easyant.ivy.instance"/>
     </target>
-   
-    <target name=":select" depends="-select,:generate" description="select and create
a new project from a list of all available skeletons" if="skeleton.is.interactive"/>
 
-    <target name=":generate" depends="validate,-generate-usage, -check-generate" description="generate
a new project from skeleton">
+    <target name="skeleton:select" depends="-skeleton:select,skeleton:generate" description="select
and create a new project from a list of all available skeletons" if="skeleton.is.interactive"/>
+
+    <target name="skeleton:generate" depends="skeleton:init,-skeleton:generate-usage,-skeleton:check-generate"
description="generate a new project from skeleton">
         <ea:parameter property="skeleton.org" default="${skeleton.default.organisation}"
description="Organisation name of the skeleton project" />
         <ea:parameter property="skeleton.module" required="true" description="Module name
of the skeleton project" />
         <ea:parameter property="skeleton.rev" required="true" description="Revision number
of the skeleton project" />
@@ -104,7 +102,7 @@
         <property name="skeleton.download.artifact" value="${skeleton.target.dir}/${skeleton.artifact.name}"/>
         <available file="${skeleton.download.artifact}" property="skeleton.download.artifact.exist"/>
         <fail unless="skeleton.download.artifact.exist" message="Impossible to find the
downloaded artifact!"/>
-       
+
         <!-- Unzip the project skeleton -->
         <echo>Unzipping project skeleton to ${skeleton.target.dir}</echo>
         <unjar dest="${skeleton.target.dir}" src="${skeleton.download.artifact}">
@@ -112,13 +110,13 @@
                 <exclude name="META-INF/**"/>
             </patternset>
         </unjar>
-       
+
         <filterset id="skeleton.create.replace.filter">
             <filter token="project.module" value="${project.module}" />
             <filter token="project.organisation" value="${project.org}" />
             <filter token="project.revision" value="${project.rev}" />
         </filterset>
-       
+
         <!-- Replacing filter pattern -->
         <echo level="info">Trying to replace property related to YOUR project in .tpl
files</echo>
         <move todir="${skeleton.target.dir}">
@@ -126,7 +124,7 @@
             <filterset refid="skeleton.create.replace.filter"/>
             <mapper type="glob" from="*.tpl" to="*" />
         </move>
-           
+
         <condition property="skeleton.postinstall.script.exists">
             <available file="${skeleton.postinstall.script}"/>
         </condition>
@@ -138,34 +136,33 @@
 
                 <!-- Run post install script (Optionnal) -->
                 <ant antfile="${postinstall.script.path}" inheritall="true" inheritrefs="true"
dir="${skeleton.target.dir}"/>
-               
+
                 <!-- Delete skeleton post install script -->
                 <delete file="${skeleton.postinstall.script}"/>
             </ac:then>
         </ac:if>
-       
+
         <!-- Delete the skeleton archive -->
         <echo>Cleaning your ${skeleton.download.artifact} directory</echo>
         <delete file="${skeleton.download.artifact}"/>
     </target>
-    
-    <target name="-newplugin">
+
+    <target name="-skeleton:newplugin">
         <property name="skeleton.org" value="org.apache.easyant.skeletons"/>
         <property name="skeleton.module" value="std-ant-plugin"/>
         <property name="skeleton.rev" value="latest.integration"/>
         <property name="project.default.organisation" value="org.apache.easyant.plugins"/>
     </target>
-    
-    <target name=":newplugin" depends="-newplugin,:generate" description="create a new
easyant plugin"/>
 
-    <target name="-newskeleton">
+    <target name="skeleton:newplugin" depends="-skeleton:newplugin,skeleton:generate"
description="create a new easyant plugin"/>
+
+    <target name="-skeleton:newskeleton">
         <property name="skeleton.org" value="org.apache.easyant.skeletons"/>
         <property name="skeleton.module" value="std-skeleton"/>
         <property name="skeleton.rev" value="latest.integration"/>
         <property name="project.default.organisation" value="org.apache.easyant.skeletons"/>
     </target>
-    
-    <target name=":newskeleton" depends="-newskeleton,:generate" description="create a
new skeleton"/>
-    
-    <target name="doit" depends="validate" />
+
+    <target name="skeleton:newskeleton" depends="-skeleton:newskeleton,skeleton:generate"
description="create a new skeleton"/>
+
 </project>

Modified: incubator/easyant/plugins/trunk/source-jar/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/module.ivy (original)
+++ incubator/easyant/plugins/trunk/source-jar/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="source-jar" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="source-jar" revision="0.2">
            <description>
                 <p>This module provides source jar packaging feature.</p>
                 

Modified: incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant (original)
+++ incubator/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant Mon Apr 11
21:51:53 2011
@@ -16,12 +16,9 @@
 -->
 <project name="org.apache.easyant.plugins#source-jar" xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <target name=":init" phase="validate">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="package" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
+    <target name="source-jar:init">
         <ea:parameter property="target.artifacts.main.source.jar.name" default="${module.name}-sources.jar"
description="main source artifact file name" />
 
         <ea:parameter property="target.artifacts.test.source.jar.name" default="${module.name}-test-sources.jar"
description="test source artifact file name" />
@@ -51,7 +48,7 @@
 
     <!-- Main Sources -->
 
-    <target name=":main" depends="validate" description="package main source as a JAR"
if="has.src.main" unless="skip.source">
+    <target name="source-jar:main" depends="source-jar:init" description="package main
source as a JAR" if="has.src.main" unless="skip.source">
         <mkdir dir="${target.artifacts}" />
         <jar destfile="${target.artifacts}/${target.artifacts.main.source.jar.name}">
             <fileset dir="${src.main.resources}" erroronmissingdir="false" />
@@ -62,7 +59,7 @@
 
     <!-- Test sources -->
 
-    <target name=":test" depends="validate" description="package test source as a JAR"
if="has.src.test" unless="skip.source">
+    <target name="source-jar:test" depends="source-jar:init" description="package test
source as a JAR" if="has.src.test" unless="skip.source">
         <mkdir dir="${target.artifacts}" />
         <jar destfile="${target.artifacts}/${target.artifacts.test.source.jar.name}">
             <fileset dir="${src.test.resources}" erroronmissingdir="false" />
@@ -71,5 +68,4 @@
         <ea:registerartifact type="test-source" ext="jar" classifier="test-sources" settingsRef="${project.ivy.instance}"/>
     </target>
 
-    <target name="doit" depends=":main" />
 </project>

Modified: incubator/easyant/plugins/trunk/test-junit/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-junit/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/test-junit/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="test-junit" revision="0.2">
+    <info organisation="org.apache.easyant.plugins" module="test-junit" revision="0.3">
            <description>This module provides junit tests compilation and execution
feature.<br/>
 This module extends abstract-test module.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>

Modified: incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant (original)
+++ incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant Mon Apr 11
21:51:53 2011
@@ -17,26 +17,17 @@
 <project name="org.apache.easyant.plugins#test-junit"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
-    <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-junit-test"/>
-    <ea:include mrid="org.apache.easyant.plugins#antcontrib-activator;0.1" as=":ac"/>
-
-    <target name="/skip" description="skip tests">
-        <property name="skip.test" value="true" />
-        <property name="skip.test.integration" value="true" />
-    </target>
-
-    <target name=":init" phase="validate" depends=":abstract-junit-test:init">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="test" />
-        <ea:parameter phase="integration-test" />
+    <ea:import mrid="org.apache.easyant.plugins#abstract-test;0.2" />
+    <ea:import mrid="org.apache.easyant.plugins#antcontrib-activator;0.2" />
 
+    <target name="test-junit:init" depends="abstract-test:init">
         <ea:parameter property="test.run.includes.pattern" 
             default="**/*" description="Pattern describing class files included in test run"
/> 
         <ea:parameter property="test.run.excludes.pattern" 
             default="" description="Pattern describing class files excluded in test run"
/>
-        
+
         <ea:parameter property="test.integration.run.includes.pattern" 
             default="**/*" description="Pattern describing class files included in integration
test run" /> 
         <ea:parameter property="test.integration.run.excludes.pattern" 
@@ -48,15 +39,14 @@
             default="true" description="Run the tests in a separate VM. (true/false)"/>
         <ea:parameter property="test.run.jvmargs"
             default="" description="Extra parameters to pass to the test JVM, for example
to enable debugging"/>
-    
+
         <ea:parameter property="test.integration.run.forkmode"
             default="perTest" description="The forkmode for junit integration tests; 'perTest'
or 'once'"/>
         <ea:parameter property="test.integration.run.fork"
             default="true" description="Run integration tests in a separate VM. (true/false)"/>
         <ea:parameter property="test.integration.run.jvmargs"
             default="" description="Extra parameters to pass to the integration test JVM,
for example to enable debugging"/>
-        
-        
+
         <ea:parameter property="target.test.xml" required="true" 
             description="Directory were xml test reports will be generated"/>
         <ea:parameter property="test.run.dir"
@@ -147,13 +137,13 @@
 
         </sequential>
     </macrodef>
-    
+
     <macrodef name="junit-test">
         <attribute name="prefix"/>
         <sequential>
             <mkdir dir="${target.test.xml}" />
             <mkdir dir="${@{prefix}.run.dir}"/>
-            
+
             <junit
                haltonfailure="off"
                haltonerror="off"
@@ -170,7 +160,7 @@
                 <classpath>
                     <path refid="run.@{prefix}.classpath" />
                 </classpath>
-                
+
                 <formatter type="xml"/>
                 <batchtest todir="${target.test.xml}">
                     <resources refid="target.@{prefix}.set"/>
@@ -180,8 +170,7 @@
         </sequential>
     </macrodef>
 
-    <target name="-compute-test-sets" depends="test-compile" description="compute the
set of test cases to run">
-
+    <target name="-test-junit:compute-test-sets" depends="abstract-test:test-ready" description="compute
the set of test cases to run">
         <compute-test-path prefix="test">
             <path refid="compile.test.classpath" />
         </compute-test-path>
@@ -189,31 +178,27 @@
         <compute-test-path prefix="test.integration">
             <path refid="compile.test.classpath" />
         </compute-test-path>
-
     </target>
 
-    <target name="-test" depends="-compute-test-sets" unless="skip.test">
+    <target name="-test-junit:test" depends="-test-junit:compute-test-sets" unless="skip.test">
         <junit-test prefix="test"/>
     </target>
 
-    <target name="-integration-test" depends="-compute-test-sets" unless="skip.test.integration">
+    <target name="-test-junit:integration-test" depends="-test-junit:compute-test-sets"
unless="skip.test.integration">
         <junit-test prefix="test.integration"/>
     </target>
-    
-    <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
-         phase="test" description="run junit tests">
+
+    <target name="test-junit:run" if="test.mode.run" unless="skip.test" depends="-test-junit:test"
description="run junit tests" extensionOf="abstract-test:test-run">
         <check-test-result propertytocheck="test.failed" 
             message="At least one test has failed. See logs in ${target.test.xml} for details
or use the report target to run the test with a report"/>
     </target>
 
-    <target name=":run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-integration-test"
-         phase="integration-test" description="run junit integration tests">
+    <target name="test-junit:run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-test-junit:integration-test" description="run junit integration tests" extensionOf="abstract-test:test-run">
         <check-test-result propertytocheck="test.integration.failed"
             message="At least one integration test has failed. See logs in ${target.test.xml}
for details or use the report target to run the test with a report" />
     </target>
 
-    <target name=":report" if="test.mode.report" unless="skip.test" depends="-test,-integration-test"
-         phase="report" description="generate junit report">
+    <target name="test-junit:report" if="test.mode.report" unless="skip.test" depends="-test-junit:test,-test-junit:integration-test"
description="generate junit report">
         <junitreport todir="${target.test.xml}">
             <fileset dir="${target.test.xml}">
                 <include name="TEST-*.xml" />
@@ -225,7 +210,5 @@
         <fail if="test.integration.failed"
               message="At least one integration test has failed. See logs in ${target.test.xml}
or report in ${target.test.html}" />
     </target>
-    
-    <target name=":doit" depends=":run, :run-integration, :report" />
 
 </project>

Modified: incubator/easyant/plugins/trunk/test-testng/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-testng/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/module.ivy (original)
+++ incubator/easyant/plugins/trunk/test-testng/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="test-testng" revision="0.2">
+    <info organisation="org.apache.easyant.plugins" module="test-testng" revision="0.3">
            <description>This module provides testng tests compilation and execution
feature.<br/>
 This module extends abstract-test module.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>

Modified: incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant (original)
+++ incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant Mon Apr
11 21:51:53 2011
@@ -17,20 +17,16 @@
 <project name="org.apache.easyant.plugins#test-testng"
     xmlns:ea="antlib:org.apache.easyant">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
-    <ea:include mrid="org.apache.easyant.plugins#abstract-test;0.1" as=":abstract-testng-test"/>
+    <ea:core-version requiredrevision="[0.9,+]" />
+
+    <ea:import mrid="org.apache.easyant.plugins#abstract-test;0.2" />
 
     <target name="/skip" description="skip tests">
         <property name="skip.test" value="true" />
         <property name="skip.test.integration" value="true" />
     </target>
-    
-    <target name=":init" phase="validate" depends=":abstract-testng-test:init">
-        <ea:parameter phase="validate" />
-        <ea:parameter phase="test" />
-        <ea:parameter phase="integration-test" />
-                
+
+    <target name="test-testng:init" depends="abstract-test:init">
         <ea:parameter property="testng.filename" description="testng configuration filename"
default="testng.xml"/>
 
         <ea:path pathid="run.test.classpath" overwrite="append-if-not-exist">
@@ -42,7 +38,7 @@
             <pathelement location="${target.test.integration.classes}" />
             <path refid="compile.test.classpath" />
         </ea:path>
-        
+
         <condition property="skip.test">
             <not><isset property="has.src.test.java"/></not>
         </condition>
@@ -50,20 +46,19 @@
         <condition property="skip.test.integration">
             <not><isset property="has.src.test.integration.java"/></not>
         </condition>
-
     </target>
-    
-    <target name="-load" depends="provision">
+
+    <target name="-test-testng:load">
         <available property="testng.available" classname="org.testng.TestNGAntTask">
-                <classpath refid="run.test.classpath" />
-            </available>
+            <classpath refid="run.test.classpath" />
+        </available>
 
-            <fail unless="testng.available" message="Testng is unavailable, perhaps you
forget to add testng in you project dependencies."/>
-            <taskdef name="testng" classname="com.beust.testng.TestNGAntTask">
-                        <classpath refid="run.test.classpath" />
-            </taskdef>
+        <fail unless="testng.available" message="Testng is unavailable, perhaps you forget
to add testng in you project dependencies."/>
+        <taskdef name="testng" classname="com.beust.testng.TestNGAntTask">
+             <classpath refid="run.test.classpath" />
+        </taskdef>
     </target>
-    
+
     <macrodef name="testng-test">
         <attribute name="prefix"/>
         <sequential>
@@ -81,31 +76,26 @@
             </testng>
         </sequential>
     </macrodef>
-    
-    <target name="-test" depends="test-compile,-load" unless="skip.test">
+
+    <target name="-test-testng:test" depends="test-compile,-test-testng:load" unless="skip.test">
         <testng-test prefix="test"/>
-        
-    </target>   
+    </target>
 
-    <target name="-integration-test" depends="test-compile,-load" unless="skip.test.integration">
+    <target name="-test-testng:integration-test" depends="test-compile,-load" unless="skip.test.integration">
         <testng-test prefix="test.integration"/>
-    </target>   
+    </target>
 
-    
-    <target name=":run" if="test.mode.run" unless="skip.test" depends="-test"
-             phase="test" description="run testng tests">
+    <target name="test-testng::run" if="test.mode.run" unless="skip.test" depends="-test-testng:test"
description="run testng tests">
         <check-test-result propertytocheck="test.failed"
               message="At least one test has failed. See logs in ${target.test.xml} for details
or use the report target to run the test with a report" />
-    </target>   
+    </target>
 
-    <target name=":run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-integration-test"
-                 phase="integration-test" description="run testng integration tests">
+    <target name="test-testng::run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-test-testng:integration-test" description="run testng integration tests">
         <check-test-result propertytocheck="test.integration.failed"
               message="At least one integration test has failed. See logs in ${target.test.xml}
for details or use the report target to run the test with a report" />
-    </target>   
-    
-    <target name=":report" if="test.mode.report" unless="skip.test" depends="-test,-integration-test"
-         phase="report" description="generate testng reports">
+    </target>
+
+    <target name="test-testng:report" if="test.mode.report" unless="skip.test" depends="-test-testng:test,-test-testng:integration-test"
description="generate testng reports">
         <junitreport todir="${target.test.xml}">
             <fileset dir="${target.test.xml}">
                 <include name="TEST-*.xml" />
@@ -117,6 +107,5 @@
         <fail if="test.integration.failed"
               message="At least one integration test has failed. See logs in ${target.test.xml}
or report in ${target.test.html}" />
     </target>
-    
-    <target name=":doit" depends=":run, :run-integration, :report" />
+
 </project>

Modified: incubator/easyant/plugins/trunk/webstart/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/module.ivy (original)
+++ incubator/easyant/plugins/trunk/webstart/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="webstart" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="webstart" revision="0.2">
         <description>This module allows different webstart processus.</description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin"
revision="0.1"/>
         </info>

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=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant (original)
+++ incubator/easyant/plugins/trunk/webstart/src/main/resources/webstart.ant Mon Apr 11 21:51:53
2011
@@ -17,10 +17,9 @@
 <project name="org.apache.easyant.plugins;webstart" 
         xmlns:ivy="antlib:org.apache.ivy.ant" 
         xmlns:ea="antlib:org.apache.easyant">
-        
-    <!-- Force compliance with easyant-core to 0.7 or higher -->
-    <ea:core-version requiredrevision="[0.8,+]" />
-    
+
+    <ea:core-version requiredrevision="[0.9,+]" />
+
     <macrodef name="signJars">
        <attribute name="alias"   description="the alias signer" />
         <attribute name="storepass"  description="the keystore password"/>
@@ -30,18 +29,12 @@
        <element name="signFolder" optional="yes"/>
        <sequential>
         <echo>Sign...</echo>
-        
         <if>
-            
             <isset property="@{keystore}"/>
-            
             <then>
-            
                 <signjar alias="@{alias}" keypass="@{keypass}" keystore="@{keystore}"
storepass="@{storepass}" lazy="@{replaceSign}">
                     <signFolder/>
                 </signjar>
-            
-            
             </then>
             <else>
                 <signjar alias="@{alias}" keypass="@{keypass}" storepass="@{storepass}"
lazy="@{replaceSign}">
@@ -49,17 +42,15 @@
                 </signjar>
             </else>
         </if>
-        
-        <echo>Sign done !</echo>    
+        <echo>Sign done !</echo>
        </sequential>
     </macrodef>
-    
-    <target name=":init">
+
+    <target name="webstart:init">
         <ea:parameter property="jnlp.file" required="true" description="the jnlp to modify"
/>
-        <ea:parameter property="signJar" required="false" default="false" description="tell
if the jars has to be signed" />        
+        <ea:parameter property="signJar" required="false" default="false" description="tell
if the jars has to be signed" />
         <ea:parameter property="flat.path" required="false" description="tell if the path
resources have to be declared in relative or absolute" />
-                        
-        
+
         <ea:parameter property="alias" required="false" description="the alias signer"
/>
         <ea:parameter property="storepass" required="false" description="the keystore
password" />
         <ea:parameter property="keypass" required="false" default="${storepass}" description="the
key password" />
@@ -67,13 +58,9 @@
         <ea:parameter property="lazy" required="false" default="false" description="tell
if the already signed jars have to be signed a second time" />
         <taskdef name="partial-jnlp" classname="org.apache.easyant.tasks.JNLPTask" 
             classpathref="org.apache.easyant.plugins#webstart.classpath" />
-                                                                    
-                
     </target>
 
-    
-
-    <target name=":editJnlp" depends=":init, package" description="edit an existing jnlp
file">
+    <target name="webstart:editJnlp" depends="webstart:init" description="edit an existing
jnlp file">
         <echo message="[Library directory]: ${lib.main}" />
         <echo message="[libArtifact]: ${target.artifacts}/${target.artifacts.main.jar.name}"
/>
         <if>
@@ -92,10 +79,10 @@
                     </fileset>
                     </partial-jnlp>
                 </else>
-        </if>   
-
+        </if>
     </target>
-    <target name=":sign" depends="package">
+
+    <target name="webstart:sign" depends="package">
         <if>
             <equals arg1="${signJar}" arg2="true" />
                 <then>
@@ -106,20 +93,15 @@
                         </signfolder>
                     </signJars>
                 </then>
-        </if>       
+        </if>
     </target>
-    
-    <target name=":prepare" depends=":editJnlp,:sign" description="edit the jnlp file
and sign as necessary"/>
-    
-        
-    
-    <target name=":run" depends=":prepare" description="run the application in java webstart">
+
+    <target name="webstart:prepare" depends="webstart:editJnlp,webstart:sign" description="edit
the jnlp file and sign as necessary" />
+
+    <target name="webstart:run" depends="webstart:prepare" description="run the application
in java webstart">
         <exec executable="javaws">
             <arg value="${jnlp.file}" />
         </exec>
     </target>
 
-    
-    
-    <target name="doit" depends=":run" />
 </project>

Modified: incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant (original)
+++ incubator/easyant/plugins/trunk/webstart/src/test/antunit/common/test-utils.ant Mon Apr
11 21:51:53 2011
@@ -18,7 +18,7 @@
 <project name="easyant-test-utils">
 
     <description>Macros and targets to assist in writing AntUnit test cases for EasyAnt</description>
-    
+
     <macrodef name="easyant" description="fork an easyant process for testing">
         <attribute name="target" description="(optional) the easyant target(s), passed
on the command line" default=""/>
         <attribute name="dir" description="(optional) the base directory from which to
invoke easyant" default="${basedir}"/>
@@ -33,5 +33,5 @@
             </exec>
         </sequential>
     </macrodef>
-    
+
 </project>

Modified: incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml (original)
+++ incubator/easyant/plugins/trunk/webstart/src/test/antunit/webstart-test.xml Mon Apr 11
21:51:53 2011
@@ -15,17 +15,13 @@
    limitations under the License.
 -->
 <project name="org.apache.easyant.plugins;webstart-test" xmlns:au="antlib:org.apache.ant.antunit">
-    
-    <!-- Mocking required phase --> 
-    <phase name="validate"/>
-    <phase name="package"/>
 
     <!-- disable corerevision checker -->
     <property name="skip.corerevision.checker" value="true"/>
-        
+
     <!-- Import your plugin --> 
     <import file="../../main/resources/webstart.ant"/>
-    
+
     <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->

     <target name="clean" description="remove stale build artifacts before / after each
test">
         <delete dir="${basedir}" includeemptydirs="true">
@@ -33,17 +29,17 @@
             <include name="**/lib/**"/>
         </delete>
     </target>
-    
+
     <target name="setUp" depends="clean"/>
     <target name="tearDown" depends="clean"/>
-    
-    <!-- init test case -->         
+
+    <!-- init test case -->
     <target name="testInit">
         <au:expectfailure expectedMessage="expected property 'jnlp.file': the jnlp to
modify">
-            <antcall target=":init"/>
+            <antcall target="webstart:init"/>
         </au:expectfailure>
     </target>
-    
+
     <!--
         A sample ant unit test case, 
         see the antunit official documentation for more informations

Modified: incubator/easyant/plugins/trunk/xooki/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/xooki/module.ivy?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/xooki/module.ivy (original)
+++ incubator/easyant/plugins/trunk/xooki/module.ivy Mon Apr 11 21:51:53 2011
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.plugins" module="xooki" revision="0.1">
+    <info organisation="org.apache.easyant.plugins" module="xooki" revision="0.2">
         <description>
             This module provides functionalities for setting up a xooki-based documentation
structure in your project.
         </description>

Modified: incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant?rev=1091226&r1=1091225&r2=1091226&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant (original)
+++ incubator/easyant/plugins/trunk/xooki/src/main/resources/xooki.ant Mon Apr 11 21:51:53
2011
@@ -20,9 +20,9 @@
     xmlns:ivy="antlib:org.apache.ivy.ant" 
     xmlns:xooki="antlib:xooki">
 
-    <ea:core-version requiredrevision="[0.8,+]" />
+    <ea:core-version requiredrevision="[0.9,+]" />
 
-    <target name=":init" phase="validate">
+    <target name="xooki:init">
         <ea:parameter property="xooki.checkUpToDate" required="false" 
             default="true" description="Proxies for the checkUpToDate xooki:generate task.
Defaults to true." />
         <ea:parameter property="src.documentation.dir" required="false" 
@@ -43,12 +43,12 @@
         <!-- TODO: should menu context names be inherited from the environment somehow?
-->
         <ea:parameter property="xooki.menu.contexts" default="buildtypes,plugins"
             description="list of documentation menus for which xooki will generate menus"/>
-        
+
         <!-- Xooki tasks requires jdk16 -->
         <condition property="org.apache.easyant.plugins#xooki.enabled">
             <contains substring="1.6" string="${ant.java.version}" />
         </condition>
-        
+
         <ac:if>
             <istrue value="${org.apache.easyant.plugins#xooki.enabled}"/>
             <ac:then>
@@ -59,11 +59,11 @@
                 <echo level="warning">Xooki modules requires JDK 1.6. Xooki module
will be disabled.</echo>
             </ac:else>
         </ac:if>
-        
+
         <condition property="contains.history.dir">
             <available file="${xooki.history.dir}" type="dir"/>
         </condition>
-        
+
         <ac:for list="${xooki.menu.contexts}" param="context.name">
             <sequential>
                 <ea:registermenugenerator context="@{context.name}" type="xooki"
@@ -71,26 +71,25 @@
             </sequential>
         </ac:for>
     </target>
-    
-    <target name=":create-skeleton" depends="validate">
+
+    <target name="xooki:create-skeleton" depends="xooki:init">
         <mkdir dir="${xooki.temp.dir}" />
         <mkdir dir="${documentation.css.dir}" />
         <ivy:retrieve organisation="xooki" module="xooki" inline="true" pattern="${xooki.temp.dir}/[artifact].[ext]"
settingsRef="easyant.ivy.instance"/>
         <unzip src="${xooki.temp.dir}/xooki.jar" dest="${src.documentation.dir}" />
         <delete dir="${xooki.temp.dir}" />
     </target>
-    
-    <target name="-copy-resources" depends=":init" phase="process-documentation-resources">
 
+    <target name="-xooki:copy-resources" depends="xooki:init">
         <available file="${src.documentation.dir}/xooki/antlib.xml" property="xooki.skeleton.present"
/>
         <fail unless="xooki.skeleton.present" 
             message="Xooki skeleton has not been correctly setup. Run easyant org.apache.easyant.plugins#xooki:create-skeleton
to generate a xooki skeleton." />
 
         <echo message="Generating xooki documentation." />
         <mkdir dir="${target.documentation.dir}" />
-        
+
         <echo level="verbose" message="copying documentation resources"/>
-        
+
         <fileset id="xooki.resources.fileset" 
             dir="${src.documentation.dir}" 
             includes="${xooki.resources.include.pattern}" 
@@ -99,7 +98,7 @@
         <copy todir="${target.documentation.dir}">
             <fileset refid="xooki.resources.fileset"/>
         </copy>
-        
+
         <!-- copy to a xooki temp dir this will allow users to generate xooki documentation
-->
         <copy todir="${xooki.temp.dir}">
             <fileset dir="${src.documentation.dir}" id="src.documentation.fileset">
@@ -107,10 +106,9 @@
                 <exclude name="${xooki.resources.include.pattern}" />
             </fileset>
         </copy>
-
     </target>
-    
-    <target name="-configure-history" if="contains.history.dir" phase="process-documentation-resources">
+
+    <target name="-xooki:configure-history" if="contains.history.dir">
         <ac:for param="doc-version">
             <path>
                 <dirset dir="${xooki.history.dir}" includes="*" />
@@ -122,16 +120,13 @@
             </sequential>
         </ac:for>
     </target>
-    
-    <target name=":generate" 
-        depends="-copy-resources, -configure-history, process-documentation-resources"
-        phase="documentation"
-        if="org.apache.easyant.plugins#xooki.enabled">
+
+    <target name="xooki:generate" depends="-xooki:copy-resources,-xooki:configure-history"
if="org.apache.easyant.plugins#xooki.enabled">
         <echo level="verbose" message="generating target documentation"/>
-        
+
         <dirname file="${target.documentation.dir}" property="full.target.documentation.dir"
/>
         <basename file="${target.documentation.dir}" property="basename.target.documentation.dir"
/>
-        
+
         <fileset dir="${xooki.temp.dir}" id="src.documentation.fileset">
             <include name="**/*.html" />
             <exclude name="template.html" />
@@ -144,7 +139,7 @@
         </xooki:generate>
     </target>
 
-    <target name=":package" depends=":generate" description="package the xooki documentation"
if="org.apache.easyant.plugins#xooki.enabled">
+    <target name="xooki:package" depends="xooki:generate" description="package the xooki
documentation" if="org.apache.easyant.plugins#xooki.enabled">
         <ea:parameter property="target.artifacts" default="${target}/artifacts" 
             description="destination directory for target artifacts"/>
 
@@ -154,5 +149,4 @@
         <ea:registerartifact type="doc" ext="zip" classifier="doc" settingsRef="${project.ivy.instance}"/>
     </target>
 
-    <target name="doit" depends=":package" />
 </project>



Mime
View raw message