Moving 1.x trunk

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

115 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
index 74687aedbf..74687aedbf 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
index 3b1555f567..3b1555f567 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
index 32aa604cba..32aa604cba 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
index b131d375b0..b131d375b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
index 57054b4a5d..57054b4a5d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
index e7ea217b2a..e7ea217b2a 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
index 73d816311f..73d816311f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
index 19879d9c42..19879d9c42 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
index a6701d36cb..a6701d36cb 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
index 13a375bc0b..13a375bc0b 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
index bc8fb5366d..bc8fb5366d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
index 1bf1c63799..1bf1c63799 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
index ad9003dc67..ad9003dc67 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
index bcaa154913..bcaa154913 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
index 9a97cbd535..9a97cbd535 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/pom.xml
index 44a0b85dc2..44a0b85dc2 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
index b5224a2319..b5224a2319 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
index e5e9fe6a82..e5e9fe6a82 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
index a6d7f2dd04..a6d7f2dd04 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
index db36c4b140..db36c4b140 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
index 29690543e8..29690543e8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
index 4df5cd37de..4df5cd37de 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
index 41ecddb62e..41ecddb62e 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
index 403ead623c..403ead623c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
index 97242bff96..97242bff96 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
index 7428735903..7428735903 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/pom.xml
index f32ff8f6ab..f32ff8f6ab 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
index 5a08769550..5a08769550 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
index 265af5b3a0..265af5b3a0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
index 81793e47e6..81793e47e6 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/pom.xml
index a1a80f047c..a1a80f047c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/pom.xml
index 15eaa7f3f3..15eaa7f3f3 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
index 43870422c0..43870422c0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
index 73d816311f..73d816311f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
index 1f4d7195c0..1f4d7195c0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
index b284b201e4..b284b201e4 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
index 1947a53cf0..1947a53cf0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
index bba288b4aa..bba288b4aa 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
index 7852f46dd3..7852f46dd3 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
index e9346fb2bb..e9346fb2bb 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
index 306b27fd5c..306b27fd5c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
index 8f8d46ccd7..8f8d46ccd7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
index d13e11262c..d13e11262c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
index 79c9dd3243..79c9dd3243 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
index 258e7c73d1..258e7c73d1 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
index 5fa7cda269..5fa7cda269 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
index 417a97c087..417a97c087 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
index 909b8a1484..909b8a1484 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
index 5965b2aaa8..5965b2aaa8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
index eaa567595e..eaa567595e 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
index 4129a0702b..4129a0702b 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
index ae8613f8db..ae8613f8db 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
index 823085e81f..823085e81f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/pom.xml
index 26f996bd6a..26f996bd6a 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
index 71055bbdfe..71055bbdfe 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee/pom.xml
index 05076abb79..05076abb79 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
index e7e1d90797..e7e1d90797 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
index 4660fee7fd..4660fee7fd 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
index 1c4bd34352..1c4bd34352 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index a39171507c..a39171507c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index adc93d9015..adc93d9015 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
index b81f67c287..b81f67c287 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
index 4241b7928f..4241b7928f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
index 64c31b4393..64c31b4393 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
index 9f50ea573c..9f50ea573c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
index 97e23d1bf7..97e23d1bf7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
index fd556493bc..fd556493bc 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
index db4d9e5bf6..db4d9e5bf6 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
index 211f51c9bd..211f51c9bd 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
index 7696b64f9c..7696b64f9c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
index f54a4f98df..f54a4f98df 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
index 11d2a029ec..11d2a029ec 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
index a5b160c875..a5b160c875 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
index 9fb1ed9d14..9fb1ed9d14 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
index 3a704137ed..3a704137ed 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
index 228f4d27d7..228f4d27d7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
index 0b75db2745..0b75db2745 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
index 938ea75941..938ea75941 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
index 24f55a5f63..24f55a5f63 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app.ear
index c912e64237..c912e64237 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app.ear