Moving 1.x branches

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

122 files changed, 0 insertions, 0 deletions

diff --git a/branches/pre-spec-changes/runtime/equinox/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/equinox/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/equinox/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/pom.xml
index 75be2b1635..75be2b1635 100644
--- a/branches/pre-spec-changes/runtime/equinox/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/pom.xml
diff --git a/branches/pre-spec-changes/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java
index 93866cbf41..93866cbf41 100644
--- a/branches/pre-spec-changes/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/equinox/src/test/java/org/apache/tuscany/equinox/EquinoxStartTestCase.java
diff --git a/branches/pre-spec-changes/runtime/osgi/.pmd b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/.pmd
index 138693a60b..138693a60b 100644
--- a/branches/pre-spec-changes/runtime/osgi/.pmd
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/.pmd
diff --git a/branches/pre-spec-changes/runtime/osgi/.ruleset b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/pre-spec-changes/runtime/osgi/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/.ruleset
diff --git a/branches/pre-spec-changes/runtime/osgi/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/LICENSE.txt
index 0084319535..0084319535 100755
--- a/branches/pre-spec-changes/runtime/osgi/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/osgi/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/osgi/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/osgi/README.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/README.txt
index 9b26d1690a..9b26d1690a 100755
--- a/branches/pre-spec-changes/runtime/osgi/README.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/README.txt
diff --git a/branches/pre-spec-changes/runtime/osgi/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/pom.xml
index 18f72395bf..18f72395bf 100644
--- a/branches/pre-spec-changes/runtime/osgi/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/pom.xml
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java
index 2d7027e208..2d7027e208 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/LauncherActivator.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java
index 9951183aea..9951183aea 100644
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGILauncherInitException.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGiHost.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGiHost.java
index c16d27a937..c16d27a937 100644
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGiHost.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/OSGiHost.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteMethodException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteMethodException.java
index 0f59da4709..0f59da4709 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteMethodException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteMethodException.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteServiceException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteServiceException.java
index a370cb28c6..a370cb28c6 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteServiceException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/NoRemoteServiceException.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
index 0967abf210..0967abf210 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
index 15cacff25d..15cacff25d 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingDefinition.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingException.java
index 288d4940f0..288d4940f0 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingException.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
index 80465feabb..80465feabb 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java
index bb48a8b1e1..bb48a8b1e1 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReferenceBinding.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReferenceBinding.java
index 4523d7e001..4523d7e001 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReferenceBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiReferenceBinding.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
index 57cae13779..57cae13779 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/BundleContextUtil.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/BundleContextUtil.java
index 02549a59fd..02549a59fd 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/BundleContextUtil.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/BundleContextUtil.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/ClassloaderHook.java b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/ClassloaderHook.java
index 33f7706c3e..33f7706c3e 100644
--- a/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/ClassloaderHook.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/java/org/apache/tuscany/osgi/util/ClassloaderHook.java
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/MANIFEST.MF
index bb72ca36e5..bb72ca36e5 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/sca/osgibinding.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/sca/osgibinding.scdl
index 94dca99a73..94dca99a73 100755
--- a/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/sca/osgibinding.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/osgi/src/main/resources/META-INF/sca/osgibinding.scdl
diff --git a/branches/pre-spec-changes/runtime/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/pom.xml
index 5a0b469e93..5a0b469e93 100644
--- a/branches/pre-spec-changes/runtime/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/pom.xml
index 887a5194df..887a5194df 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
index ebefc87da5..ebefc87da5 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl
index ebefc87da5..ebefc87da5 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/src/main/assembly/profiles/launcher/system.scdl
diff --git a/branches/pre-spec-changes/runtime/standalone/assembly/standalone.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/standalone.xml
index f55f2dac7e..f55f2dac7e 100644
--- a/branches/pre-spec-changes/runtime/standalone/assembly/standalone.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/assembly/standalone.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/.ruleset b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/.ruleset
index f27a8fe562..f27a8fe562 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/.ruleset
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/pom.xml
index 03b669c65a..03b669c65a 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/InvalidMainException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/InvalidMainException.java
index 0c11d95c2b..0c11d95c2b 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/InvalidMainException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/InvalidMainException.java
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/LaunchException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/LaunchException.java
index 83056574ae..83056574ae 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/LaunchException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/LaunchException.java
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
index 3f5557e384..3f5557e384 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
diff --git a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/resources/org/apache/tuscany/launcher/Main.properties b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/resources/org/apache/tuscany/launcher/Main.properties
index bef461a2f4..bef461a2f4 100644
--- a/branches/pre-spec-changes/runtime/standalone/launcher/src/main/resources/org/apache/tuscany/launcher/Main.properties
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/launcher/src/main/resources/org/apache/tuscany/launcher/Main.properties
diff --git a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/LICENSE.txt
index 9601ead3f6..9601ead3f6 100644
--- a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/pom.xml
index bb2ac1ae7e..bb2ac1ae7e 100644
--- a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java
index 2240e2f7bd..2240e2f7bd 100644
--- a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java
diff --git a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/TuscanyStandaloneMojo.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/TuscanyStandaloneMojo.java
index da76ecacd0..da76ecacd0 100644
--- a/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/TuscanyStandaloneMojo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/TuscanyStandaloneMojo.java
diff --git a/branches/pre-spec-changes/runtime/standalone/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/pom.xml
index e0e012779d..e0e012779d 100644
--- a/branches/pre-spec-changes/runtime/standalone/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/server.shutdown/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.shutdown/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/server.shutdown/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.shutdown/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/server.shutdown/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/pom.xml
index c190ed57b8..c190ed57b8 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.shutdown/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/server.shutdown/src/main/java/org/apache/tuscany/standalone/server/ShutdownServer.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/src/main/java/org/apache/tuscany/standalone/server/ShutdownServer.java
index ada82c4bb3..ada82c4bb3 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.shutdown/src/main/java/org/apache/tuscany/standalone/server/ShutdownServer.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.shutdown/src/main/java/org/apache/tuscany/standalone/server/ShutdownServer.java
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/pom.xml
index 31ba3959f1..31ba3959f1 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
index 325978c6ea..325978c6ea 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerException.java
index 1c72196145..1c72196145 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerException.java
diff --git a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerMBean.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerMBean.java
index a3bc6291b2..a3bc6291b2 100644
--- a/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerMBean.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServerMBean.java
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/pom.xml
index 978f2389af..978f2389af 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/java/org/apache/tuscany/sca/runtime/standalone/smoketest/Main.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/java/org/apache/tuscany/sca/runtime/standalone/smoketest/Main.java
index 4b404900f7..4b404900f7 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/java/org/apache/tuscany/sca/runtime/standalone/smoketest/Main.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/java/org/apache/tuscany/sca/runtime/standalone/smoketest/Main.java
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/resources/META-INF/sca/default.scdl
index 64ee5aea88..64ee5aea88 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/CommandTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/CommandTestCase.java
index 64d5c02192..64d5c02192 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/CommandTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/CommandTestCase.java
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestAssemblyContent.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestAssemblyContent.java
index 7ac45268ae..7ac45268ae 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestAssemblyContent.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestAssemblyContent.java
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java
index f0bda8ae74..f0bda8ae74 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java
diff --git a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt
index e7ab52bd58..e7ab52bd58 100644
--- a/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/pom.xml
index 3f76e56ddb..3f76e56ddb 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/DirectoryHelper.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/DirectoryHelper.java
index 007d25640a..007d25640a 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/DirectoryHelper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/DirectoryHelper.java
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java
index 484b4aacd4..484b4aacd4 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java
index bf1e92b407..bf1e92b407 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-host/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-host/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-host/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-host/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-host/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/pom.xml
index 80419ef09d..80419ef09d 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-host/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/pom.xml
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
index 3b619008b3..3b619008b3 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
diff --git a/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
index 3e7933d63b..3e7933d63b 100644
--- a/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/plugin.war/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/LICENSE.txt
index 9601ead3f6..9601ead3f6 100644
--- a/branches/pre-spec-changes/runtime/webapp/plugin.war/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/plugin.war/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/webapp/plugin.war/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/plugin.war/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/pom.xml
index 50883f98a0..50883f98a0 100644
--- a/branches/pre-spec-changes/runtime/webapp/plugin.war/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/pom.xml
diff --git a/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
index 3f3f674a66..3f3f674a66 100644
--- a/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
diff --git a/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java
index 622d8686b2..622d8686b2 100644
--- a/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java
diff --git a/branches/pre-spec-changes/runtime/webapp/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/pom.xml
index f25de0252d..f25de0252d 100644
--- a/branches/pre-spec-changes/runtime/webapp/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/pom.xml
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml
index 639d1beb1f..639d1beb1f 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
index 28a4cc2ca3..28a4cc2ca3 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
index 3d1353de25..3d1353de25 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java
index 5936240481..5936240481 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
index 15f8133a3d..15f8133a3d 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
index 58e3895bc7..58e3895bc7 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
index a929dd6307..a929dd6307 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java
index 325532aef6..325532aef6 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java
index 3132559fdd..3132559fdd 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java
index 0335c7bc6a..0335c7bc6a 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java
index 48b4ee8292..48b4ee8292 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
index d08ae10e07..d08ae10e07 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
index 1f08fa2790..1f08fa2790 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java
index 263436bd96..263436bd96 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java
index fcaec7f8ac..fcaec7f8ac 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
index c4c5f842b2..c4c5f842b2 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
index 80cfd3513a..80cfd3513a 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java
index 5213ae9cb1..5213ae9cb1 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java
index 156ff35b68..156ff35b68 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java
index f865a4e740..f865a4e740 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/.ruleset b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/.ruleset
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/LICENSE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/NOTICE.txt
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/pom.xml b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/pom.xml
index bc5b897422..bc5b897422 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/pom.xml
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionId.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionId.java
index 8d3f1153ba..8d3f1153ba 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionId.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionId.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
index f642e272e0..f642e272e0 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java
index 0b47744e5f..0b47744e5f 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java
index 9cfa7345d6..9cfa7345d6 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java
index 89f0f31b1b..89f0f31b1b 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
index 82278f89ee..82278f89ee 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/binding.axis2.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/binding.axis2.scdl
index b1a1fde4c4..b1a1fde4c4 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/binding.axis2.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/binding.axis2.scdl
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/databinding.sdo.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/databinding.sdo.scdl
index 6897567d2d..6897567d2d 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/sca/databinding.sdo.scdl
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
index 58af279788..58af279788 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/Foo.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/Foo.java
index 75b49de188..75b49de188 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/Foo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/Foo.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/FooImpl.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/FooImpl.java
index dd938f2a58..dd938f2a58 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/FooImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/FooImpl.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionIdTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionIdTestCase.java
index f41fa2361b..f41fa2361b 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionIdTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/LazyHTTPSessionIdTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletHostTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletHostTestCase.java
index 3d979e8f46..3d979e8f46 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletHostTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletHostTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
index c4e7c35208..c4e7c35208 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/resources/testapp.scdl b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/resources/testapp.scdl
index 9b5bda7fb6..9b5bda7fb6 100644
--- a/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/resources/testapp.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/runtime/webapp/webapp-host/src/test/resources/testapp.scdl