svn commit: r1369466 - in /incubator/easyant/plugins/trunk: abstract-package/src/main/resources/ abstract-package/src/test/antunit/ package-war/src/test/antunit/

[jl...@apache.org]

Author: jlboudart
Date: Sat Aug  4 21:22:54 2012
New Revision: 1369466

URL: http://svn.apache.org/viewvc?rev=1369466&view=rev
Log:
Move register main artifact test to abstract-package module

Added:
    incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/sample-module.ivy
      - copied, changed from r1369463, incubator/easyant/plugins/trunk/package-war/src/test/antunit/sample-module.ivy
Removed:
    incubator/easyant/plugins/trunk/package-war/src/test/antunit/sample-module.ivy
Modified:
    incubator/easyant/plugins/trunk/abstract-package/src/main/resources/abstract-package.ant
    incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/abstract-package-test.xml
    incubator/easyant/plugins/trunk/package-war/src/test/antunit/package-war-test.xml

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=1369466&r1=1369465&r2=1369466&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 Sat Aug  4 21:22:54 2012
@@ -40,7 +40,7 @@
     </target>
 
 
-    <target name="abstract-package:register-artifact" extensionOf="abstract-package:package-finished">
+    <target name="abstract-package:register-main-artifact" extensionOf="abstract-package:package-finished">
          <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-package/src/test/antunit/abstract-package-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/abstract-package-test.xml?rev=1369466&r1=1369465&r2=1369466&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/abstract-package-test.xml (original)
+++ incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/abstract-package-test.xml Sat Aug  4 21:22:54 2012
@@ -47,6 +47,20 @@
         <au:assertPropertyEquals name="package.metainf.excludes.pattern" value=""/>
         <au:assertReferenceSet refid="package.metainf.fileset"/>
     </target>
+    
+    <target name="prepare-register-artifact">
+        <property name="project.ivy.instance" value="project.ivy.instance"/>
+        <ivy:settings id="project.ivy.instance"/>
+        <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance"/>
+        <echo file="${target}/myartifact.jar"/>
+        <property name="target.main.artifact" value="${target}/myartifact.jar"/>
+    </target>
+
+    <target name="test-abstract-package:register-main-artifact" depends="prepare-register-artifact,abstract-package:register-main-artifact">
+        <au:assertPropertyEquals name="publish.main.type" value="jar"/>
+        <au:assertPropertyEquals name="publish.main.confs" value="default"/>
+        <au:assertPropertyEquals name="project.ivy.instance" value="project.ivy.instance"/>
+    </target>
 
 
 </project>

Copied: incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/sample-module.ivy (from r1369463, incubator/easyant/plugins/trunk/package-war/src/test/antunit/sample-module.ivy)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/sample-module.ivy?p2=incubator/easyant/plugins/trunk/abstract-package/src/test/antunit/sample-module.ivy&p1=incubator/easyant/plugins/trunk/package-war/src/test/antunit/sample-module.ivy&r1=1369463&r2=1369466&rev=1369466&view=diff
==============================================================================
    (empty)

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=1369466&r1=1369465&r2=1369466&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 Sat Aug  4 21:22:54 2012
@@ -39,9 +39,6 @@
        <mkdir dir="${target.main.classes}"/>
        <property name="manifest.file" value="${target}/MANIFEST.MF"/>
        <echo file="${manifest.file}"/>
-       <property name="project.ivy.instance" value="project.ivy.instance"/>
-       <ivy:settings id="project.ivy.instance"/>
-       <ivy:resolve file="sample-module.ivy" settingsRef="project.ivy.instance"/>
     </target>
     <target name="tearDown" depends="clean"/>