Moving 2.x branches

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

35 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/LICENSE
index fa1256bf99..fa1256bf99 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF
index 25c648a0ce..25c648a0ce 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/NOTICE
index e158926510..e158926510 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/pom.xml
index 15ae652076..15ae652076 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
index f688e103cd..f688e103cd 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
index efddb002c1..efddb002c1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
index 0917804d65..0917804d65 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 12122b83e9..12122b83e9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/LICENSE
index f602cf9395..f602cf9395 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF
index 47adbca335..47adbca335 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/NOTICE
index d989435591..d989435591 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/pom.xml
index 2ad254e0a5..2ad254e0a5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
index 3862889f27..3862889f27 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
index ef1e6cd1b9..ef1e6cd1b9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
index 2ba7944326..2ba7944326 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
index b4655e3d95..b4655e3d95 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
index 423e906d6b..423e906d6b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
index 8a9ce93204..8a9ce93204 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 4e26825cfe..4e26825cfe 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF
index 89d94b69fa..89d94b69fa 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/pom.xml
index a0bda54fc1..a0bda54fc1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
index 29c497485f..29c497485f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
index df2e6c5520..df2e6c5520 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
index 41adb73f61..41adb73f61 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
index daff2d23a1..daff2d23a1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
index e984577cb4..e984577cb4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
index 3723ec57f2..3723ec57f2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 7881092890..7881092890 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ee5f312b8f..ee5f312b8f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
index 0487da71b1..0487da71b1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
index d9460194e5..d9460194e5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
index ebad994033..ebad994033 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
index 864318b22e..864318b22e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite