more pom fixes for global substitution error

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

67 files changed, 201 insertions, 201 deletions

diff --git a/java/sca/otest/current/ASM_10001/pom.xml b/java/sca/otest/current/ASM_10001/pom.xml
index 2b3a624056..1979181d21 100644
--- a/java/sca/otest/current/ASM_10001/pom.xml
+++ b/java/sca/otest/current/ASM_10001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_10001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_10001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_10001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_10001</directory>
+            <directory>../src/main/resources/ASM_10001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_10001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_10001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_10003/pom.xml b/java/sca/otest/current/ASM_10003/pom.xml
index e3b8071b6f..c0031f4cfd 100644
--- a/java/sca/otest/current/ASM_10003/pom.xml
+++ b/java/sca/otest/current/ASM_10003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_10003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_10003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_10003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_10003</directory>
+            <directory>../src/main/resources/ASM_10003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_10003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_10003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12001/pom.xml b/java/sca/otest/current/ASM_12001/pom.xml
index a405d66259..7ce7ba6803 100644
--- a/java/sca/otest/current/ASM_12001/pom.xml
+++ b/java/sca/otest/current/ASM_12001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12001</directory>
+            <directory>../src/main/resources/ASM_12001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12002/pom.xml b/java/sca/otest/current/ASM_12002/pom.xml
index 9d1fe2c349..dcc471d65f 100644
--- a/java/sca/otest/current/ASM_12002/pom.xml
+++ b/java/sca/otest/current/ASM_12002/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12002</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12002</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12002</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12002</directory>
+            <directory>../src/main/resources/ASM_12002</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12002</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12002</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12003/pom.xml b/java/sca/otest/current/ASM_12003/pom.xml
index c009c9fa0a..4b3c095641 100644
--- a/java/sca/otest/current/ASM_12003/pom.xml
+++ b/java/sca/otest/current/ASM_12003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12003</directory>
+            <directory>../src/main/resources/ASM_12003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12005/pom.xml b/java/sca/otest/current/ASM_12005/pom.xml
index 81859e2902..38cb3f9c16 100644
--- a/java/sca/otest/current/ASM_12005/pom.xml
+++ b/java/sca/otest/current/ASM_12005/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12005</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12005</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12005</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12005</directory>
+            <directory>../src/main/resources/ASM_12005</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12005</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12005</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12007/pom.xml b/java/sca/otest/current/ASM_12007/pom.xml
index 45eefbaa30..c2f84f9d2e 100644
--- a/java/sca/otest/current/ASM_12007/pom.xml
+++ b/java/sca/otest/current/ASM_12007/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12007</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12007</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12007</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12007</directory>
+            <directory>../src/main/resources/ASM_12007</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12007</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12007</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12008/pom.xml b/java/sca/otest/current/ASM_12008/pom.xml
index 2099cc226d..4256f203db 100644
--- a/java/sca/otest/current/ASM_12008/pom.xml
+++ b/java/sca/otest/current/ASM_12008/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12008</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12008</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12008</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12008</directory>
+            <directory>../src/main/resources/ASM_12008</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12008</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12008</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12009/pom.xml b/java/sca/otest/current/ASM_12009/pom.xml
index 10dd5f0877..7b96a5ec9a 100644
--- a/java/sca/otest/current/ASM_12009/pom.xml
+++ b/java/sca/otest/current/ASM_12009/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12009</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12009</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12009</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12009</directory>
+            <directory>../src/main/resources/ASM_12009</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12009</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12009</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12010/pom.xml b/java/sca/otest/current/ASM_12010/pom.xml
index 6ed5182098..9e2d9585d0 100644
--- a/java/sca/otest/current/ASM_12010/pom.xml
+++ b/java/sca/otest/current/ASM_12010/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12010</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12010</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12010</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12010</directory>
+            <directory>../src/main/resources/ASM_12010</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12010</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12010</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12012/pom.xml b/java/sca/otest/current/ASM_12012/pom.xml
index 7fc112bfb4..923f3bbf2b 100644
--- a/java/sca/otest/current/ASM_12012/pom.xml
+++ b/java/sca/otest/current/ASM_12012/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12012</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12012</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12012</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12012</directory>
+            <directory>../src/main/resources/ASM_12012</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12012</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12012</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_12013/pom.xml b/java/sca/otest/current/ASM_12013/pom.xml
index a6624b0598..3d98354656 100644
--- a/java/sca/otest/current/ASM_12013/pom.xml
+++ b/java/sca/otest/current/ASM_12013/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_12013</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_12013</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_12013</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_12013</directory>
+            <directory>../src/main/resources/ASM_12013</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_12013</outputDirectory>
+        <outputDirectory>../tests/target/ASM_12013</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13001/pom.xml b/java/sca/otest/current/ASM_13001/pom.xml
index d23d4a1a5c..0f58d92832 100644
--- a/java/sca/otest/current/ASM_13001/pom.xml
+++ b/java/sca/otest/current/ASM_13001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13001</directory>
+            <directory>../src/main/resources/ASM_13001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13002/pom.xml b/java/sca/otest/current/ASM_13002/pom.xml
index c53af05ccf..179b880572 100644
--- a/java/sca/otest/current/ASM_13002/pom.xml
+++ b/java/sca/otest/current/ASM_13002/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13002</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13002</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13002</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13002</directory>
+            <directory>../src/main/resources/ASM_13002</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13002</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13002</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13003/pom.xml b/java/sca/otest/current/ASM_13003/pom.xml
index 996dcf86a2..a0443d0f1a 100644
--- a/java/sca/otest/current/ASM_13003/pom.xml
+++ b/java/sca/otest/current/ASM_13003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13003</directory>
+            <directory>../src/main/resources/ASM_13003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13004/pom.xml b/java/sca/otest/current/ASM_13004/pom.xml
index 0db544f1d8..76ad707b7c 100644
--- a/java/sca/otest/current/ASM_13004/pom.xml
+++ b/java/sca/otest/current/ASM_13004/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13004</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13004</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13004</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13004</directory>
+            <directory>../src/main/resources/ASM_13004</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13004</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13004</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13005/pom.xml b/java/sca/otest/current/ASM_13005/pom.xml
index 5e9bd6b905..aa66470869 100644
--- a/java/sca/otest/current/ASM_13005/pom.xml
+++ b/java/sca/otest/current/ASM_13005/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13005</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13005</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13005</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13005</directory>
+            <directory>../src/main/resources/ASM_13005</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13005</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13005</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13006/pom.xml b/java/sca/otest/current/ASM_13006/pom.xml
index 2a94b7f5de..a5dfc3e69d 100644
--- a/java/sca/otest/current/ASM_13006/pom.xml
+++ b/java/sca/otest/current/ASM_13006/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13006</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13006</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13006</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13006</directory>
+            <directory>../src/main/resources/ASM_13006</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13006</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13006</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13007/pom.xml b/java/sca/otest/current/ASM_13007/pom.xml
index f4014c5dd5..4383884e1f 100644
--- a/java/sca/otest/current/ASM_13007/pom.xml
+++ b/java/sca/otest/current/ASM_13007/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13007</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13007</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13007</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13007</directory>
+            <directory>../src/main/resources/ASM_13007</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13007</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13007</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_13008/pom.xml b/java/sca/otest/current/ASM_13008/pom.xml
index 728a240277..0956172d00 100644
--- a/java/sca/otest/current/ASM_13008/pom.xml
+++ b/java/sca/otest/current/ASM_13008/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_13008</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_13008</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_13008</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_13008</directory>
+            <directory>../src/main/resources/ASM_13008</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_13008</outputDirectory>
+        <outputDirectory>../tests/target/ASM_13008</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_4002/pom.xml b/java/sca/otest/current/ASM_4002/pom.xml
index 2747835df9..d8dbbce575 100644
--- a/java/sca/otest/current/ASM_4002/pom.xml
+++ b/java/sca/otest/current/ASM_4002/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_4002</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_4002</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_4002</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_4002</directory>
+            <directory>../src/main/resources/ASM_4002</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_4002</outputDirectory>
+        <outputDirectory>../tests/target/ASM_4002</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_4003/pom.xml b/java/sca/otest/current/ASM_4003/pom.xml
index f1f0bbe4bc..f6af15da93 100644
--- a/java/sca/otest/current/ASM_4003/pom.xml
+++ b/java/sca/otest/current/ASM_4003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_4003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_4003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_4003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_4003</directory>
+            <directory>../src/main/resources/ASM_4003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_4003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_4003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_4004/pom.xml b/java/sca/otest/current/ASM_4004/pom.xml
index 319fb117f8..e98cd1293b 100644
--- a/java/sca/otest/current/ASM_4004/pom.xml
+++ b/java/sca/otest/current/ASM_4004/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_4004</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_4004</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_4004</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_4004</directory>
+            <directory>../src/main/resources/ASM_4004</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_4004</outputDirectory>
+        <outputDirectory>../tests/target/ASM_4004</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_4007/pom.xml b/java/sca/otest/current/ASM_4007/pom.xml
index 36c99d3495..d37edeb75f 100644
--- a/java/sca/otest/current/ASM_4007/pom.xml
+++ b/java/sca/otest/current/ASM_4007/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_4007</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_4007</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_4007</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_4007</directory>
+            <directory>../src/main/resources/ASM_4007</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_4007</outputDirectory>
+        <outputDirectory>../tests/target/ASM_4007</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5004/pom.xml b/java/sca/otest/current/ASM_5004/pom.xml
index 3710d802a2..63773a9f77 100644
--- a/java/sca/otest/current/ASM_5004/pom.xml
+++ b/java/sca/otest/current/ASM_5004/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5004</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5004</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5004</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5004</directory>
+            <directory>../src/main/resources/ASM_5004</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5004</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5004</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5005/pom.xml b/java/sca/otest/current/ASM_5005/pom.xml
index 8d3d423ce3..2a784cc93e 100644
--- a/java/sca/otest/current/ASM_5005/pom.xml
+++ b/java/sca/otest/current/ASM_5005/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5005</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5005</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5005</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5005</directory>
+            <directory>../src/main/resources/ASM_5005</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5005</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5005</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5007/pom.xml b/java/sca/otest/current/ASM_5007/pom.xml
index 64a3eda408..c8a3e5f7ea 100644
--- a/java/sca/otest/current/ASM_5007/pom.xml
+++ b/java/sca/otest/current/ASM_5007/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5007</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5007</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5007</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5007</directory>
+            <directory>../src/main/resources/ASM_5007</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5007</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5007</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5009/pom.xml b/java/sca/otest/current/ASM_5009/pom.xml
index 4b2b2bacef..269f8022df 100644
--- a/java/sca/otest/current/ASM_5009/pom.xml
+++ b/java/sca/otest/current/ASM_5009/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5009</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5009</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5009</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5009</directory>
+            <directory>../src/main/resources/ASM_5009</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5009</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5009</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5023/pom.xml b/java/sca/otest/current/ASM_5023/pom.xml
index b7a35ae18e..0e4b7fec2e 100644
--- a/java/sca/otest/current/ASM_5023/pom.xml
+++ b/java/sca/otest/current/ASM_5023/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5023</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5023</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5023</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5023</directory>
+            <directory>../src/main/resources/ASM_5023</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5023</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5023</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5024/pom.xml b/java/sca/otest/current/ASM_5024/pom.xml
index 7adbc38c2d..a756e6160e 100644
--- a/java/sca/otest/current/ASM_5024/pom.xml
+++ b/java/sca/otest/current/ASM_5024/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5024</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5024</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5024</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5024</directory>
+            <directory>../src/main/resources/ASM_5024</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5024</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5024</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5027/pom.xml b/java/sca/otest/current/ASM_5027/pom.xml
index 2f43bfd6bd..5e64f0011f 100644
--- a/java/sca/otest/current/ASM_5027/pom.xml
+++ b/java/sca/otest/current/ASM_5027/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5027</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5027</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5027</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5027</directory>
+            <directory>../src/main/resources/ASM_5027</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5027</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5027</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5030/pom.xml b/java/sca/otest/current/ASM_5030/pom.xml
index 9507e50ff3..ff770cdd12 100644
--- a/java/sca/otest/current/ASM_5030/pom.xml
+++ b/java/sca/otest/current/ASM_5030/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5030</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5030</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5030</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5030</directory>
+            <directory>../src/main/resources/ASM_5030</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5030</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5030</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_5035/pom.xml b/java/sca/otest/current/ASM_5035/pom.xml
index 0aea43df07..16bcbe2c25 100644
--- a/java/sca/otest/current/ASM_5035/pom.xml
+++ b/java/sca/otest/current/ASM_5035/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_5035</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_5035</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_5035</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_5035</directory>
+            <directory>../src/main/resources/ASM_5035</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_5035</outputDirectory>
+        <outputDirectory>../tests/target/ASM_5035</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6001/pom.xml b/java/sca/otest/current/ASM_6001/pom.xml
index d06f5fe75c..e80657e1a3 100644
--- a/java/sca/otest/current/ASM_6001/pom.xml
+++ b/java/sca/otest/current/ASM_6001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6001</directory>
+            <directory>../src/main/resources/ASM_6001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6002/pom.xml b/java/sca/otest/current/ASM_6002/pom.xml
index c3da5a5c11..e23ca9f4e9 100644
--- a/java/sca/otest/current/ASM_6002/pom.xml
+++ b/java/sca/otest/current/ASM_6002/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6002</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6002</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6002</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6002</directory>
+            <directory>../src/main/resources/ASM_6002</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6002</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6002</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6003/pom.xml b/java/sca/otest/current/ASM_6003/pom.xml
index b0202da732..91d9ad19bc 100644
--- a/java/sca/otest/current/ASM_6003/pom.xml
+++ b/java/sca/otest/current/ASM_6003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6003</directory>
+            <directory>../src/main/resources/ASM_6003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6005/pom.xml b/java/sca/otest/current/ASM_6005/pom.xml
index 1cfc95efd9..68c7ed5070 100644
--- a/java/sca/otest/current/ASM_6005/pom.xml
+++ b/java/sca/otest/current/ASM_6005/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6005</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6005</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6005</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6005</directory>
+            <directory>../src/main/resources/ASM_6005</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6005</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6005</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6006/pom.xml b/java/sca/otest/current/ASM_6006/pom.xml
index 85b5f7867b..d4a2412b18 100644
--- a/java/sca/otest/current/ASM_6006/pom.xml
+++ b/java/sca/otest/current/ASM_6006/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6006</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6006</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6006</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6006</directory>
+            <directory>../src/main/resources/ASM_6006</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6006</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6006</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6008/pom.xml b/java/sca/otest/current/ASM_6008/pom.xml
index 64289f6cf0..a26a7eb614 100644
--- a/java/sca/otest/current/ASM_6008/pom.xml
+++ b/java/sca/otest/current/ASM_6008/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6008</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6008</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6008</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6008</directory>
+            <directory>../src/main/resources/ASM_6008</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6008</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6008</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6012/pom.xml b/java/sca/otest/current/ASM_6012/pom.xml
index 3dd2a6a5ba..3197a86630 100644
--- a/java/sca/otest/current/ASM_6012/pom.xml
+++ b/java/sca/otest/current/ASM_6012/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6012</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6012</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6012</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6012</directory>
+            <directory>../src/main/resources/ASM_6012</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6012</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6012</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6021/pom.xml b/java/sca/otest/current/ASM_6021/pom.xml
index 6d2df18bff..fbbfcf1fc1 100644
--- a/java/sca/otest/current/ASM_6021/pom.xml
+++ b/java/sca/otest/current/ASM_6021/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6021</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6021</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6021</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6021</directory>
+            <directory>../src/main/resources/ASM_6021</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6021</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6021</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6022/pom.xml b/java/sca/otest/current/ASM_6022/pom.xml
index 7c84e478bf..f469ba1895 100644
--- a/java/sca/otest/current/ASM_6022/pom.xml
+++ b/java/sca/otest/current/ASM_6022/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6022</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6022</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6022</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6022</directory>
+            <directory>../src/main/resources/ASM_6022</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6022</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6022</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6025/pom.xml b/java/sca/otest/current/ASM_6025/pom.xml
index 4df045ed6b..627e110800 100644
--- a/java/sca/otest/current/ASM_6025/pom.xml
+++ b/java/sca/otest/current/ASM_6025/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6025</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6025</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6025</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6025</directory>
+            <directory>../src/main/resources/ASM_6025</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6025</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6025</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6028/pom.xml b/java/sca/otest/current/ASM_6028/pom.xml
index fd8d869d02..44197683a4 100644
--- a/java/sca/otest/current/ASM_6028/pom.xml
+++ b/java/sca/otest/current/ASM_6028/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6028</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6028</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6028</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6028</directory>
+            <directory>../src/main/resources/ASM_6028</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6028</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6028</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6029/pom.xml b/java/sca/otest/current/ASM_6029/pom.xml
index 0373286bb5..30f01ee1ce 100644
--- a/java/sca/otest/current/ASM_6029/pom.xml
+++ b/java/sca/otest/current/ASM_6029/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6029</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6029</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6029</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6029</directory>
+            <directory>../src/main/resources/ASM_6029</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6029</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6029</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6031/pom.xml b/java/sca/otest/current/ASM_6031/pom.xml
index e453a25264..05dcf7b79a 100644
--- a/java/sca/otest/current/ASM_6031/pom.xml
+++ b/java/sca/otest/current/ASM_6031/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6031</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6031</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6031</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6031</directory>
+            <directory>../src/main/resources/ASM_6031</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6031</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6031</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6032/pom.xml b/java/sca/otest/current/ASM_6032/pom.xml
index 1fc323e67c..6e69dfe29a 100644
--- a/java/sca/otest/current/ASM_6032/pom.xml
+++ b/java/sca/otest/current/ASM_6032/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6032</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6032</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6032</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6032</directory>
+            <directory>../src/main/resources/ASM_6032</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6032</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6032</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_6033/pom.xml b/java/sca/otest/current/ASM_6033/pom.xml
index 2e92057a24..48d47075db 100644
--- a/java/sca/otest/current/ASM_6033/pom.xml
+++ b/java/sca/otest/current/ASM_6033/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_6033</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_6033</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_6033</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_6033</directory>
+            <directory>../src/main/resources/ASM_6033</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_6033</outputDirectory>
+        <outputDirectory>../tests/target/ASM_6033</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_7001/pom.xml b/java/sca/otest/current/ASM_7001/pom.xml
index ebdc2f08aa..c5bc8a6713 100644
--- a/java/sca/otest/current/ASM_7001/pom.xml
+++ b/java/sca/otest/current/ASM_7001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_7001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_7001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_7001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_7001</directory>
+            <directory>../src/main/resources/ASM_7001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_7001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_7001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_7007/pom.xml b/java/sca/otest/current/ASM_7007/pom.xml
index c51f6f4247..fc0dff6688 100644
--- a/java/sca/otest/current/ASM_7007/pom.xml
+++ b/java/sca/otest/current/ASM_7007/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_7007</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_7007</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_7007</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_7007</directory>
+            <directory>../src/main/resources/ASM_7007</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_7007</outputDirectory>
+        <outputDirectory>../tests/target/ASM_7007</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_7008/pom.xml b/java/sca/otest/current/ASM_7008/pom.xml
index 5618d0969f..fe021f9827 100644
--- a/java/sca/otest/current/ASM_7008/pom.xml
+++ b/java/sca/otest/current/ASM_7008/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_7008</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_7008</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_7008</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_7008</directory>
+            <directory>../src/main/resources/ASM_7008</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_7008</outputDirectory>
+        <outputDirectory>../tests/target/ASM_7008</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_7009/pom.xml b/java/sca/otest/current/ASM_7009/pom.xml
index 41f6f83ba0..b4530e27b5 100644
--- a/java/sca/otest/current/ASM_7009/pom.xml
+++ b/java/sca/otest/current/ASM_7009/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_7009</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_7009</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_7009</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_7009</directory>
+            <directory>../src/main/resources/ASM_7009</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_7009</outputDirectory>
+        <outputDirectory>../tests/target/ASM_7009</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_7010/pom.xml b/java/sca/otest/current/ASM_7010/pom.xml
index 1950bf6651..912d202a21 100644
--- a/java/sca/otest/current/ASM_7010/pom.xml
+++ b/java/sca/otest/current/ASM_7010/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_7010</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_7010</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_7010</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_7010</directory>
+            <directory>../src/main/resources/ASM_7010</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_7010</outputDirectory>
+        <outputDirectory>../tests/target/ASM_7010</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8001/pom.xml b/java/sca/otest/current/ASM_8001/pom.xml
index 666944d899..2391e51641 100644
--- a/java/sca/otest/current/ASM_8001/pom.xml
+++ b/java/sca/otest/current/ASM_8001/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8001</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8001</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8001</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8001</directory>
+            <directory>../src/main/resources/ASM_8001</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8001</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8001</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8001_Java/pom.xml b/java/sca/otest/current/ASM_8001_Java/pom.xml
index 0e485fb059..6c6fa0143f 100644
--- a/java/sca/otest/current/ASM_8001_Java/pom.xml
+++ b/java/sca/otest/current/ASM_8001_Java/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8001_Java</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8001_Java</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8001_Java</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8001_Java</directory>
+            <directory>../src/main/resources/ASM_8001_Java</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8001_Java</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8001_Java</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8003/pom.xml b/java/sca/otest/current/ASM_8003/pom.xml
index 2f3a956298..7bab1470d6 100644
--- a/java/sca/otest/current/ASM_8003/pom.xml
+++ b/java/sca/otest/current/ASM_8003/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8003</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8003</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8003</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8003</directory>
+            <directory>../src/main/resources/ASM_8003</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8003</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8003</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8004/pom.xml b/java/sca/otest/current/ASM_8004/pom.xml
index f1a81b4d6d..3405fe35f0 100644
--- a/java/sca/otest/current/ASM_8004/pom.xml
+++ b/java/sca/otest/current/ASM_8004/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8004</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8004</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8004</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8004</directory>
+            <directory>../src/main/resources/ASM_8004</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8004</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8004</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8005/pom.xml b/java/sca/otest/current/ASM_8005/pom.xml
index 829f2319e3..5158567f9a 100644
--- a/java/sca/otest/current/ASM_8005/pom.xml
+++ b/java/sca/otest/current/ASM_8005/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8005</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8005</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8005</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8005</directory>
+            <directory>../src/main/resources/ASM_8005</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8005</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8005</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8010/pom.xml b/java/sca/otest/current/ASM_8010/pom.xml
index 5ef3ff6bf0..8ef5ab3494 100644
--- a/java/sca/otest/current/ASM_8010/pom.xml
+++ b/java/sca/otest/current/ASM_8010/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8010</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8010</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8010</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8010</directory>
+            <directory>../src/main/resources/ASM_8010</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8010</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8010</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8011/pom.xml b/java/sca/otest/current/ASM_8011/pom.xml
index 8f130edf3f..78db5200d6 100644
--- a/java/sca/otest/current/ASM_8011/pom.xml
+++ b/java/sca/otest/current/ASM_8011/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8011</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8011</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8011</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8011</directory>
+            <directory>../src/main/resources/ASM_8011</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8011</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8011</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_8012/pom.xml b/java/sca/otest/current/ASM_8012/pom.xml
index 834573f477..2b1520abfd 100644
--- a/java/sca/otest/current/ASM_8012/pom.xml
+++ b/java/sca/otest/current/ASM_8012/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_8012</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_8012</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_8012</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_8012</directory>
+            <directory>../src/main/resources/ASM_8012</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_8012</outputDirectory>
+        <outputDirectory>../tests/target/ASM_8012</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/ASM_9002/pom.xml b/java/sca/otest/current/ASM_9002/pom.xml
index c79e6dcbe3..b315d42a75 100644
--- a/java/sca/otest/current/ASM_9002/pom.xml
+++ b/java/sca/otest/current/ASM_9002/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM ASM_9002</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_ASM_9002</sourceDirectory>
+        <sourceDirectory>../src/main/resources/ASM_9002</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_ASM_9002</directory>
+            <directory>../src/main/resources/ASM_9002</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_ASM_9002</outputDirectory>
+        <outputDirectory>../tests/target/ASM_9002</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/Contribution1/pom.xml b/java/sca/otest/current/Contribution1/pom.xml
index 30e9960276..62c1acb5d7 100644
--- a/java/sca/otest/current/Contribution1/pom.xml
+++ b/java/sca/otest/current/Contribution1/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM Contribution1</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_Contribution1</sourceDirectory>
+        <sourceDirectory>../src/main/resources/Contribution1</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_Contribution1</directory>
+            <directory>../src/main/resources/Contribution1</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_Contribution1</outputDirectory>
+        <outputDirectory>../tests/target/Contribution1</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/Contribution2/pom.xml b/java/sca/otest/current/Contribution2/pom.xml
index a60fac3a03..3d64908f13 100644
--- a/java/sca/otest/current/Contribution2/pom.xml
+++ b/java/sca/otest/current/Contribution2/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM Contribution2</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_Contribution2</sourceDirectory>
+        <sourceDirectory>../src/main/resources/Contribution2</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_Contribution2</directory>
+            <directory>../src/main/resources/Contribution2</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_Contribution2</outputDirectory>
+        <outputDirectory>../tests/target/Contribution2</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/General/pom.xml b/java/sca/otest/current/General/pom.xml
index 8afcfa617c..e96b5b647b 100644
--- a/java/sca/otest/current/General/pom.xml
+++ b/java/sca/otest/current/General/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM General</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_General</sourceDirectory>
+        <sourceDirectory>../src/main/resources/General</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_General</directory>
+            <directory>../src/main/resources/General</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_General</outputDirectory>
+        <outputDirectory>../tests/target/General</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/General_C/pom.xml b/java/sca/otest/current/General_C/pom.xml
index ec4d3955cc..c7d6e7864a 100644
--- a/java/sca/otest/current/General_C/pom.xml
+++ b/java/sca/otest/current/General_C/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM General_C</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_General_C</sourceDirectory>
+        <sourceDirectory>../src/main/resources/General_C</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_General_C</directory>
+            <directory>../src/main/resources/General_C</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_General_C</outputDirectory>
+        <outputDirectory>../tests/target/General_C</outputDirectory>
     </build>
 </project>
diff --git a/java/sca/otest/current/General_CPP/pom.xml b/java/sca/otest/current/General_CPP/pom.xml
index 8c28f29efd..ee026d3217 100644
--- a/java/sca/otest/current/General_CPP/pom.xml
+++ b/java/sca/otest/current/General_CPP/pom.xml
@@ -28,12 +28,12 @@
     <name>Apache Tuscany SCA Specification Tests ASM General_CPP</name> 
 
     <build>
-        <sourceDirectory>../src/main/resources/ASM_General_CPP</sourceDirectory>
+        <sourceDirectory>../src/main/resources/General_CPP</sourceDirectory>
         <resources>
           <resource>
-            <directory>../src/main/resources/ASM_General_CPP</directory>
+            <directory>../src/main/resources/General_CPP</directory>
           </resource>
         </resources>
-        <outputDirectory>../tests/target/ASM_General_CPP</outputDirectory>
+        <outputDirectory>../tests/target/General_CPP</outputDirectory>
     </build>
 </project>