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/05 07:32:55 UTC
svn commit: r1394394 - in /incubator/easyant/skeletons/trunk:
std-ant-plugin/ std-ant-plugin/src/main/resources/
std-ant-plugin/src/main/resources/src/main/resources/
std-ant-plugin/src/main/resources/src/test/antunit/ std-java-application/
std-java-ap...
Author: jlboudart
Date: Fri Oct 5 07:32:54 2012
New Revision: 1394394
URL: http://svn.apache.org/viewvc?rev=1394394&view=rev
Log:
Update skeletons with recent changes and upgrade build type versions
Modified:
incubator/easyant/skeletons/trunk/std-ant-plugin/module.ivy
incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/module.ivy.tpl
incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/main/resources/temp-plugin.ant.tpl
incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/test/antunit/temp-plugin-test.xml.tpl
incubator/easyant/skeletons/trunk/std-java-application/module.ivy
incubator/easyant/skeletons/trunk/std-java-application/src/main/resources/module.ivy.tpl
incubator/easyant/skeletons/trunk/std-java-webapplication/module.ivy
incubator/easyant/skeletons/trunk/std-java-webapplication/src/main/resources/module.ivy.tpl
incubator/easyant/skeletons/trunk/std-skeleton/module.ivy
incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/module.ivy.tpl
incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/src/main/resources/module.ivy
Modified: incubator/easyant/skeletons/trunk/std-ant-plugin/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-ant-plugin/module.ivy?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-ant-plugin/module.ivy (original)
+++ incubator/easyant/skeletons/trunk/std-ant-plugin/module.ivy Fri Oct 5 07:32:54 2012
@@ -16,7 +16,7 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.skeletons" module="std-ant-plugin"
- status="integration" revision="0.1">
+ status="integration" revision="0.9">
<description>Skeleton for creating ant based plugin for easyant</description>
<ea:build module="build-std-skeleton" revision="0.1"/>
</info>
Modified: incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/module.ivy.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/module.ivy.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/module.ivy.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/module.ivy.tpl Fri Oct 5 07:32:54 2012
@@ -23,12 +23,12 @@
<project name="@project.organisation@;@project.module@"
xmlns:ea="antlib:org.apache.easyant">
- <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.9"/>
</project>
-->
<!-- note that in a module.ivy the organisation attribute is not mandatory
if not specified easyant will use the default organisation for build type / plugin -->
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.9"/>
</info>
<configurations>
<conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
@@ -36,8 +36,8 @@
<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="@project.module@" type="ant"/>
- </publications>
+ <artifact name="@project.module@" type="ant"/>
+ </publications>
<dependencies>
<!-- your project dependencies goes here -->
Modified: incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/main/resources/temp-plugin.ant.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/main/resources/temp-plugin.ant.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/main/resources/temp-plugin.ant.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/main/resources/temp-plugin.ant.tpl Fri Oct 5 07:32:54 2012
@@ -24,11 +24,9 @@
-->
<!-- Sample init target -->
- <target name=":init" phase="validate">
+ <target name="@project.module@:init">
<!-- you should remove this echo message -->
<echo level="debug">This is the init target of @project.module@</echo>
</target>
- <!-- define a generic default target for this plugin -->
- <target name="doit" depends="validate"/>
</project>
Modified: incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/test/antunit/temp-plugin-test.xml.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/test/antunit/temp-plugin-test.xml.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/test/antunit/temp-plugin-test.xml.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-ant-plugin/src/main/resources/src/test/antunit/temp-plugin-test.xml.tpl Fri Oct 5 07:32:54 2012
@@ -14,14 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="@project.organisation@;@project.module@-test" xmlns:au="antlib:org.apache.ant.antunit">
-
- <!-- Mocking required phase -->
- <phase name="validate"/>
-
- <!-- Import your plugin -->
- <import file="../../main/resources/@project.module@.ant"/>
+<project name="@project.organisation@;@project.module@-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"/>
+ <!-- configure easyant in current project -->
+ <ea:configure-easyant-ivy-instance />
+ <!-- import our local plugin -->
+ <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+
<!-- 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">
@@ -34,8 +38,7 @@
<target name="tearDown" depends="clean"/>
<!-- init test case -->
- <target name="testInit">
- <antcall target=":init"/>
+ <target name="test-@project.module@:init" depends="@project.module@:init">
<au:assertLogContains level="debug" text="This is the init target of @project.module@"/>
</target>
@@ -43,7 +46,7 @@
A sample ant unit test case,
see the antunit official documentation for more informations
- <target name="testSample" description="a sample of ant unit test case">
+ <target name="test-@project.module@:sample" description="a sample of ant unit test case">
<au:assertTrue>
<matches string="abc" pattern="abc"/>
</au:assertTrue>
Modified: incubator/easyant/skeletons/trunk/std-java-application/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-java-application/module.ivy?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-java-application/module.ivy (original)
+++ incubator/easyant/skeletons/trunk/std-java-application/module.ivy Fri Oct 5 07:32:54 2012
@@ -16,7 +16,7 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.skeletons" module="std-java-application"
- status="integration" revision="0.1">
+ status="integration" revision="0.9">
<description>Skeleton for creating standard java application</description>
<ea:build module="build-std-skeleton" revision="0.1"/>
</info>
Modified: incubator/easyant/skeletons/trunk/std-java-application/src/main/resources/module.ivy.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-java-application/src/main/resources/module.ivy.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-java-application/src/main/resources/module.ivy.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-java-application/src/main/resources/module.ivy.tpl Fri Oct 5 07:32:54 2012
@@ -23,12 +23,12 @@
<project name="@project.organisation@;@project.module@"
xmlns:ea="antlib:org.apache.easyant">
- <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2"/>
+ <ea:import organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"/>
</project>
-->
<!-- note that in a module.ivy the organisation attribute is not mandatory
if not specified easyant will use the default organisation for build type / plugin -->
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.2"/>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"/>
</info>
<configurations>
<conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
Modified: incubator/easyant/skeletons/trunk/std-java-webapplication/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-java-webapplication/module.ivy?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-java-webapplication/module.ivy (original)
+++ incubator/easyant/skeletons/trunk/std-java-webapplication/module.ivy Fri Oct 5 07:32:54 2012
@@ -16,7 +16,7 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.skeletons" module="std-java-webapplication"
- status="integration" revision="0.1">
+ status="integration" revision="0.9">
<description>Skeleton for creating standard java web application</description>
<ea:build module="build-std-skeleton" revision="0.1"/>
</info>
Modified: incubator/easyant/skeletons/trunk/std-java-webapplication/src/main/resources/module.ivy.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-java-webapplication/src/main/resources/module.ivy.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-java-webapplication/src/main/resources/module.ivy.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-java-webapplication/src/main/resources/module.ivy.tpl Fri Oct 5 07:32:54 2012
@@ -23,12 +23,12 @@
<project name="@project.organisation@;@project.module@"
xmlns:ea="antlib:org.apache.easyant">
- <ea:import organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1"/>
+ <ea:import organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.9"/>
</project>
-->
<!-- note that in a module.ivy the organisation attribute is not mandatory
if not specified easyant will use the default organisation for build type / plugin -->
- <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.1"/>
+ <ea:build organisation="org.apache.easyant.buildtypes" module="build-webapp-java" revision="0.9"/>
</info>
<configurations>
<conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
Modified: incubator/easyant/skeletons/trunk/std-skeleton/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-skeleton/module.ivy?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-skeleton/module.ivy (original)
+++ incubator/easyant/skeletons/trunk/std-skeleton/module.ivy Fri Oct 5 07:32:54 2012
@@ -16,7 +16,7 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
<info organisation="org.apache.easyant.skeletons" module="std-skeleton"
- status="integration" revision="0.1">
+ status="integration" revision="0.9">
<description>Emtpy skeleton structure</description>
<ea:build module="build-std-skeleton" revision="0.1"/>
</info>
Modified: incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/module.ivy.tpl
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/module.ivy.tpl?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/module.ivy.tpl (original)
+++ incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/module.ivy.tpl Fri Oct 5 07:32:54 2012
@@ -20,6 +20,6 @@
<!--
<description>YOUR SKELETON DESCRIPTION GOES HERE</description>
-->
- <ea:build module="build-std-skeleton" revision="0.1"/>
+ <ea:build module="build-std-skeleton" revision="0.9"/>
</info>
</ivy-module>
Modified: incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/src/main/resources/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/src/main/resources/module.ivy?rev=1394394&r1=1394393&r2=1394394&view=diff
==============================================================================
--- incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/src/main/resources/module.ivy (original)
+++ incubator/easyant/skeletons/trunk/std-skeleton/src/main/resources/src/main/resources/module.ivy Fri Oct 5 07:32:54 2012
@@ -20,6 +20,6 @@
<!--
<description>YOUR SKELETON DESCRIPTION GOES HERE</description>
-->
- <ea:build module="build-std-skeleton" revision="0.1"/>
+ <ea:build module="build-std-skeleton" revision="0.9"/>
</info>
</ivy-module>