82 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
index 1e2a0fbb4d..1e2a0fbb4d 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml
index a172e856a3..a172e856a3 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
index 69c3fb5ac9..69c3fb5ac9 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index ede059f1e3..ede059f1e3 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index 26237c105c..26237c105c 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index d705564334..d705564334 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 8608a99897..8608a99897 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
index aacf93e66a..aacf93e66a 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/pom.xml
index bf47329744..bf47329744 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
index a672d2920d..a672d2920d 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
index b5be2573dd..b5be2573dd 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml
index 48b0ea2c9f..48b0ea2c9f 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
index c17535e802..c17535e802 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index e2667701b0..e2667701b0 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
index 48b62dbb6f..48b62dbb6f 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
index 4b25553893..4b25553893 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 8608a99897..8608a99897 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
index af2ed294f9..af2ed294f9 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/pom.xml
index 47429e918f..47429e918f 100644
--- a/branches/sca-java-2.0-M4/archetypes/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/pom.xml
index e24c287ed4..e24c287ed4 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
index 47c2f5dc10..47c2f5dc10 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
index c466a1b3f5..c466a1b3f5 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index ae7de51a2d..ae7de51a2d 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index a99cc7b032..a99cc7b032 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
index 53e77c5be0..53e77c5be0 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index aa73578a36..aa73578a36 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 922d275b17..922d275b17 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 7aeaf81b33..7aeaf81b33 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/pom.xml
index d1e7fc2eba..d1e7fc2eba 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index 04618b4fbf..04618b4fbf 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
index e38c84feda..e38c84feda 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
index d6cb7bbcf2..d6cb7bbcf2 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
index ec9bfd7221..ec9bfd7221 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
index 3b732de8af..3b732de8af 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 847625fcf4..847625fcf4 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 48b73fe68a..48b73fe68a 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
index 4a3197ec4f..4a3197ec4f 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
index 768aa2408b..768aa2408b 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
index 1c096f66c6..1c096f66c6 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/pom.xml
index 70538b8fb3..70538b8fb3 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 450e33afd5..450e33afd5 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
index 1bf4353502..1bf4353502 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index dee32669ee..dee32669ee 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index 2491816adc..2491816adc 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index 3527edcd6f..3527edcd6f 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 7ccd63ce5d..7ccd63ce5d 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 25d8d8184d..25d8d8184d 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 9729ca6823..9729ca6823 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
index ae84237c4a..ae84237c4a 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/pom.xml
index 20489472c7..20489472c7 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index 7b2dc15ada..7b2dc15ada 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
index d6cb7bbcf2..d6cb7bbcf2 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
index 390b424d24..390b424d24 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
index 5bfa1c5d32..5bfa1c5d32 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
index 05fd743841..05fd743841 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
index 6567f21ce1..6567f21ce1 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
index e2fd1997c8..e2fd1997c8 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
index 59cdacfe23..59cdacfe23 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
index 0964d2fb7b..0964d2fb7b 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index 6452b1bd9c..6452b1bd9c 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 40896b1473..40896b1473 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index d73e7311d6..d73e7311d6 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
index a350f1e68a..a350f1e68a 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/pom.xml
index f198e0d52d..f198e0d52d 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index c132fa0364..c132fa0364 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
index 7794570626..7794570626 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 238b410198..238b410198 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index df80303778..df80303778 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index 47501efb9a..47501efb9a 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index a90973d6f7..a90973d6f7 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index a7c7d2251e..a7c7d2251e 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 9729ca6823..9729ca6823 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp