Trimmed getting-started folder.

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

158 files changed, 109 insertions, 448 deletions

diff --git a/sandbox/samples/applications/pom.xml b/sandbox/samples/applications/pom.xml
deleted file mode 100644
index 5a3b069960..0000000000
--- a/sandbox/samples/applications/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-applications</artifactId>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany Sample Applications</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>store</module>
-                <module>store-webapp</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/getting-started/contributions/pom.xml b/sandbox/samples/getting-started/contributions/pom.xml
deleted file mode 100644
index f4ef307a0d..0000000000
--- a/sandbox/samples/getting-started/contributions/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-getting-started</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Getting Started Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>helloworld</module>
-                <module>helloworld-scaclient</module>    
-                <module>helloworld-bpel</module>
-                <module>helloworld-spring</module>   
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive/README b/sandbox/samples/getting-started/helloworld-contribution/README
index ed0f1d0ce4..ed0f1d0ce4 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive/README
+++ b/sandbox/samples/getting-started/helloworld-contribution/README
diff --git a/sandbox/samples/getting-started/contributions/helloworld/pom.xml b/sandbox/samples/getting-started/helloworld-contribution/pom.xml
index e510599a58..e510599a58 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/pom.xml
+++ b/sandbox/samples/getting-started/helloworld-contribution/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/main/java/sample/Helloworld.java b/sandbox/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/main/java/sample/Helloworld.java
+++ b/sandbox/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java
index 5bf6a94505..5bf6a94505 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/src/main/java/sample/HelloworldImpl.java
+++ b/sandbox/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml
index 696b1f9875..696b1f9875 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld/src/main/resources/helloworld.composite b/sandbox/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite
index 324395c246..324395c246 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/src/main/resources/helloworld.composite
+++ b/sandbox/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
+++ b/sandbox/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/README b/sandbox/samples/getting-started/helloworld-webapp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/README
+++ b/sandbox/samples/getting-started/helloworld-webapp/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld/pom.xml b/sandbox/samples/getting-started/helloworld-webapp/pom.xml
index 8d70ec23a7..8d70ec23a7 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/pom.xml
+++ b/sandbox/samples/getting-started/helloworld-webapp/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
index 85aed34b26..85aed34b26 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java b/sandbox/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java
index f1ccf0b1ba..f1ccf0b1ba 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java
+++ b/sandbox/samples/getting-started/helloworld-webapp/src/test/java/itest/Helloworld.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java b/sandbox/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java
index c1c2c6aae0..c1c2c6aae0 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
+++ b/sandbox/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml b/sandbox/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
index a68aa28698..a68aa28698 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml
+++ b/sandbox/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
diff --git a/sandbox/samples/getting-started/pom.xml b/sandbox/samples/getting-started/pom.xml
deleted file mode 100644
index 51afb53031..0000000000
--- a/sandbox/samples/getting-started/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-getting-started-contributions</artifactId>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Getting Started Sample Contributions</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>contributions</module>
-                <module>webapps</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/getting-started/webapps/pom.xml b/sandbox/samples/getting-started/webapps/pom.xml
deleted file mode 100644
index f715c8eb23..0000000000
--- a/sandbox/samples/getting-started/webapps/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-getting-started-webapps</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Getting Started Sample Web Applications</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>helloworld</module>
-                <module>helloworld-bpel</module>
-                <module>helloworld-jaxrs</module>
-                <module>helloworld-jms</module>
-                <module>helloworld-js-client</module>
-                <module>helloworld-jsf</module>
-                <module>helloworld-jsp</module>
-                <module>helloworld-servlet</module>
-                <module>helloworld-spring</module>
-                <module>helloworld-stripes</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/running-tuscany/pom.xml b/sandbox/samples/running-tuscany/pom.xml
deleted file mode 100644
index 67b6a29eb3..0000000000
--- a/sandbox/samples/running-tuscany/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-running-tuscany</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Running Tuscany Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-
-                <!-- don't need to process these as they just contain README files
-                <module>launcher-command-line</module>
-                <module>launcher-maven</module>
-                <module>launcher-webapp</module>
-                -->
-                <module>launcher-embedded-jse</module>
-                <module>launcher-embedded-osgi</module>
-                <module>launcher-embedded-osgi-base</module>
-                <module>launcher-shell</module>
-
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/README b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/README
index 533743ebf6..533743ebf6 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/README
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/README
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/build.xml b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/build.xml
index 008953e63b..008953e63b 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/build.xml
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/build.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/helloworld-bpel.png b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/helloworld-bpel.png
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.png
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/helloworld-bpel.svg b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/helloworld-bpel.svg
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.svg
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/pom.xml b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/pom.xml
index 3f4be82f71..3f4be82f71 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/java/helloworld/Hello.java b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4a56523adb..4a56523adb 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.bpel b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
index d58768adfa..d58768adfa 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.composite b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.composite
index 08350e8417..08350e8417 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.wsdl b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
index cf966264ef..cf966264ef 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
diff --git a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/log4j.properties b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/log4j.properties
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/README b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/README
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/pom.xml b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/pom.xml
index 1ca3770b74..1ca3770b74 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.bpel
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite
index 3d36adadeb..3d36adadeb 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/README b/sandbox/samples/sca-extensions/helloworld-jaxrs/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/README
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/pom.xml b/sandbox/samples/sca-extensions/helloworld-jaxrs/pom.xml
index f414d87837..f414d87837 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
index 42625b8a78..42625b8a78 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/application
index 8ce781d6c8..8ce781d6c8 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/application
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
index 7ff71519e9..7ff71519e9 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
index 3c5726a818..3c5726a818 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
index 50197cdfcb..50197cdfcb 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/README b/sandbox/samples/sca-extensions/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/README
+++ b/sandbox/samples/sca-extensions/helloworld-jms/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/pom.xml b/sandbox/samples/sca-extensions/helloworld-jms/pom.xml
index 326422ed7b..326422ed7b 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jms/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index c51985bc30..c51985bc30 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/README b/sandbox/samples/sca-extensions/helloworld-js-client/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/README
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/pom.xml b/sandbox/samples/sca-extensions/helloworld-js-client/pom.xml
index 388df0913e..388df0913e 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index d41a8535e2..d41a8535e2 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/pom.xml b/sandbox/samples/sca-extensions/helloworld-jsf/pom.xml
index 6f2b820e4c..6f2b820e4c 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/README b/sandbox/samples/sca-extensions/helloworld-jsp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/README
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/pom.xml b/sandbox/samples/sca-extensions/helloworld-jsp/pom.xml
index 05a3e23895..05a3e23895 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 665957b0eb..665957b0eb 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/README b/sandbox/samples/sca-extensions/helloworld-recursive-ws/README
index a21077ba58..a21077ba58 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/README
+++ b/sandbox/samples/sca-extensions/helloworld-recursive-ws/README
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/pom.xml b/sandbox/samples/sca-extensions/helloworld-recursive-ws/pom.xml
index 80432461e4..80432461e4 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-recursive-ws/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
index ffc35bb553..ffc35bb553 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite b/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
index 719754224d..719754224d 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
+++ b/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld/README b/sandbox/samples/sca-extensions/helloworld-recursive/README
index ed0f1d0ce4..ed0f1d0ce4 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/README
+++ b/sandbox/samples/sca-extensions/helloworld-recursive/README
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive/pom.xml b/sandbox/samples/sca-extensions/helloworld-recursive/pom.xml
index 4326970c33..4326970c33 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-recursive/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
index 15d9304d05..15d9304d05 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-recursive/src/main/resources/helloworld-recursive.composite b/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/helloworld-recursive.composite
index 1094fea85e..1094fea85e 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-recursive/src/main/resources/helloworld-recursive.composite
+++ b/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/helloworld-recursive.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-scaclient/pom.xml b/sandbox/samples/sca-extensions/helloworld-scaclient/pom.xml
index 4e7f057ca9..4e7f057ca9 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-scaclient/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-scaclient/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/Helloworld.java b/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/Helloworld.java
+++ b/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/Helloworld.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
index c2c9c4e44e..c2c9c4e44e 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
+++ b/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
index 13e08de692..13e08de692 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/test/java/README b/sandbox/samples/sca-extensions/helloworld-servlet/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/test/java/README
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/pom.xml b/sandbox/samples/sca-extensions/helloworld-servlet/pom.xml
index 45725aaf72..45725aaf72 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/hello.html b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index 61d722da1f..61d722da1f 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/pom.xml b/sandbox/samples/sca-extensions/helloworld-spring-contribution/pom.xml
index b8cb765c38..b8cb765c38 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/DateService.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateService.java
index 7c50d66a9c..7c50d66a9c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/DateService.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateService.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/DateServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
index 64bdd86f7c..64bdd86f7c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/DateServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld/src/main/java/sample/Helloworld.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/src/main/java/sample/Helloworld.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/HelloworldClientImpl.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
index a01aad9d88..ddcb1d9bc3 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/HelloworldClientImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
@@ -1,48 +1,48 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package sample;

