diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:40 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:40 +0000 |
commit | f9be2165328dc76f562938566057e89c0723fe08 (patch) | |
tree | 4b32774b0050ed2d0aeb05f9f22844d41cf13023 /sca-java-2.x/branches/sca-java-2.0-M4/distribution | |
parent | a7c1a39d8c3c4ef4d5878dbff726085082a17e8a (diff) |
Moving 2.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF (renamed from branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF (renamed from branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/all/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config (renamed from branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/README.txt (renamed from branches/sca-java-2.0-M4/distribution/tomcat/README.txt) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp (renamed from branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp) | 0 |
53 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF index 400fdc58e8..400fdc58e8 100644 --- a/branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF diff --git a/branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF index b3e9d79d28..b3e9d79d28 100644 --- a/branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF diff --git a/branches/sca-java-2.0-M4/distribution/all/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/pom.xml index fac8054177..fac8054177 100644 --- a/branches/sca-java-2.0-M4/distribution/all/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml index 51033a5e1d..51033a5e1d 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/bin.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml index 0bb6503560..0bb6503560 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/assembly/src.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml index b5b7111096..b5b7111096 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-common.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml index 018e041d38..018e041d38 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-launcher.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml index 89de329d86..89de329d86 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-modules.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml index 9c0d6fdca1..9c0d6fdca1 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL index a1e3562d8b..a1e3562d8b 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/INSTALL diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE index f0190081ec..f0190081ec 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/LICENSE diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE index cabd225df1..cabd225df1 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/bin/NOTICE diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README index d651dfdeb7..d651dfdeb7 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/README diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config index d0f68de133..d0f68de133 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/default.config diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config index 9516b9db34..9516b9db34 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/osgi.config diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat index cbf6962218..cbf6962218 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh index b053afe4e1..b053afe4e1 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config index ac99590ce9..ac99590ce9 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config diff --git a/branches/sca-java-2.0-M4/distribution/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/pom.xml index 7cbba88043..7cbba88043 100644 --- a/branches/sca-java-2.0-M4/distribution/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/README.txt b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/README.txt index b6158e3667..b6158e3667 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/README.txt +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/README.txt diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/pom.xml index efa071389a..efa071389a 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml index ae49735c48..ae49735c48 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml index 7ea117e7cf..7ea117e7cf 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java index 8c67e05aa7..8c67e05aa7 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite index c03a70c58a..c03a70c58a 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml index 411d8a3146..411d8a3146 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp index d520375993..d520375993 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml index ed7378df49..ed7378df49 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java index c9c6ff66d6..c9c6ff66d6 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java index 65e95f275c..65e95f275c 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml index 9bdfd4e58b..9bdfd4e58b 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite index 2d6ce9419b..2d6ce9419b 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml index 64f991464d..64f991464d 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java index 05f16f603d..05f16f603d 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml index 522e452cbc..522e452cbc 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/testing/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE index 6e529a25c4..6e529a25c4 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/LICENSE diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF index 70e18a0c9a..70e18a0c9a 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE index f5792022fd..f5792022fd 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/NOTICE diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml index a4416d1c1c..a4416d1c1c 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java index 54947d6492..54947d6492 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java index 75f925fec5..75f925fec5 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java index 5e9b5d90e5..5e9b5d90e5 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF index 0b0e3e7d0d..0b0e3e7d0d 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml index f1cf00d0e6..f1cf00d0e6 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java index 972aafd8b6..972aafd8b6 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java index 2251a2e833..2251a2e833 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java index a7e5c7e3d7..a7e5c7e3d7 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml index 5a26c58401..5a26c58401 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/pom.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml index 2f1c6bc4d8..2f1c6bc4d8 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE index 4e1a6a5bf0..4e1a6a5bf0 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE index 77d1c46d12..77d1c46d12 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml index e6c3d23e9e..e6c3d23e9e 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp index a6c3e4acaa..a6c3e4acaa 100644 --- a/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp +++ b/sca-java-2.x/branches/sca-java-2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp |