Extend scripts to include all contributions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796687 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 125 insertions, 27 deletions

diff --git a/java/sca/otest/current/build.xml b/java/sca/otest/current/build.xml
index 6d4945e143..d05d4f1d0b 100644
--- a/java/sca/otest/current/build.xml
+++ b/java/sca/otest/current/build.xml
@@ -29,10 +29,89 @@
     </target>
 
     <target name="fixUpContributions"> 
-        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="General"/></antcall>
+<!--
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="General_Java"/></antcall>
+-->
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4002"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4004"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4005"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4007"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5004"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5005"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5007"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5009"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5023"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5024"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5027"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5030"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5035"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6002"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6005"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6006"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6008"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6012"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6021"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6022"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6025"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6028"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6029"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6031"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6032"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6033"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7007"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7008"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7009"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7010"/></antcall>
+<!--
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8001_Java"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8004"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8005"/></antcall>
+-->
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8010"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8011"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8012"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_9002"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_10001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_10003"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12002"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12005"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12007"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12008"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12009"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12010"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12012"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12013"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13001"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13002"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13003"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13004"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13005"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13006"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13007"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13008"/></antcall>
+
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="Contribution1"/></antcall>
+        <antcall target="fixUpContribution-Resource"><param name="contrib" value="Contribution2"/></antcall>
     </target>
 
-    <target name="fixUpContribution"> 
+
+    <target name="fixUpContribution-Resource"> 
        <!-- create dir -->
 
        <!-- create resources dir -->
@@ -46,9 +125,29 @@
 
        <!-- could use texen to set up the pom -->
 
-       <!-- clear resources dir - so that contrib structure can be checked in -->
+       <!-- clear resources dir - so that updated contrib structure can be easily checked in -->
+       <delete quiet="true" includeemptydirs="true"> 
+           <fileset dir="${contrib}/src/main/resources" includes="**/*"/> 
+       </delete> 
+    </target>
+
+    <target name="fixUpContribution-Java"> 
+       <!-- create dir -->
+
+       <!-- create resources dir -->
+       <mkdir dir="${contrib}/src/main/java"/>
+
+       <!-- copy in pom -->
+       <antcall target="copyTemplatePom">
+           <param name="from.file" value="./template-pom-java.xml"/>
+           <param name="to.file" value="${contrib}/pom.xml"/>
+       </antcall>
+
+       <!-- could use texen to set up the pom -->
+
+       <!-- clear java dir - so that updated contrib structure can be easily checked in -->
        <delete quiet="true" includeemptydirs="true"> 
-           <fileset dir="${contrib}/src/main/resources/*"/> 
+           <fileset dir="${contrib}/src/main/java" includes="**/*"/> 
        </delete> 
     </target>
 
diff --git a/java/sca/otest/current/pom.xml b/java/sca/otest/current/pom.xml
index 40834fc982..41544f115c 100644
--- a/java/sca/otest/current/pom.xml
+++ b/java/sca/otest/current/pom.xml
@@ -71,27 +71,6 @@
     <modules>
         <module>General</module>
         <module>General_Java</module>
-<!--
-        <module>ASM_10001</module>
-        <module>ASM_10003</module>
-        <module>ASM_12001</module>
-        <module>ASM_12002</module>
-        <module>ASM_12003</module>
-        <module>ASM_12005</module>
-        <module>ASM_12007</module>
-        <module>ASM_12008</module>
-        <module>ASM_12009</module>
-        <module>ASM_12010</module>
-        <module>ASM_12012</module>
-        <module>ASM_12013</module>
-        <module>ASM_13001</module>
-        <module>ASM_13002</module>
-        <module>ASM_13003</module>
-        <module>ASM_13004</module>
-        <module>ASM_13005</module>
-        <module>ASM_13006</module>
-        <module>ASM_13007</module>
-        <module>ASM_13008</module>
         <module>ASM_4002</module>
         <module>ASM_4003</module>
         <module>ASM_4004</module>
@@ -125,19 +104,39 @@
         <module>ASM_7008</module>
         <module>ASM_7009</module>
         <module>ASM_7010</module>
+<!--
         <module>ASM_8001</module>
         <module>ASM_8001_Java</module>
         <module>ASM_8003</module>
         <module>ASM_8004</module>
         <module>ASM_8005</module>
+-->
         <module>ASM_8010</module>
         <module>ASM_8011</module>
         <module>ASM_8012</module>
         <module>ASM_9002</module>
+        <module>ASM_10001</module>
+        <module>ASM_10003</module>
+        <module>ASM_12001</module>
+        <module>ASM_12002</module>
+        <module>ASM_12003</module>
+        <module>ASM_12005</module>
+        <module>ASM_12007</module>
+        <module>ASM_12008</module>
+        <module>ASM_12009</module>
+        <module>ASM_12010</module>
+        <module>ASM_12012</module>
+        <module>ASM_12013</module>
+        <module>ASM_13001</module>
+        <module>ASM_13002</module>
+        <module>ASM_13003</module>
+        <module>ASM_13004</module>
+        <module>ASM_13005</module>
+        <module>ASM_13006</module>
+        <module>ASM_13007</module>
+        <module>ASM_13008</module>
         <module>Contribution1</module>
         <module>Contribution2</module>
--->
-        <module>ASM_5004</module>
         <module>tests</module>
     </modules>