-

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloworldClientImpl implements Helloworld {

-    private Helloworld helloworld;

-

-    // SCA reference

-    @Reference(required = false)

-    private DateService dateService;

-

-    public HelloworldClientImpl() {

-        System.out.println("HelloworldClientImpl()");

-    }

-

-    public String sayHello(String name) {

-        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");

-        if (dateService == null) {

-            return "Hello " + name;

-        }

-        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);

-    }

-

-    // Setter for spring injection

-    public void setHelloworld(Helloworld helloworld) {

-        System.out.println("Injected with " + helloworld);

-        this.helloworld = helloworld;

-    }

-

-}

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package sample;
+
+import org.oasisopen.sca.annotation.Reference;
+
+public class HelloworldClientImpl implements Helloworld {
+    private Helloworld helloworld;
+
+    // SCA reference
+    @Reference(required = false)
+    private DateService dateService;
+
+    public HelloworldClientImpl() {
+        System.out.println("HelloworldClientImpl()");
+    }
+
+    public String sayHello(String name) {
+        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
+        if (dateService == null) {
+            return "Hello " + name;
+        }
+        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
+    }
+
+    // Setter for spring injection
+    public void setHelloworld(Helloworld helloworld) {
+        System.out.println("Injected with " + helloworld);
+        this.helloworld = helloworld;
+    }
+
+}
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
index 125c333ddc..125c333ddc 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/java/sample/HelloworldImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
index 552d100638..552d100638 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld-client-context.xml b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
index 0e30cfa582..15e9647bb0 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld-client-context.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">

-        <property name="helloworld">

-            <ref bean="HelloworldBean"/>

-        </property>

-    </bean>

-    

-    <!-- 

-    <sca:reference name="dateService" type="sample.DateService"/>

-    -->

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
+        <property name="helloworld">
+            <ref bean="HelloworldBean"/>
+        </property>
+    </bean>
+    
+    <!-- 
+    <sca:reference name="dateService" type="sample.DateService"/>
+    -->
+
 </beans>
\ No newline at end of file
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld-context.xml b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
index 9ecd09974e..9ecd09974e 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld-context.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld.composite b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld.composite
index 6d356758ae..6d356758ae 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-spring/src/main/resources/helloworld.composite
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sandbox/samples/getting-started/contributions/helloworld/src/test/java/sample/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-spring/pom.xml b/sandbox/samples/sca-extensions/helloworld-spring-webapp/pom.xml
index 59f3a25696..59f3a25696 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-spring/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-webapp/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
index 49590e00a2..49590e00a2 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
index fa77f08ee2..fa77f08ee2 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml
index 0ad2ed49c1..ac5c134454 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-</web-app>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+</web-app>
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/pom.xml b/sandbox/samples/sca-extensions/helloworld-stripes/pom.xml
index 16259aba62..16259aba62 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/pom.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/index.html
diff --git a/sandbox/samples/getting-started/webapps/helloworld/README b/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/getting-started/webapps/helloworld/README
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/README
diff --git a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 7f4359fa43..7f4359fa43 100644
--- a/sandbox/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/README b/sandbox/samples/sca-extensions/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/README
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/README
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/build.xml b/sandbox/samples/sca-extensions/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/build.xml
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/build.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/helloworld-ws-sdo.png b/sandbox/samples/sca-extensions/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/maven-eclipse.xml b/sandbox/samples/sca-extensions/helloworld-ws-sdo/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/maven-eclipse.xml
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/maven-eclipse.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/pom.xml b/sandbox/samples/sca-extensions/helloworld-ws-sdo/pom.xml
index c5bf5ff186..c5bf5ff186 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/pom.xml
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/pom.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/logging.properties b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/test.xsd b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/test.xsd
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sandbox/samples/sca-extensions/pom.xml b/sandbox/samples/sca-extensions/pom.xml
deleted file mode 100644
index 1cbe7d100e..0000000000
--- a/sandbox/samples/sca-extensions/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-tuscany-features</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Tuscany Feature Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <!-- <module>logging-scribe</module> -->
-                <module>maven-osgi-junit</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/sca-features/pom.xml b/sandbox/samples/sca-features/pom.xml
deleted file mode 100644
index 8c74eece33..0000000000
--- a/sandbox/samples/sca-features/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-samples-sca-features</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Feature Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>binding-rmi</module>
-                <module>binding-sca</module>
-                <module>binding-ws</module>
-                <module>binding-comet</module>
-                <module>binding-jsonrpc</module>
-                <module>implementation-extension</module>
-                <module>implementation-java</module>
-                <module>implementation-script</module>
-                <module>distributed-osgi</module>
-                <module>sca-client</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>