Refactoring sandbox structure to accomodate 1.x versus 2.x stuff

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

209 files changed, 0 insertions, 0 deletions

diff --git a/sandbox/lresende/sca/demos/customer-map/DISCLAIMER b/sandbox/lresende/sca-1.x/demos/customer-map/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/sandbox/lresende/sca/demos/customer-map/DISCLAIMER
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/DISCLAIMER
diff --git a/sandbox/lresende/sca/demos/customer-map/LICENSE b/sandbox/lresende/sca-1.x/demos/customer-map/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sandbox/lresende/sca/demos/customer-map/LICENSE
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/LICENSE
diff --git a/sandbox/lresende/sca/demos/customer-map/NOTICE b/sandbox/lresende/sca-1.x/demos/customer-map/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/sandbox/lresende/sca/demos/customer-map/NOTICE
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/NOTICE
diff --git a/sandbox/lresende/sca/demos/customer-map/customer-maps.sql b/sandbox/lresende/sca-1.x/demos/customer-map/customer-maps.sql
index c57678c5d0..c57678c5d0 100644
--- a/sandbox/lresende/sca/demos/customer-map/customer-maps.sql
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/customer-maps.sql
diff --git a/sandbox/lresende/sca/demos/customer-map/pom.xml b/sandbox/lresende/sca-1.x/demos/customer-map/pom.xml
index 501cbfec3e..501cbfec3e 100644
--- a/sandbox/lresende/sca/demos/customer-map/pom.xml
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/pom.xml
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/java/customer/CustomerService.java b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/java/customer/CustomerService.java
index 5a99f0bc77..5a99f0bc77 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/java/customer/CustomerService.java
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/java/customer/CustomerService.java
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/java/launch/Launch.java b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/java/launch/Launch.java
index 2bbb40c6a5..2bbb40c6a5 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/java/launch/Launch.java
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/java/launch/Launch.java
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer-map.composite b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer-map.composite
index f7c979687d..f7c979687d 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer-map.composite
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer-map.composite
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.componentType b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.componentType
index bf56a3f4e9..bf56a3f4e9 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.componentType
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.componentType
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xml b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.xml
index 17d5da9cd6..17d5da9cd6 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xml
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.xml
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xsd b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.xsd
index f00d0ec56a..f00d0ec56a 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xsd
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/customer.xsd
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/db.lck b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/db.lck
index 6b9b2452e0..6b9b2452e0 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/db.lck
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/db.lck
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log.ctrl b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/log.ctrl
index 4238225f1f..4238225f1f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log.ctrl
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/log.ctrl
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/log1.dat
index e9eb981c16..e9eb981c16 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/log1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl
index 4238225f1f..4238225f1f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c10.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c10.dat
index 27e2ac866e..27e2ac866e 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c10.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c10.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c101.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c101.dat
index fc4340b2e7..fc4340b2e7 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c101.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c101.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c111.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c111.dat
index 750dffff3f..750dffff3f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c111.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c111.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c121.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c121.dat
index 0d0b53b30e..0d0b53b30e 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c121.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c121.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c130.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c130.dat
index 65f1689e47..65f1689e47 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c130.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c130.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c141.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c141.dat
index 5b509fb668..5b509fb668 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c141.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c141.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c150.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c150.dat
index d985c31be4..d985c31be4 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c150.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c150.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c161.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c161.dat
index d3af4852f2..d3af4852f2 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c161.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c161.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c171.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c171.dat
index 731d9e87fb..731d9e87fb 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c171.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c171.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c180.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c180.dat
index 82298723d7..82298723d7 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c180.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c180.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c191.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c191.dat
index b2d149a0f3..b2d149a0f3 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c191.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c191.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat
index 5001ad3d63..5001ad3d63 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat
index b3a539d635..b3a539d635 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c20.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c20.dat
index 2b9a6b96d4..2b9a6b96d4 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c20.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c20.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c200.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c200.dat
index cae919d022..cae919d022 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c200.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c200.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c211.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c211.dat
index c7e311b00e..c7e311b00e 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c211.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c211.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c221.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c221.dat
index 28e89367ce..28e89367ce 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c221.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c221.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c230.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c230.dat
index c8aca2ee6f..c8aca2ee6f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c230.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c230.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c241.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c241.dat
index 3478bc897d..3478bc897d 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c241.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c241.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c251.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c251.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c251.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c260.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c260.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c260.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c271.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c271.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c271.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c281.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c281.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c281.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c290.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c290.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c290.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c300.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c300.dat
index 35a164db8a..35a164db8a 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c300.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c300.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c31.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c31.dat
index 44f7fa784d..44f7fa784d 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c31.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c31.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c311.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c311.dat
index 85c095cadb..85c095cadb 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c311.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c311.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c41.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c41.dat
index 519f1a49be..519f1a49be 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c41.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c41.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c51.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c51.dat
index 452a28db9b..452a28db9b 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c51.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c51.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c60.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c60.dat
index 94c357868f..94c357868f 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c60.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c60.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c71.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c71.dat
index 9ca2ca97d1..9ca2ca97d1 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c71.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c71.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c81.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c81.dat
index 85bc9c8351..85bc9c8351 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c81.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c81.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c90.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c90.dat
index 14e77ef636..14e77ef636 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c90.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/c90.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat
index 624ae61a85..624ae61a85 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat
index 97e6f19260..97e6f19260 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat
index 5126021a83..5126021a83 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat
index 2e135b64ab..2e135b64ab 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat
index 076423c10a..076423c10a 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat
index bfae1c8b85..bfae1c8b85 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/service.properties b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/service.properties
index 997a33e4db..997a33e4db 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/service.properties
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/dastest/service.properties
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-atom.js b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/binding-atom.js
index aacf864f14..aacf864f14 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-atom.js
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/binding-atom.js
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-jsonrpc.js b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/binding-jsonrpc.js
index 7f4a092f71..7f4a092f71 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-jsonrpc.js
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/binding-jsonrpc.js
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index-plain.html b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/index-plain.html
index 0783c3facb..0783c3facb 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index-plain.html
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/index-plain.html
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index.html b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/index.html
index 53f637bed2..53f637bed2 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index.html
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/index.html
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/map.json b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/map.json
index a884141a3c..a884141a3c 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/map.json
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/main/resources/html/map.json
diff --git a/sandbox/lresende/sca/demos/customer-map/src/test/java/customer/CustomerServiceTestCase.java b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/java/customer/CustomerServiceTestCase.java
index 7d289fd62a..7d289fd62a 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/test/java/customer/CustomerServiceTestCase.java
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/java/customer/CustomerServiceTestCase.java
diff --git a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.componentType b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.componentType
index 0d1992d597..0d1992d597 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.componentType
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.componentType
diff --git a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.composite b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.composite
index 72a692e38b..72a692e38b 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.composite
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.composite
diff --git a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.xml b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.xml
index 7b17903540..7b17903540 100644
--- a/sandbox/lresende/sca/demos/customer-map/src/test/resources/customer.xml
+++ b/sandbox/lresende/sca-1.x/demos/customer-map/src/test/resources/customer.xml
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/DISCLAIMER b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/DISCLAIMER
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/DISCLAIMER
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/LICENSE b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/LICENSE
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/LICENSE
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/NOTICE b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/NOTICE
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/NOTICE
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/README b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/README
index ff6ee6a8f4..ff6ee6a8f4 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/README
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/README
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/company.sql b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/company.sql
index 4911f9e62f..4911f9e62f 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/company.sql
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/company.sql
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/pom.xml
index 7e56a256a2..7e56a256a2 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/pom.xml
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
index c1ed6b4e58..c1ed6b4e58 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
index a5812b26e4..a5812b26e4 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
index 8ea83e7bfb..8ea83e7bfb 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
index d6e8276f25..d6e8276f25 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
index c4b14a1a90..c4b14a1a90 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
index f5972142de..f5972142de 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
index 78de14cc1c..78de14cc1c 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
index 2fb35f83a1..2fb35f83a1 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
index 441ba666d7..441ba666d7 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
index 2a7d1abd70..2a7d1abd70 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
index 055ecd4a4d..055ecd4a4d 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
index 5a863a8ae7..5a863a8ae7 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
index e1e821113c..e1e821113c 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
index 8b74209d3e..8b74209d3e 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8c82832e01..8c82832e01 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
index 13067543c9..13067543c9 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index fb62ff853b..fb62ff853b 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/Company.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/Company.java
index 3ea6e65c0d..3ea6e65c0d 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/Company.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/Company.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/CompanyCollection.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/CompanyCollection.java
index b74f53aa8b..b74f53aa8b 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/CompanyCollection.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/CompanyCollection.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/CompanyCollectionImpl.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/CompanyCollectionImpl.java
index 385defeb0b..385defeb0b 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/company/CompanyCollectionImpl.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/company/CompanyCollectionImpl.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyCollectionTestCase.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyCollectionTestCase.java
index bc9fbb3543..bc9fbb3543 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyCollectionTestCase.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyCollectionTestCase.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyTestCase.java b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyTestCase.java
index 1c4d6fb254..1c4d6fb254 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyTestCase.java
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/java/org/apache/tuscany/sca/implementation/openjpa/CompanyTestCase.java
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/META-INF/orm.xml b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/META-INF/orm.xml
index 75e329964f..75e329964f 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/META-INF/orm.xml
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/META-INF/orm.xml
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/META-INF/persistence.xml b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/META-INF/persistence.xml
index 302fbfe845..302fbfe845 100644
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/META-INF/persistence.xml
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/META-INF/persistence.xml
diff --git a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/company.composite b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/company.composite
index fd164d2519..fd164d2519 100755
--- a/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/resources/company.composite
+++ b/sandbox/lresende/sca-1.x/modules/implementation-data-pojo/src/test/resources/company.composite
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/README b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/README
index 9f041f4ecb..9f041f4ecb 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/README
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/README
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/build.xml b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/build.xml
index 11b30c48d2..11b30c48d2 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/build.xml
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/build.xml
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/calculator-web.png b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/calculator-web.png
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/calculator-web.png
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/calculator-web.svg b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/calculator-web.svg
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/calculator-web.svg
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/pom.xml
index 0354a8265a..0354a8265a 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/pom.xml
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/beans/Calculator.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/beans/Calculator.java
index f8ca02f8db..f8ca02f8db 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/beans/Calculator.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/beans/Calculator.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/AddService.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/AddService.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/AddService.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/AddServiceImpl.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorClient.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorService.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/DivideService.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/DivideService.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/DivideService.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/DivideServiceImpl.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyService.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractService.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractService.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/resources/Calculator.composite b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/resources/Calculator.composite
index ac9d010b48..ac9d010b48 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/resources/Calculator.composite
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/resources/Calculator.composite
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/resources/wsdl/add.wsdl b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/resources/wsdl/add.wsdl
index ae1986c588..ae1986c588 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/resources/wsdl/add.wsdl
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/resources/wsdl/add.wsdl
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/faces-config.xml
index 4670164d90..4670164d90 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/web.xml
index 329e0a5bad..329e0a5bad 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/calc.jsp b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/calc.jsp
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/calc.jsp
diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/calc_jsf.jsp b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/calc_jsf.jsp
index 37985724d0..37985724d0 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/src/main/webapp/calc_jsf.jsp
+++ b/sandbox/lresende/sca-1.x/samples/calculator-jsf-webapp/src/main/webapp/calc_jsf.jsp
diff --git a/sandbox/lresende/sca/samples/expertise-atom/pom.xml b/sandbox/lresende/sca-1.x/samples/expertise-atom/pom.xml
index 54840dca7e..54840dca7e 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/pom.xml
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/Expert.java b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/Expert.java
index 5bc3325a18..5bc3325a18 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/Expert.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/Expert.java
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/AtomExpertiseLocator.java b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/AtomExpertiseLocator.java
index a2fde8f938..a2fde8f938 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/AtomExpertiseLocator.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/AtomExpertiseLocator.java
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/ExpertiseLocator.java b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/ExpertiseLocator.java
index 84683528cc..84683528cc 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/ExpertiseLocator.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/atom/ExpertiseLocator.java
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/launch/Launch.java b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
index eb82100092..eb82100092 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/META-INF/sca-contribution.xml
index c1e9be425c..c1e9be425c 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/atom.composite b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/atom.composite
index 75d04f1fe4..75d04f1fe4 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/atom.composite
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/atom.composite
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/atom.composite_diagram b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/atom.composite_diagram
index 50c1ccf578..50c1ccf578 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/atom.composite_diagram
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/atom.composite_diagram
diff --git a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/expertLocator.html b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/expertLocator.html
index 22579cb0ce..22579cb0ce 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/src/main/resources/expertLocator.html
+++ b/sandbox/lresende/sca-1.x/samples/expertise-atom/src/main/resources/expertLocator.html
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/pom.xml b/sandbox/lresende/sca-1.x/samples/expertise-restfull/pom.xml
index 8d5459be84..8d5459be84 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/pom.xml
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/Expert.java b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/Expert.java
index 61ac1c12b7..61ac1c12b7 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/Expert.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/Expert.java
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
index 306abd5465..306abd5465 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
index 1b90df36d2..1b90df36d2 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
index bf7b2ea03e..bf7b2ea03e 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
index ea3915ccb5..ea3915ccb5 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
index 96d2cc3c66..96d2cc3c66 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/rest.composite b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/rest.composite
index 50f19a7c79..50f19a7c79 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/rest.composite
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/rest.composite
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/rest.composite_diagram b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/rest.composite_diagram
index 05dae0d547..05dae0d547 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/src/main/resources/rest.composite_diagram
+++ b/sandbox/lresende/sca-1.x/samples/expertise-restfull/src/main/resources/rest.composite_diagram
diff --git a/sandbox/lresende/sca/samples/pom.xml b/sandbox/lresende/sca-1.x/samples/pom.xml
index e481abc47a..e481abc47a 100644
--- a/sandbox/lresende/sca/samples/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/pom.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/README b/sandbox/lresende/sca-1.x/samples/store-distributed/README
index d4797618ff..d4797618ff 100644
--- a/sandbox/lresende/sca/samples/store-distributed/README
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/README
diff --git a/sandbox/lresende/sca/samples/store-distributed/build.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/build.xml
index 652afc3570..652afc3570 100644
--- a/sandbox/lresende/sca/samples/store-distributed/build.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/build.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/cloud.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/cloud.composite
index 7bd13d5b6f..7bd13d5b6f 100644
--- a/sandbox/lresende/sca/samples/store-distributed/cloud.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/cloud.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/domain.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/domain.composite
index 6898c454af..6898c454af 100644
--- a/sandbox/lresende/sca/samples/store-distributed/domain.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/domain.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/pom.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/pom.xml
index bb24b6cedd..bb24b6cedd 100644
--- a/sandbox/lresende/sca/samples/store-distributed/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/pom.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchDomain.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchDomain.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
index 9016e515fb..9016e515fb 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
index 2b387aec82..2b387aec82 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
index fb138e484f..fb138e484f 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Cart.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Cart.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Cart.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Catalog.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Catalog.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/CurrencyConverter.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Item.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Item.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Item.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Total.java b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/java/services/Total.java
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/java/services/Total.java
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeA.composite
index f7bfd0fcb6..f7bfd0fcb6 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeB.composite
index 187c5caf1c..187c5caf1c 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeC.composite
index 96c2e02acb..96c2e02acb 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index f165ee0e29..f165ee0e29 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/content/store.js b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/content/store.js
index 7df50eef64..7df50eef64 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/content/store.js
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/content/store.js
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/store.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/store.composite
index 99d1fb5dd7..99d1fb5dd7 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeA/store.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 0f8e76ccd7..0f8e76ccd7 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/content/store.js b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/content/store.js
index c95a3b2f95..c95a3b2f95 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/content/store.js
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/content/store.js
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/store.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/store.composite
index b66b937546..b66b937546 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeB/store.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeB/store.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 15bab17c1a..15bab17c1a 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/index.js b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/index.js
index d42dc5512d..d42dc5512d 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/index.js
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/index.js
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/store.html b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/store.html
index 0e3ab370b3..0e3ab370b3 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/store.html
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/store.html
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/store.js b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/store.js
index 088a80a1d1..088a80a1d1 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/content/store.js
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/content/store.js
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/store.composite b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/store.composite
index aa603114a6..aa603114a6 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/store.composite
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
diff --git a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/uiservices/store.html b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/sandbox/lresende/sca/samples/store-distributed/src/main/resources/uiservices/store.html
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/src/main/resources/uiservices/store.html
diff --git a/sandbox/lresende/sca/samples/store-distributed/store.png b/sandbox/lresende/sca-1.x/samples/store-distributed/store.png
index da413edeee..da413edeee 100644
--- a/sandbox/lresende/sca/samples/store-distributed/store.png
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/store.png
diff --git a/sandbox/lresende/sca/samples/store-distributed/store.svg b/sandbox/lresende/sca-1.x/samples/store-distributed/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/sandbox/lresende/sca/samples/store-distributed/store.svg
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/store.svg
diff --git a/sandbox/lresende/sca/samples/store-distributed/workspace.xml b/sandbox/lresende/sca-1.x/samples/store-distributed/workspace.xml
index d6cb2bfc81..d6cb2bfc81 100644
--- a/sandbox/lresende/sca/samples/store-distributed/workspace.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-distributed/workspace.xml
diff --git a/sandbox/lresende/sca/samples/store-jsf/README b/sandbox/lresende/sca-1.x/samples/store-jsf/README
index 79ddb03568..79ddb03568 100644
--- a/sandbox/lresende/sca/samples/store-jsf/README
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/README
diff --git a/sandbox/lresende/sca/samples/store-jsf/pom.xml b/sandbox/lresende/sca-1.x/samples/store-jsf/pom.xml
index fe68a0e4b5..fe68a0e4b5 100644
--- a/sandbox/lresende/sca/samples/store-jsf/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/pom.xml
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/java/beans/Catalog.java b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/java/beans/Catalog.java
index 01e4a0d481..01e4a0d481 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/java/beans/Catalog.java
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/java/beans/Catalog.java
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/java/beans/Product.java b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/java/beans/Product.java
index 9f3df2f95c..9f3df2f95c 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/java/beans/Product.java
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/java/beans/Product.java
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 1dd376a58f..1dd376a58f 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.1.jar b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.1.jar
index 347b0d2066..347b0d2066 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.1.jar
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.1.jar
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/web.xml
index a39a51eefc..a39a51eefc 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/catalog.jsp b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/catalog.jsp
index d456bedcc0..d456bedcc0 100644
--- a/sandbox/lresende/sca/samples/store-jsf/src/main/webapp/catalog.jsp
+++ b/sandbox/lresende/sca-1.x/samples/store-jsf/src/main/webapp/catalog.jsp
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/build-dojo.xml
index 6167eba10e..6167eba10e 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/build-dojo.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/build.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/build.xml
index fce9338312..fce9338312 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/build.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/build.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/pom.xml
index b95dda30fd..b95dda30fd 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/pom.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Catalog.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/Catalog.java
index 0d8d3d561a..0d8d3d561a 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Catalog.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/Catalog.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java
index 15b2c6e3a6..15b2c6e3a6 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java
index 2bf9d8d42b..2bf9d8d42b 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java
index 4cac4ac21d..4cac4ac21d 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Item.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/Item.java
index e8bcfabfb1..e8bcfabfb1 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Item.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/services/Item.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java
index 88e3a778a0..88e3a778a0 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/definitions.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/resources/definitions.xml
index 55789c8443..55789c8443 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/definitions.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/resources/definitions.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/store.composite b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/resources/store.composite
index 5c567cbd15..5c567cbd15 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/store.composite
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/resources/store.composite
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 41c84c9a44..41c84c9a44 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 705010bf7c..705010bf7c 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
index 704c7631b0..704c7631b0 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logon.html b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/auth/logon.html
index 09191f7010..09191f7010 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logon.html
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/auth/logon.html
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logonError.html b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/auth/logonError.html
index c0c0f7b75d..c0c0f7b75d 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logonError.html
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/auth/logonError.html
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/store.html b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/store.html
index e4cd0ba12d..e4cd0ba12d 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/store.html
+++ b/sandbox/lresende/sca-1.x/samples/store-secure-webapp/src/main/webapp/store.html