diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear) | bin | 16071 -> 16071 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar) | bin | 10764 -> 10764 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear) | bin | 21310 -> 21310 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar) | bin | 10740 -> 10740 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar) | bin | 7711 -> 7711 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war) | bin | 16238 -> 16238 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war) | bin | 16209 -> 16209 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar) | bin | 16204 -> 16204 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear) | bin | 16291 -> 16291 bytes |
47 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml index cb95efffae..cb95efffae 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite index fa9a66af7f..fa9a66af7f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml index 59a752bb28..59a752bb28 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml index ad932465cc..ad932465cc 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java index 1bf293ec85..1bf293ec85 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml index 7428735903..7428735903 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml index 4c1e470270..4c1e470270 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml index 50811b3bd1..50811b3bd1 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java index 6f37c9b272..6f37c9b272 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java index a38c4a773f..a38c4a773f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite index c847c24c57..c847c24c57 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml index 2891ca81ee..2891ca81ee 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java index 6f37c9b272..6f37c9b272 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java index a38c4a773f..a38c4a773f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite index 068b92dab8..068b92dab8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml index b341d6819a..b341d6819a 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java index ae8613f8db..ae8613f8db 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml index 2563c8b7c8..2563c8b7c8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite index 29898fe006..29898fe006 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml index 628588a974..628588a974 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html index 69473543c9..69473543c9 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml index fbb166ddd6..fbb166ddd6 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java index 71055bbdfe..71055bbdfe 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml index 2563c8b7c8..2563c8b7c8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml index 628588a974..628588a974 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html index 69473543c9..69473543c9 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html diff --git a/branches/sca-java-1.5/itest/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml index e13d292a28..e13d292a28 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java index eda6aad177..eda6aad177 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver index a39171507c..a39171507c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java index b81f67c287..b81f67c287 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java index 3674dc2638..3674dc2638 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java index 24556f0a4c..24556f0a4c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java index a59c6839fe..a59c6839fe 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear Binary files differindex 11d2a029ec..11d2a029ec 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar Binary files differindex a5b160c875..a5b160c875 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear Binary files differindex 9fb1ed9d14..9fb1ed9d14 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar Binary files differindex 3a704137ed..3a704137ed 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar Binary files differindex 228f4d27d7..228f4d27d7 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war Binary files differindex 0b75db2745..0b75db2745 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war Binary files differindex 938ea75941..938ea75941 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar Binary files differindex 24f55a5f63..24f55a5f63 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear Binary files differindex c912e64237..c912e64237 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear |