From c10eb19f425060aa0ef75d82fa768e6388f1dbd8 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 5 Aug 2009 21:51:36 +0000
Subject: Update pom.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801428 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/otest/current/ASM_10001/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_10003/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12001/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12002/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12003/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12005/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12007/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12008/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12009/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12010/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12012/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_12013/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13001/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13002/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13003/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13004/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13005/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13006/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13007/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_13008/pom.xml     | 16 +++++++-
 java/sca/otest/current/ASM_4002/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_4003/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_4004/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_4005/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_4007/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5004/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5005/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5007/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5009/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5023/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5024/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5027/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5030/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_5035/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6001/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6002/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6003/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6005/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6006/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6008/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6012/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6021/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6022/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6025/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6028/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6029/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6031/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6032/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_6033/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_7001/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_7007/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_7008/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_7009/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_7010/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8001/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8001_Java/pom.xml | 13 +++----
 java/sca/otest/current/ASM_8003/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8004/pom.xml      | 23 ++++++++----
 java/sca/otest/current/ASM_8005/pom.xml      | 13 +++----
 java/sca/otest/current/ASM_8010/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8011/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8012/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8017/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_8019/pom.xml      | 16 +++++++-
 java/sca/otest/current/ASM_9002/pom.xml      | 16 +++++++-
 java/sca/otest/current/Contribution1/pom.xml | 16 +++++++-
 java/sca/otest/current/Contribution2/pom.xml | 16 +++++++-
 java/sca/otest/current/General/pom.xml       |  8 +++-
 java/sca/otest/current/General_Java/pom.xml  | 55 ++++++++++++++++++++++++----
 69 files changed, 977 insertions(+), 159 deletions(-)

(limited to 'java')

diff --git a/java/sca/otest/current/ASM_10001/pom.xml b/java/sca/otest/current/ASM_10001/pom.xml
index c034ed2d58..50ac4f9291 100644
--- a/java/sca/otest/current/ASM_10001/pom.xml
+++ b/java/sca/otest/current/ASM_10001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_10001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_10001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_10001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_10003/pom.xml b/java/sca/otest/current/ASM_10003/pom.xml
index ea55c43f41..44f22effa8 100644
--- a/java/sca/otest/current/ASM_10003/pom.xml
+++ b/java/sca/otest/current/ASM_10003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_10003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_10003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_10003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12001/pom.xml b/java/sca/otest/current/ASM_12001/pom.xml
index 8f4dc82656..dd89230de6 100644
--- a/java/sca/otest/current/ASM_12001/pom.xml
+++ b/java/sca/otest/current/ASM_12001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12002/pom.xml b/java/sca/otest/current/ASM_12002/pom.xml
index d24e1ebc1b..a2097cc6fa 100644
--- a/java/sca/otest/current/ASM_12002/pom.xml
+++ b/java/sca/otest/current/ASM_12002/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12002</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12002</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12002"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12003/pom.xml b/java/sca/otest/current/ASM_12003/pom.xml
index f95448394a..a3c8d29691 100644
--- a/java/sca/otest/current/ASM_12003/pom.xml
+++ b/java/sca/otest/current/ASM_12003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12005/pom.xml b/java/sca/otest/current/ASM_12005/pom.xml
index 2de884b860..f182f91a14 100644
--- a/java/sca/otest/current/ASM_12005/pom.xml
+++ b/java/sca/otest/current/ASM_12005/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12005</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12005</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12005"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12007/pom.xml b/java/sca/otest/current/ASM_12007/pom.xml
index 6222c6c623..910015aebb 100644
--- a/java/sca/otest/current/ASM_12007/pom.xml
+++ b/java/sca/otest/current/ASM_12007/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12007</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12007</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12007"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12008/pom.xml b/java/sca/otest/current/ASM_12008/pom.xml
index e0fde02b09..d8447998a5 100644
--- a/java/sca/otest/current/ASM_12008/pom.xml
+++ b/java/sca/otest/current/ASM_12008/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12008</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12008</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12008"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12009/pom.xml b/java/sca/otest/current/ASM_12009/pom.xml
index 0b307a0550..f281eaddff 100644
--- a/java/sca/otest/current/ASM_12009/pom.xml
+++ b/java/sca/otest/current/ASM_12009/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12009</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12009</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12009"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12010/pom.xml b/java/sca/otest/current/ASM_12010/pom.xml
index 6360c11579..c69f528b78 100644
--- a/java/sca/otest/current/ASM_12010/pom.xml
+++ b/java/sca/otest/current/ASM_12010/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12010</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12010</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12010"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12012/pom.xml b/java/sca/otest/current/ASM_12012/pom.xml
index 1df4576025..9260fc4ee8 100644
--- a/java/sca/otest/current/ASM_12012/pom.xml
+++ b/java/sca/otest/current/ASM_12012/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12012</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12012</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12012"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_12013/pom.xml b/java/sca/otest/current/ASM_12013/pom.xml
index 25b4a18f21..a2cba3f24c 100644
--- a/java/sca/otest/current/ASM_12013/pom.xml
+++ b/java/sca/otest/current/ASM_12013/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_12013</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_12013</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_12013"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13001/pom.xml b/java/sca/otest/current/ASM_13001/pom.xml
index 789f105c4b..ef6aa4c24c 100644
--- a/java/sca/otest/current/ASM_13001/pom.xml
+++ b/java/sca/otest/current/ASM_13001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13002/pom.xml b/java/sca/otest/current/ASM_13002/pom.xml
index 48461b6612..47b8a115c7 100644
--- a/java/sca/otest/current/ASM_13002/pom.xml
+++ b/java/sca/otest/current/ASM_13002/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13002</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13002</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13002"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13003/pom.xml b/java/sca/otest/current/ASM_13003/pom.xml
index 9f4c126d64..aac5095e5d 100644
--- a/java/sca/otest/current/ASM_13003/pom.xml
+++ b/java/sca/otest/current/ASM_13003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13004/pom.xml b/java/sca/otest/current/ASM_13004/pom.xml
index dafd9aa848..d92ce40164 100644
--- a/java/sca/otest/current/ASM_13004/pom.xml
+++ b/java/sca/otest/current/ASM_13004/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13004</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13004</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13004"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13005/pom.xml b/java/sca/otest/current/ASM_13005/pom.xml
index cbc1441b7b..435095576b 100644
--- a/java/sca/otest/current/ASM_13005/pom.xml
+++ b/java/sca/otest/current/ASM_13005/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13005</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13005</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13005"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13006/pom.xml b/java/sca/otest/current/ASM_13006/pom.xml
index f5215ac096..787da1ef6b 100644
--- a/java/sca/otest/current/ASM_13006/pom.xml
+++ b/java/sca/otest/current/ASM_13006/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13006</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13006</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13006"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13007/pom.xml b/java/sca/otest/current/ASM_13007/pom.xml
index 2f81d9944b..a9e43d8d88 100644
--- a/java/sca/otest/current/ASM_13007/pom.xml
+++ b/java/sca/otest/current/ASM_13007/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13007</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13007</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13007"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_13008/pom.xml b/java/sca/otest/current/ASM_13008/pom.xml
index a2c3528d77..827292ceb6 100644
--- a/java/sca/otest/current/ASM_13008/pom.xml
+++ b/java/sca/otest/current/ASM_13008/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_13008</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_13008</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_13008"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_4002/pom.xml b/java/sca/otest/current/ASM_4002/pom.xml
index 042edd5e18..86946ca07f 100644
--- a/java/sca/otest/current/ASM_4002/pom.xml
+++ b/java/sca/otest/current/ASM_4002/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_4002</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_4002</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_4002"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_4003/pom.xml b/java/sca/otest/current/ASM_4003/pom.xml
index f5dface34b..b7534fecf2 100644
--- a/java/sca/otest/current/ASM_4003/pom.xml
+++ b/java/sca/otest/current/ASM_4003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_4003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_4003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_4003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_4004/pom.xml b/java/sca/otest/current/ASM_4004/pom.xml
index 3a127d579c..42e2175a7e 100644
--- a/java/sca/otest/current/ASM_4004/pom.xml
+++ b/java/sca/otest/current/ASM_4004/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_4004</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_4004</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_4004"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_4005/pom.xml b/java/sca/otest/current/ASM_4005/pom.xml
index 708093db11..e1d360d453 100644
--- a/java/sca/otest/current/ASM_4005/pom.xml
+++ b/java/sca/otest/current/ASM_4005/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_4005</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_4005</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_4005"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_4007/pom.xml b/java/sca/otest/current/ASM_4007/pom.xml
index 6c9fe2c63b..ec20180613 100644
--- a/java/sca/otest/current/ASM_4007/pom.xml
+++ b/java/sca/otest/current/ASM_4007/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_4007</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_4007</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_4007"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5004/pom.xml b/java/sca/otest/current/ASM_5004/pom.xml
index f0ad7aed52..bb623e0483 100644
--- a/java/sca/otest/current/ASM_5004/pom.xml
+++ b/java/sca/otest/current/ASM_5004/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5004</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5004</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5004"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5005/pom.xml b/java/sca/otest/current/ASM_5005/pom.xml
index ec0d4eec1d..fe5be2e202 100644
--- a/java/sca/otest/current/ASM_5005/pom.xml
+++ b/java/sca/otest/current/ASM_5005/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5005</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5005</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5005"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5007/pom.xml b/java/sca/otest/current/ASM_5007/pom.xml
index 49e133dd08..db4f2440cb 100644
--- a/java/sca/otest/current/ASM_5007/pom.xml
+++ b/java/sca/otest/current/ASM_5007/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5007</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5007</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5007"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5009/pom.xml b/java/sca/otest/current/ASM_5009/pom.xml
index de62f8cb07..027cb44e35 100644
--- a/java/sca/otest/current/ASM_5009/pom.xml
+++ b/java/sca/otest/current/ASM_5009/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5009</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5009</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5009"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5023/pom.xml b/java/sca/otest/current/ASM_5023/pom.xml
index 4564ed1c4c..7903fbb52b 100644
--- a/java/sca/otest/current/ASM_5023/pom.xml
+++ b/java/sca/otest/current/ASM_5023/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5023</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5023</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5023"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5024/pom.xml b/java/sca/otest/current/ASM_5024/pom.xml
index d77e6aa615..99d3eb8d69 100644
--- a/java/sca/otest/current/ASM_5024/pom.xml
+++ b/java/sca/otest/current/ASM_5024/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5024</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5024</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5024"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5027/pom.xml b/java/sca/otest/current/ASM_5027/pom.xml
index cfbf0771c4..0b4bbc2073 100644
--- a/java/sca/otest/current/ASM_5027/pom.xml
+++ b/java/sca/otest/current/ASM_5027/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5027</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5027</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5027"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5030/pom.xml b/java/sca/otest/current/ASM_5030/pom.xml
index 8cb748eb91..705addede5 100644
--- a/java/sca/otest/current/ASM_5030/pom.xml
+++ b/java/sca/otest/current/ASM_5030/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5030</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5030</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5030"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_5035/pom.xml b/java/sca/otest/current/ASM_5035/pom.xml
index c149bdf895..7f4e481200 100644
--- a/java/sca/otest/current/ASM_5035/pom.xml
+++ b/java/sca/otest/current/ASM_5035/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_5035</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_5035</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_5035"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6001/pom.xml b/java/sca/otest/current/ASM_6001/pom.xml
index 1e376cb817..086f83bf01 100644
--- a/java/sca/otest/current/ASM_6001/pom.xml
+++ b/java/sca/otest/current/ASM_6001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6002/pom.xml b/java/sca/otest/current/ASM_6002/pom.xml
index 25396191b0..0c99324771 100644
--- a/java/sca/otest/current/ASM_6002/pom.xml
+++ b/java/sca/otest/current/ASM_6002/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6002</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6002</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6002"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6003/pom.xml b/java/sca/otest/current/ASM_6003/pom.xml
index 577189b2ec..c6c3513a9a 100644
--- a/java/sca/otest/current/ASM_6003/pom.xml
+++ b/java/sca/otest/current/ASM_6003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6005/pom.xml b/java/sca/otest/current/ASM_6005/pom.xml
index fa07a91bb3..cac1165fa8 100644
--- a/java/sca/otest/current/ASM_6005/pom.xml
+++ b/java/sca/otest/current/ASM_6005/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6005</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6005</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6005"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6006/pom.xml b/java/sca/otest/current/ASM_6006/pom.xml
index 9bf743f260..f893fbf04c 100644
--- a/java/sca/otest/current/ASM_6006/pom.xml
+++ b/java/sca/otest/current/ASM_6006/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6006</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6006</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6006"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6008/pom.xml b/java/sca/otest/current/ASM_6008/pom.xml
index 137fb026b9..11fed78091 100644
--- a/java/sca/otest/current/ASM_6008/pom.xml
+++ b/java/sca/otest/current/ASM_6008/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6008</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6008</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6008"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6012/pom.xml b/java/sca/otest/current/ASM_6012/pom.xml
index 6b59bc4e65..5500f936cc 100644
--- a/java/sca/otest/current/ASM_6012/pom.xml
+++ b/java/sca/otest/current/ASM_6012/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6012</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6012</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6012"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6021/pom.xml b/java/sca/otest/current/ASM_6021/pom.xml
index 9b99298686..d63207c8e7 100644
--- a/java/sca/otest/current/ASM_6021/pom.xml
+++ b/java/sca/otest/current/ASM_6021/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6021</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6021</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6021"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6022/pom.xml b/java/sca/otest/current/ASM_6022/pom.xml
index d0eb146228..738b887ce5 100644
--- a/java/sca/otest/current/ASM_6022/pom.xml
+++ b/java/sca/otest/current/ASM_6022/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6022</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6022</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6022"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6025/pom.xml b/java/sca/otest/current/ASM_6025/pom.xml
index fce50a8c7d..1d670c3289 100644
--- a/java/sca/otest/current/ASM_6025/pom.xml
+++ b/java/sca/otest/current/ASM_6025/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6025</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6025</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6025"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6028/pom.xml b/java/sca/otest/current/ASM_6028/pom.xml
index 2711bf576c..786435e8ab 100644
--- a/java/sca/otest/current/ASM_6028/pom.xml
+++ b/java/sca/otest/current/ASM_6028/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6028</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6028</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6028"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6029/pom.xml b/java/sca/otest/current/ASM_6029/pom.xml
index 5919c9d52a..507d0ff4ff 100644
--- a/java/sca/otest/current/ASM_6029/pom.xml
+++ b/java/sca/otest/current/ASM_6029/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6029</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6029</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6029"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6031/pom.xml b/java/sca/otest/current/ASM_6031/pom.xml
index 913f85bc74..286c2750e0 100644
--- a/java/sca/otest/current/ASM_6031/pom.xml
+++ b/java/sca/otest/current/ASM_6031/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6031</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6031</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6031"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6032/pom.xml b/java/sca/otest/current/ASM_6032/pom.xml
index e033050e6f..d416df3ecd 100644
--- a/java/sca/otest/current/ASM_6032/pom.xml
+++ b/java/sca/otest/current/ASM_6032/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6032</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6032</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6032"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_6033/pom.xml b/java/sca/otest/current/ASM_6033/pom.xml
index 831e7ba53e..4ccba46be5 100644
--- a/java/sca/otest/current/ASM_6033/pom.xml
+++ b/java/sca/otest/current/ASM_6033/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_6033</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_6033</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_6033"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_7001/pom.xml b/java/sca/otest/current/ASM_7001/pom.xml
index b40c20bd1f..de177ba171 100644
--- a/java/sca/otest/current/ASM_7001/pom.xml
+++ b/java/sca/otest/current/ASM_7001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_7001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_7001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_7001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_7007/pom.xml b/java/sca/otest/current/ASM_7007/pom.xml
index e678ba4d4b..0dbe79ea74 100644
--- a/java/sca/otest/current/ASM_7007/pom.xml
+++ b/java/sca/otest/current/ASM_7007/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_7007</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_7007</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_7007"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_7008/pom.xml b/java/sca/otest/current/ASM_7008/pom.xml
index 34edf7fcf1..951d37fb2d 100644
--- a/java/sca/otest/current/ASM_7008/pom.xml
+++ b/java/sca/otest/current/ASM_7008/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_7008</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_7008</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_7008"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_7009/pom.xml b/java/sca/otest/current/ASM_7009/pom.xml
index 032c6e8290..876be3db70 100644
--- a/java/sca/otest/current/ASM_7009/pom.xml
+++ b/java/sca/otest/current/ASM_7009/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_7009</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_7009</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_7009"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_7010/pom.xml b/java/sca/otest/current/ASM_7010/pom.xml
index 82d04f6721..67978b4d15 100644
--- a/java/sca/otest/current/ASM_7010/pom.xml
+++ b/java/sca/otest/current/ASM_7010/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_7010</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_7010</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_7010"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8001/pom.xml b/java/sca/otest/current/ASM_8001/pom.xml
index 6725c038fc..444428a709 100644
--- a/java/sca/otest/current/ASM_8001/pom.xml
+++ b/java/sca/otest/current/ASM_8001/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8001</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8001</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8001"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8001_Java/pom.xml b/java/sca/otest/current/ASM_8001_Java/pom.xml
index 959f37c637..4b9bdfea7d 100644
--- a/java/sca/otest/current/ASM_8001_Java/pom.xml
+++ b/java/sca/otest/current/ASM_8001_Java/pom.xml
@@ -37,11 +37,6 @@
 
     <build>
        <finalName>${artifactId}</finalName>
-        <resources>
-          <resource>
-            <directory>src/main/java</directory>
-          </resource>
-        </resources>
        <plugins>
            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -66,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8001_Java"/>
-                                <property name="to.dir" value="src/main/java"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8003/pom.xml b/java/sca/otest/current/ASM_8003/pom.xml
index abb6f33d5f..3f00031645 100644
--- a/java/sca/otest/current/ASM_8003/pom.xml
+++ b/java/sca/otest/current/ASM_8003/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8003</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8003</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8003"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8004/pom.xml b/java/sca/otest/current/ASM_8004/pom.xml
index ce3b6b7141..014829da5d 100644
--- a/java/sca/otest/current/ASM_8004/pom.xml
+++ b/java/sca/otest/current/ASM_8004/pom.xml
@@ -30,18 +30,21 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-otests-asm-ASM_8005</artifactId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-ASM_8005</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    
     <build>
        <finalName>${artifactId}</finalName>
-        <resources>
-          <resource>
-            <directory>src/main/java</directory>
-          </resource>
-        </resources>
        <plugins>
            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -66,9 +69,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8004"/>
-                                <property name="to.dir" value="src/main/java"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8005/pom.xml b/java/sca/otest/current/ASM_8005/pom.xml
index a9083984a8..63551f9dd1 100644
--- a/java/sca/otest/current/ASM_8005/pom.xml
+++ b/java/sca/otest/current/ASM_8005/pom.xml
@@ -37,11 +37,6 @@
 
     <build>
        <finalName>${artifactId}</finalName>
-        <resources>
-          <resource>
-            <directory>src/main/java</directory>
-          </resource>
-        </resources>
        <plugins>
            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -66,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8005"/>
-                                <property name="to.dir" value="src/main/java"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8010/pom.xml b/java/sca/otest/current/ASM_8010/pom.xml
index ad36f56fec..59146c2ea0 100644
--- a/java/sca/otest/current/ASM_8010/pom.xml
+++ b/java/sca/otest/current/ASM_8010/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8010</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8010</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8010"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8011/pom.xml b/java/sca/otest/current/ASM_8011/pom.xml
index 58357a87d0..35e0f19c81 100644
--- a/java/sca/otest/current/ASM_8011/pom.xml
+++ b/java/sca/otest/current/ASM_8011/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8011</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8011</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8011"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8012/pom.xml b/java/sca/otest/current/ASM_8012/pom.xml
index 75a82b8a23..aea8dbedfe 100644
--- a/java/sca/otest/current/ASM_8012/pom.xml
+++ b/java/sca/otest/current/ASM_8012/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8012</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8012</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8012"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8017/pom.xml b/java/sca/otest/current/ASM_8017/pom.xml
index f778e4a00f..a675fe523e 100644
--- a/java/sca/otest/current/ASM_8017/pom.xml
+++ b/java/sca/otest/current/ASM_8017/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8017</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8017</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8017"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_8019/pom.xml b/java/sca/otest/current/ASM_8019/pom.xml
index 01ddc4de63..edd08983db 100644
--- a/java/sca/otest/current/ASM_8019/pom.xml
+++ b/java/sca/otest/current/ASM_8019/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_8019</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_8019</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_8019"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/ASM_9002/pom.xml b/java/sca/otest/current/ASM_9002/pom.xml
index dd6cab69d1..101982a17d 100644
--- a/java/sca/otest/current/ASM_9002/pom.xml
+++ b/java/sca/otest/current/ASM_9002/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-ASM_9002</artifactId>
     <name>Apache Tuscany SCA Specification Tests ASM_9002</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/ASM_9002"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/Contribution1/pom.xml b/java/sca/otest/current/Contribution1/pom.xml
index dfd0a2a012..103028b32e 100644
--- a/java/sca/otest/current/Contribution1/pom.xml
+++ b/java/sca/otest/current/Contribution1/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-Contribution1</artifactId>
     <name>Apache Tuscany SCA Specification Tests Contribution1</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/Contribution1"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/Contribution2/pom.xml b/java/sca/otest/current/Contribution2/pom.xml
index 8779ba18d8..e106a56356 100644
--- a/java/sca/otest/current/Contribution2/pom.xml
+++ b/java/sca/otest/current/Contribution2/pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-Contribution2</artifactId>
     <name>Apache Tuscany SCA Specification Tests Contribution2</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/Contribution2"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/General/pom.xml b/java/sca/otest/current/General/pom.xml
index b3ac1ff1b9..4f462c3f12 100644
--- a/java/sca/otest/current/General/pom.xml
+++ b/java/sca/otest/current/General/pom.xml
@@ -53,9 +53,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/General"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/java/sca/otest/current/General_Java/pom.xml b/java/sca/otest/current/General_Java/pom.xml
index 2c5743514f..95481927a2 100644
--- a/java/sca/otest/current/General_Java/pom.xml
+++ b/java/sca/otest/current/General_Java/pom.xml
@@ -25,14 +25,55 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-otests-asm-General_Java</artifactId>
-    <name>Apache Tuscany SCA Specification Tests ASM General_Java</name> 
+    <name>Apache Tuscany SCA Specification Tests General_Java</name> 
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
-        <resources>
-          <resource>
-            <directory>src/main/java</directory>
-          </resource>
-        </resources>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>copy-files-from-svn</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="from.dir" value="../src/main/resources/General_Java"/>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
+        </plugins>
     </build>
 </project>
-- 
cgit v1.2.3