Copy the contribution under contrib and merge the one from sca-equinox

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

162 files changed, 330 insertions, 0 deletions

diff --git a/java/sca/distribution/bundle-minimal/pom.xml b/java/sca/contrib/distribution/bundle-minimal/pom.xml
index 95e017c3e9..95e017c3e9 100644
--- a/java/sca/distribution/bundle-minimal/pom.xml
+++ b/java/sca/contrib/distribution/bundle-minimal/pom.xml
diff --git a/java/sca/distribution/bundle/pom.xml b/java/sca/contrib/distribution/bundle/pom.xml
index f83f8f9d1c..f83f8f9d1c 100644
--- a/java/sca/distribution/bundle/pom.xml
+++ b/java/sca/contrib/distribution/bundle/pom.xml
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/contrib/distribution/features/all/pom.xml
index 51d51ba3a8..51d51ba3a8 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/contrib/distribution/features/all/pom.xml
diff --git a/java/sca/distribution/features/all/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/all/src/main/assembly/bin.xml
index 5e21cc7a0f..5e21cc7a0f 100644
--- a/java/sca/distribution/features/all/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/all/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/all/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/all/src/main/assembly/src.xml
index 7a57773572..7a57773572 100644
--- a/java/sca/distribution/features/all/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/all/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/all/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/all/src/main/components/src-modules.xml
index b886263676..b886263676 100644
--- a/java/sca/distribution/features/all/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/all/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/all/src/main/release/CHANGES b/java/sca/contrib/distribution/features/all/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/all/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/all/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/all/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/all/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/all/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/all/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/all/src/main/release/README b/java/sca/contrib/distribution/features/all/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/all/src/main/release/README
+++ b/java/sca/contrib/distribution/features/all/src/main/release/README
diff --git a/java/sca/distribution/features/all/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/all/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/all/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/all/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/all/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/all/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/all/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/all/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/all/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/all/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/all/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/all/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/all/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/all/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/all/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/all/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/all/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/all/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/all/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/all/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/all/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/all/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/all/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/all/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/all/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/all/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/all/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/all/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/contrib/distribution/features/core/pom.xml
index 6cf324c889..6cf324c889 100644
--- a/java/sca/distribution/features/core/pom.xml
+++ b/java/sca/contrib/distribution/features/core/pom.xml
diff --git a/java/sca/distribution/features/core/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/core/src/main/assembly/bin.xml
index 200cc91080..200cc91080 100644
--- a/java/sca/distribution/features/core/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/core/src/main/assembly/src.xml
index 6fe3e2dae1..6fe3e2dae1 100644
--- a/java/sca/distribution/features/core/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/core/src/main/components/bin-common.xml b/java/sca/contrib/distribution/features/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/java/sca/distribution/features/core/src/main/components/bin-common.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/bin-common.xml
diff --git a/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml b/java/sca/contrib/distribution/features/core/src/main/components/bin-dependencies.xml
index a1bde3932b..a1bde3932b 100644
--- a/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/bin-dependencies.xml
diff --git a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/java/sca/contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index 58d8ca1407..58d8ca1407 100644
--- a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
diff --git a/java/sca/distribution/features/core/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/core/src/main/components/bin-samples.xml
index fbe46a296c..fbe46a296c 100644
--- a/java/sca/distribution/features/core/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/core/src/main/components/src-common.xml b/java/sca/contrib/distribution/features/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/java/sca/distribution/features/core/src/main/components/src-common.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/src-common.xml
diff --git a/java/sca/distribution/features/core/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/core/src/main/components/src-modules.xml
index f3e34d10f3..f3e34d10f3 100644
--- a/java/sca/distribution/features/core/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/core/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/core/src/main/release/CHANGES b/java/sca/contrib/distribution/features/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/core/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/core/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/core/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/core/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/core/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/core/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/core/src/main/release/README b/java/sca/contrib/distribution/features/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/core/src/main/release/README
+++ b/java/sca/contrib/distribution/features/core/src/main/release/README
diff --git a/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/core/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/core/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/core/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/core/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/core/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/core/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/core/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/core/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/core/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/core/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/core/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/core/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/core/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/core/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/core/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/core/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/core/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/core/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/core/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/contrib/distribution/features/ejava/pom.xml
index a926209a6a..a926209a6a 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/contrib/distribution/features/ejava/pom.xml
diff --git a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/ejava/src/main/assembly/bin.xml
index fd49912e91..fd49912e91 100644
--- a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/ejava/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/ejava/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/ejava/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/java/sca/distribution/features/ejava/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/ejava/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/ejava/src/main/components/bin-samples.xml
index f1c691965b..f1c691965b 100644
--- a/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/ejava/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/ejava/src/main/components/src-modules.xml
index 2b4bd22d87..2b4bd22d87 100644
--- a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/ejava/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/ejava/src/main/release/CHANGES b/java/sca/contrib/distribution/features/ejava/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/ejava/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/ejava/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/ejava/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/ejava/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/ejava/src/main/release/README b/java/sca/contrib/distribution/features/ejava/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/ejava/src/main/release/README
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/README
diff --git a/java/sca/distribution/features/ejava/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/ejava/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/ejava/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/ejava/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/ejava/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/ejava/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/ejava/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/ejava/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/ejava/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/ejava/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/ejava/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/ejava/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/ejava/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/ejava/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/ejava/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/ejava/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/ejava/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/ejava/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/etc/generate-all-maven-files.sh b/java/sca/contrib/distribution/features/etc/generate-all-maven-files.sh
index 4d1327f518..4d1327f518 100755
--- a/java/sca/distribution/features/etc/generate-all-maven-files.sh
+++ b/java/sca/contrib/distribution/features/etc/generate-all-maven-files.sh
diff --git a/java/sca/distribution/features/etc/generate-filtered-dependencies.sh b/java/sca/contrib/distribution/features/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/java/sca/distribution/features/etc/generate-filtered-dependencies.sh
+++ b/java/sca/contrib/distribution/features/etc/generate-filtered-dependencies.sh
diff --git a/java/sca/distribution/features/etc/generate-maven-files.sh b/java/sca/contrib/distribution/features/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/java/sca/distribution/features/etc/generate-maven-files.sh
+++ b/java/sca/contrib/distribution/features/etc/generate-maven-files.sh
diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/contrib/distribution/features/etc/generate-pom.sh
index ce0228694c..ce0228694c 100755
--- a/java/sca/distribution/features/etc/generate-pom.sh
+++ b/java/sca/contrib/distribution/features/etc/generate-pom.sh
diff --git a/java/sca/distribution/features/etc/generate-src-modules.sh b/java/sca/contrib/distribution/features/etc/generate-src-modules.sh
index 60dbbcd2d0..60dbbcd2d0 100755
--- a/java/sca/distribution/features/etc/generate-src-modules.sh
+++ b/java/sca/contrib/distribution/features/etc/generate-src-modules.sh
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/contrib/distribution/features/manager/pom.xml
index 3d7bfe9bd4..3d7bfe9bd4 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/contrib/distribution/features/manager/pom.xml
diff --git a/java/sca/distribution/features/manager/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/manager/src/main/assembly/bin.xml
index fd49912e91..fd49912e91 100644
--- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/manager/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/manager/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/manager/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/java/sca/distribution/features/manager/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/manager/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/manager/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/manager/src/main/components/bin-samples.xml
index d4b13c42e0..d4b13c42e0 100644
--- a/java/sca/distribution/features/manager/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/manager/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/manager/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/manager/src/main/components/src-modules.xml
index 9a68e7a938..9a68e7a938 100644
--- a/java/sca/distribution/features/manager/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/manager/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/manager/src/main/release/CHANGES b/java/sca/contrib/distribution/features/manager/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/manager/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/manager/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/manager/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/manager/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/manager/src/main/release/README b/java/sca/contrib/distribution/features/manager/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/manager/src/main/release/README
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/README
diff --git a/java/sca/distribution/features/manager/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/manager/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/manager/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/manager/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/manager/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/manager/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/manager/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/manager/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/manager/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/manager/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/manager/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/manager/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/manager/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/manager/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/manager/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/manager/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/manager/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/manager/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/manager/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/manager/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/manager/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/manager/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/pom.xml b/java/sca/contrib/distribution/features/pom.xml
index 2acd155a97..2acd155a97 100644
--- a/java/sca/distribution/features/pom.xml
+++ b/java/sca/contrib/distribution/features/pom.xml
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/contrib/distribution/features/process/pom.xml
index 2b058cadbf..2b058cadbf 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/contrib/distribution/features/process/pom.xml
diff --git a/java/sca/distribution/features/process/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/process/src/main/assembly/bin.xml
index fd49912e91..fd49912e91 100644
--- a/java/sca/distribution/features/process/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/process/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/process/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/process/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/java/sca/distribution/features/process/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/process/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/process/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/process/src/main/components/bin-samples.xml
index 8e8bc2e507..8e8bc2e507 100644
--- a/java/sca/distribution/features/process/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/process/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/process/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/process/src/main/components/src-modules.xml
index dfcf7d4ca0..dfcf7d4ca0 100644
--- a/java/sca/distribution/features/process/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/process/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/process/src/main/release/CHANGES b/java/sca/contrib/distribution/features/process/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/process/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/process/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/process/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/process/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/process/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/process/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/process/src/main/release/README b/java/sca/contrib/distribution/features/process/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/process/src/main/release/README
+++ b/java/sca/contrib/distribution/features/process/src/main/release/README
diff --git a/java/sca/distribution/features/process/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/process/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/process/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/process/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/process/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/process/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/process/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/process/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/process/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/process/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/process/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/process/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/process/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/process/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/process/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/process/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/process/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/process/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/process/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/process/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/process/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/process/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/process/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/process/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/process/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/process/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/process/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/process/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/repository/pom.xml b/java/sca/contrib/distribution/features/repository/pom.xml
index aaf96f99b1..aaf96f99b1 100644
--- a/java/sca/distribution/features/repository/pom.xml
+++ b/java/sca/contrib/distribution/features/repository/pom.xml
diff --git a/java/sca/distribution/features/repository/src/main/assembly/repository.xml b/java/sca/contrib/distribution/features/repository/src/main/assembly/repository.xml
index ed459500a8..ed459500a8 100644
--- a/java/sca/distribution/features/repository/src/main/assembly/repository.xml
+++ b/java/sca/contrib/distribution/features/repository/src/main/assembly/repository.xml
diff --git a/java/sca/distribution/features/repository/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/repository/src/main/components/src-modules.xml
index a893bf5ce8..a893bf5ce8 100644
--- a/java/sca/distribution/features/repository/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/repository/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/repository/src/main/release/CHANGES b/java/sca/contrib/distribution/features/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/repository/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/repository/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/repository/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/repository/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/repository/src/main/release/README b/java/sca/contrib/distribution/features/repository/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/repository/src/main/release/README
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/README
diff --git a/java/sca/distribution/features/repository/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/repository/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/repository/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/repository/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/repository/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/repository/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/repository/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/repository/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/repository/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/repository/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/repository/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/repository/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/repository/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/repository/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/repository/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/repository/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/repository/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/repository/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/repository/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/repository/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/repository/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/contrib/distribution/features/web20/pom.xml
index e2f141f206..e2f141f206 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/contrib/distribution/features/web20/pom.xml
diff --git a/java/sca/distribution/features/web20/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/web20/src/main/assembly/bin.xml
index fd49912e91..fd49912e91 100644
--- a/java/sca/distribution/features/web20/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/web20/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/web20/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/web20/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/java/sca/distribution/features/web20/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/web20/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/web20/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/web20/src/main/components/bin-samples.xml
index 5cc62040c0..5cc62040c0 100644
--- a/java/sca/distribution/features/web20/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/web20/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/web20/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/web20/src/main/components/src-modules.xml
index 99082280ad..99082280ad 100644
--- a/java/sca/distribution/features/web20/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/web20/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/web20/src/main/release/CHANGES b/java/sca/contrib/distribution/features/web20/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/web20/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/web20/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/web20/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/web20/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/web20/src/main/release/README b/java/sca/contrib/distribution/features/web20/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/web20/src/main/release/README
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/README
diff --git a/java/sca/distribution/features/web20/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/web20/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/web20/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/web20/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/web20/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/web20/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/web20/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/web20/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/web20/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/web20/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/web20/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/web20/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/web20/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/web20/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/web20/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/web20/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/web20/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/web20/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/web20/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/web20/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/web20/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/web20/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/contrib/distribution/features/webservice/pom.xml
index c1ff9080c3..c1ff9080c3 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/contrib/distribution/features/webservice/pom.xml
diff --git a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml b/java/sca/contrib/distribution/features/webservice/src/main/assembly/bin.xml
index fd49912e91..fd49912e91 100644
--- a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/features/webservice/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/webservice/src/main/assembly/src.xml b/java/sca/contrib/distribution/features/webservice/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/java/sca/distribution/features/webservice/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/features/webservice/src/main/assembly/src.xml
diff --git a/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml b/java/sca/contrib/distribution/features/webservice/src/main/components/bin-samples.xml
index 1bb5c20536..1bb5c20536 100644
--- a/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml
+++ b/java/sca/contrib/distribution/features/webservice/src/main/components/bin-samples.xml
diff --git a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml b/java/sca/contrib/distribution/features/webservice/src/main/components/src-modules.xml
index e551ca97ba..e551ca97ba 100644
--- a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
+++ b/java/sca/contrib/distribution/features/webservice/src/main/components/src-modules.xml
diff --git a/java/sca/distribution/features/webservice/src/main/release/CHANGES b/java/sca/contrib/distribution/features/webservice/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/webservice/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/webservice/src/main/release/DISCLAIMER b/java/sca/contrib/distribution/features/webservice/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/webservice/src/main/release/DISCLAIMER
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/webservice/src/main/release/README b/java/sca/contrib/distribution/features/webservice/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/webservice/src/main/release/README
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/README
diff --git a/java/sca/distribution/features/webservice/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/webservice/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/webservice/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/webservice/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/webservice/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/webservice/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/webservice/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/webservice/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/webservice/src/main/release/src/BUILDING b/java/sca/contrib/distribution/features/webservice/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/webservice/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/webservice/src/main/release/src/LICENSE b/java/sca/contrib/distribution/features/webservice/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/webservice/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/webservice/src/main/release/src/NOTICE b/java/sca/contrib/distribution/features/webservice/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/webservice/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/features/webservice/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/manifest/pom.xml b/java/sca/contrib/distribution/manifest/pom.xml
index 320dcc2151..320dcc2151 100644
--- a/java/sca/distribution/manifest/pom.xml
+++ b/java/sca/contrib/distribution/manifest/pom.xml
diff --git a/java/sca/contrib/distribution/pom.xml b/java/sca/contrib/distribution/pom.xml
new file mode 100644
index 0000000000..d7e9a46930
--- /dev/null
+++ b/java/sca/contrib/distribution/pom.xml
@@ -0,0 +1,330 @@
+<?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-sca</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution</artifactId>
+    <name>Apache Tuscany SCA Distribution</name>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <tuscany.version>${pom.version}</tuscany.version>
+    </properties>
+
+    <modules>
+        <module>bundle</module>
+        <module>manifest</module>
+        <!--module>webapp</module-->
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-bundle</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <!-- exclude things that get dragged in from other dependencies that we don't need to distribute -->
+                <!-- TODO: this should probably be done in the Tuscany module where the dependency is defined -->
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-launcher</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jline</groupId>
+                    <artifactId>jline</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.mail</groupId>
+                    <artifactId>mail</artifactId>
+                </exclusion>
+                <!--
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+                -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
+            </exclusions>
+       </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
+        <!--include tomcat here so it is shipped in modules/ but not  -->
+        <!--in the all jar                                            -->
+        <!-- dependency> 
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1-incubating</version>
+            <exclusions>
+                <exclusion>
+                    <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- exclude felix since we are using a later version -->
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.apache.felix.main</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>apache-activemq</artifactId>
+            <version>4.1.1</version>
+            <exclusions>
+                <!-- TUSCANY-2168 -->
+                <exclusion>
+                    <groupId>commons-httpclient</groupId>
+                    <artifactId>commons-httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-fileupload</groupId>
+                    <artifactId>commons-fileupload</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-console</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-optional</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web-demo</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-jaas</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jsp_2.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>activesoap</groupId>
+                    <artifactId>jaxp-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>activemq</groupId>
+                    <artifactId>jmdns</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jrms</groupId>
+                    <artifactId>jrms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xmlParserAPIs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xmlpull</groupId>
+                    <artifactId>xmlpull</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j-remote</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>  
+    </dependencies>
+
+    <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <!-- Temporarily Remove Javadoc -->
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.tuscany.sca</groupId>
+                                    <artifactId>tuscany-sca-api</artifactId>
+                                    <classifier>javadoc</classifier>
+                                    <version>${pom.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.tuscany.sca</groupId>
+                                    <artifactId>tuscany-core-spi</artifactId>
+                                    <classifier>javadoc</classifier>
+                                    <version>${pom.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bin.xml</descriptor>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <finalName>apache-tuscany-sca-${pom.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
diff --git a/java/sca/distribution/src/main/assembly/bin.xml b/java/sca/contrib/distribution/src/main/assembly/bin.xml
index de26867cf1..de26867cf1 100644
--- a/java/sca/distribution/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/src/main/assembly/src.xml b/java/sca/contrib/distribution/src/main/assembly/src.xml
index 1d04b0d421..1d04b0d421 100644
--- a/java/sca/distribution/src/main/assembly/src.xml
+++ b/java/sca/contrib/distribution/src/main/assembly/src.xml
diff --git a/java/sca/distribution/src/main/release/CHANGES b/java/sca/contrib/distribution/src/main/release/CHANGES
index 763ab8421b..763ab8421b 100644
--- a/java/sca/distribution/src/main/release/CHANGES
+++ b/java/sca/contrib/distribution/src/main/release/CHANGES
diff --git a/java/sca/distribution/src/main/release/README b/java/sca/contrib/distribution/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/src/main/release/README
+++ b/java/sca/contrib/distribution/src/main/release/README
diff --git a/java/sca/distribution/src/main/release/RELEASE_NOTES b/java/sca/contrib/distribution/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/src/main/release/RELEASE_NOTES
+++ b/java/sca/contrib/distribution/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/src/main/release/bin/INSTALL b/java/sca/contrib/distribution/src/main/release/bin/INSTALL
index 44b3ff6444..44b3ff6444 100644
--- a/java/sca/distribution/src/main/release/bin/INSTALL
+++ b/java/sca/contrib/distribution/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/src/main/release/bin/LICENSE b/java/sca/contrib/distribution/src/main/release/bin/LICENSE
index 7ea8d871a2..7ea8d871a2 100644
--- a/java/sca/distribution/src/main/release/bin/LICENSE
+++ b/java/sca/contrib/distribution/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/src/main/release/bin/NOTICE b/java/sca/contrib/distribution/src/main/release/bin/NOTICE
index 05094cdf7c..05094cdf7c 100644
--- a/java/sca/distribution/src/main/release/bin/NOTICE
+++ b/java/sca/contrib/distribution/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/src/main/release/src/BUILDING b/java/sca/contrib/distribution/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/src/main/release/src/BUILDING
+++ b/java/sca/contrib/distribution/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/src/main/release/src/LICENSE b/java/sca/contrib/distribution/src/main/release/src/LICENSE
index 3200103252..3200103252 100644
--- a/java/sca/distribution/src/main/release/src/LICENSE
+++ b/java/sca/contrib/distribution/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/src/main/release/src/NOTICE b/java/sca/contrib/distribution/src/main/release/src/NOTICE
index 5a635d485d..5a635d485d 100644
--- a/java/sca/distribution/src/main/release/src/NOTICE
+++ b/java/sca/contrib/distribution/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/src/main/xsl/srcbuild_paths.xsl b/java/sca/contrib/distribution/src/main/xsl/srcbuild_paths.xsl
index ab7a40b94a..ab7a40b94a 100644
--- a/java/sca/distribution/src/main/xsl/srcbuild_paths.xsl
+++ b/java/sca/contrib/distribution/src/main/xsl/srcbuild_paths.xsl
diff --git a/java/sca/distribution/standalone/pom.xml b/java/sca/contrib/distribution/standalone/pom.xml
index 83cf69211e..83cf69211e 100644
--- a/java/sca/distribution/standalone/pom.xml
+++ b/java/sca/contrib/distribution/standalone/pom.xml
diff --git a/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties b/java/sca/contrib/distribution/standalone/src/test/resources/repo/tuscany.properties
index a0d83168f7..a0d83168f7 100644
--- a/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties
+++ b/java/sca/contrib/distribution/standalone/src/test/resources/repo/tuscany.properties
diff --git a/java/sca/distribution/tomcat/pom.xml b/java/sca/contrib/distribution/tomcat/pom.xml
index 83d4884d6d..83d4884d6d 100644
--- a/java/sca/distribution/tomcat/pom.xml
+++ b/java/sca/contrib/distribution/tomcat/pom.xml
diff --git a/java/sca/distribution/tomcat/src/main/assembly/bin.xml b/java/sca/contrib/distribution/tomcat/src/main/assembly/bin.xml
index c66b086e27..c66b086e27 100644
--- a/java/sca/distribution/tomcat/src/main/assembly/bin.xml
+++ b/java/sca/contrib/distribution/tomcat/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties b/java/sca/contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
index 6e2ca20deb..6e2ca20deb 100644
--- a/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
+++ b/java/sca/contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
diff --git a/java/sca/distribution/war/pom.xml b/java/sca/contrib/distribution/war/pom.xml
index 08c2687e20..08c2687e20 100644
--- a/java/sca/distribution/war/pom.xml
+++ b/java/sca/contrib/distribution/war/pom.xml
diff --git a/java/sca/distribution/war/src/main/release/LICENSE b/java/sca/contrib/distribution/war/src/main/release/LICENSE
index 815617a23b..815617a23b 100644
--- a/java/sca/distribution/war/src/main/release/LICENSE
+++ b/java/sca/contrib/distribution/war/src/main/release/LICENSE
diff --git a/java/sca/distribution/war/src/main/release/NOTICE b/java/sca/contrib/distribution/war/src/main/release/NOTICE
index c34934e5cd..c34934e5cd 100644
--- a/java/sca/distribution/war/src/main/release/NOTICE
+++ b/java/sca/contrib/distribution/war/src/main/release/NOTICE
diff --git a/java/sca/distribution/war/src/main/release/README b/java/sca/contrib/distribution/war/src/main/release/README
index 7c5ba2db37..7c5ba2db37 100644
--- a/java/sca/distribution/war/src/main/release/README
+++ b/java/sca/contrib/distribution/war/src/main/release/README
diff --git a/java/sca/distribution/war/src/main/webapp/web.xml b/java/sca/contrib/distribution/war/src/main/webapp/web.xml
index 787ff847b0..787ff847b0 100644
--- a/java/sca/distribution/war/src/main/webapp/web.xml
+++ b/java/sca/contrib/distribution/war/src/main/webapp/web.xml
diff --git a/java/sca/distribution/war/war.xml b/java/sca/contrib/distribution/war/war.xml
index 8fb1044714..8fb1044714 100644
--- a/java/sca/distribution/war/war.xml
+++ b/java/sca/contrib/distribution/war/war.xml
diff --git a/java/sca/distribution/webapp/pom.xml b/java/sca/contrib/distribution/webapp/pom.xml
index 6745a87c60..6745a87c60 100644
--- a/java/sca/distribution/webapp/pom.xml
+++ b/java/sca/contrib/distribution/webapp/pom.xml
diff --git a/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java b/java/sca/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
index 9a0c66a776..9a0c66a776 100644
--- a/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
+++ b/java/sca/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
diff --git a/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java b/java/sca/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
index e46cadfa3d..e46cadfa3d 100644
--- a/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
+++ b/java/sca/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
diff --git a/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml
index 8e65a9b96d..8e65a9b96d 100644
--- a/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
index 4efe4b5db3..4efe4b5db3 100644
--- a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
+++ b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
diff --git a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
index 0df7ab8d74..0df7ab8d74 100644
--- a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
+++ b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
diff --git a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
index acf47451b3..acf47451b3 100644
--- a/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
+++ b/java/sca/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
diff --git a/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp b/java/sca/contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
index c92c164cfb..c92c164cfb 100644
--- a/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
+++ b/java/sca/contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp