diff options
20 files changed, 256 insertions, 28 deletions
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml index 930d4f9183..32aa604cba 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>ejb</type> <scope>provided</scope> @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>war</type> <scope>provided</scope> @@ -86,12 +86,12 @@ </jarModule> <ejbModule> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId> <bundleDir>/</bundleDir> </ejbModule> <webModule> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> <bundleDir>/</bundleDir> </webModule> </modules> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite index 890431360b..9063702011 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite @@ -23,14 +23,17 @@ name="Calculator"> <component name="HelloworldServiceComponent"> - <implementation.ejb ejb-link="itest-contribution-jee-samples-7-ejb-nonenhanced.jar#HelloworldService7Bean"/> - <service name="HelloworldService7"> - <interface.java interface="sample.ejb3.HelloworldService7"/> + <implementation.ejb ejb-link="itest-contribution-jee-samples-08-ejb-enhanced.jar#HelloworldService8Bean"/> + <service name="HelloworldService8"> + <interface.java interface="sample.ejb3.HelloworldService8"/> <binding.sca/> </service> + <reference name="hwReference" target="HelloworldServiceJavaComponent"/> </component> - <service name="TheService" promote="HelloworldServiceComponent/HelloworldService7"/> + <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/> + + <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/> <component name="HelloworldServiceJavaComponent"> <implementation.java class="sample.java.HelloworldServiceJavaImpl"/> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml index d408db67c9..57054b4a5d 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>ejb</type> <scope>provided</scope> @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>war</type> <scope>provided</scope> @@ -73,12 +73,12 @@ <modules> <ejbModule> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> <bundleDir>/</bundleDir> </ejbModule> <webModule> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> <bundleDir>/</bundleDir> </webModule> </modules> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java index 1bf293ec85..ad9003dc67 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java @@ -19,12 +19,17 @@ package sample.ejb3; import javax.ejb.Stateless; +import org.osoa.sca.annotations.Reference; + /** * HelloworldService EJB implementation with no SCA enhancement */ @Stateless public class HelloworldServiceBean implements HelloworldService { + + @Reference + protected HelloworldService nextService; public String getGreetings(String name) { String greeting = "Hello " + name; diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml new file mode 100644 index 0000000000..44a0b85dc2 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 08</name> + <packaging>ejb</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ejb_3.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <ejbVersion>3.0</ejbVersion> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java new file mode 100644 index 0000000000..b5224a2319 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package sample.ejb3; + +import javax.ejb.Local; + +/** + * HelloworldService EJB interface. + * + * @version $Rev$ $Date$ + */ + +@Local +public interface HelloworldLocal8 { + String getGreetingsLocal(String name); +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java new file mode 100644 index 0000000000..e5e9fe6a82 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package sample.ejb3; + +import javax.ejb.Remote; + +/** + * HelloworldService EJB interface. + * + * @version $Rev$ $Date$ + */ + +@Remote +public interface HelloworldService8 { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java new file mode 100644 index 0000000000..6d90aaead1 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sample.ejb3; + +import javax.ejb.Stateless; + +//import org.osoa.sca.annotations.Reference; + +/** + * HelloworldService EJB implementation SCA enhancement + + */ +@Stateless +public class HelloworldService8Bean implements HelloworldService8, HelloworldLocal8 { + + //@Reference + //protected HelloworldService8 hwReference; + + public String getGreetings(String name) { + String greeting = "Hello remote " + name; + System.out.println(greeting); + return greeting; + } + + public String getGreetingsLocal(String name) { + String greeting = "Hello local " + name; + System.out.println(greeting); + return greeting; + } + +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml new file mode 100644 index 0000000000..db36c4b140 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"src/main/resources/META-INF/application.xml" + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<ejb:openejb-jar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"> + <dep:environment> + <dep:moduleId> + <dep:groupId>test</dep:groupId> + <dep:artifactId>itest-contribution-jee-samples-08-ejb-enhanced</dep:artifactId> + <dep:version>1.0</dep:version> + <dep:type>jar</dep:type> + </dep:moduleId> + <dep:dependencies/> + <dep:hidden-classes/> + <dep:non-overridable-classes/> + </dep:environment> +</ejb:openejb-jar> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml index 74034924d3..29690543e8 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml @@ -27,8 +27,8 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java EE Samples 7</name> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 07</name> <packaging>ejb</packaging> <dependencies> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml index 25c1caeee1..bb7194c6ba 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml @@ -43,6 +43,7 @@ <module>war-nonenhanced</module> <module>war-appcomp-contrib-implicit</module> <module>ejb-nonenhanced</module> + <module>ejb-enhanced</module> <module>ejb-appcomp-contrib-implicit</module> <module>ear-nonenhanced</module> <module>ear-appcomp-contrib-implicit</module> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite index e665eb5d3e..79c9dd3243 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite @@ -24,7 +24,7 @@ <component name="HelloworlClientComponent"> <implementation.java class="sample.pojo.HelloworldClientImpl"/> - <reference name="hwService" target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService" /> + <reference name="hwService" target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService7" /> </component> <component name="HelloworldServiceComponent"> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml index 127bd0ee49..7ddfdb5d4e 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml @@ -25,8 +25,8 @@ <version>1.6-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>itest-contribution-jee-samples-4-scazip-war-appcomp</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java EE Samples 4</name> + <artifactId>itest-contribution-jee-samples-04-scazip-war-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 04</name> <repositories> <repository> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml index b87309fd0a..4129a0702b 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml @@ -27,8 +27,8 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-contribution-jee-samples-6-war-appcomp-contrib-implicit</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java EE Samples 6</name> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 06</name> <packaging>war</packaging> <dependencies> diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml index 12ad438d41..26f996bd6a 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml @@ -27,8 +27,8 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java EE Samples 1</name> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 01</name> <packaging>war</packaging> <dependencies> diff --git a/branches/sca-java-1.x/itest/contribution-jee/pom.xml b/branches/sca-java-1.x/itest/contribution-jee/pom.xml index c00792cbc5..b9751b582e 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee/pom.xml @@ -112,27 +112,34 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-6-war-appcomp-contrib-implicit</artifactId> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> <version>1.6-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> <version>1.6-SNAPSHOT</version> <type>ejb</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>ejb</type> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId> <version>1.6-SNAPSHOT</version> <type>ejb</type> diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java index d8a49ec8a4..8ff51ca85a 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java +++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java @@ -82,7 +82,7 @@ public class SCAZipEjbAppcompTestCase { * */ @Test - public void testSCAJarEarNonenhanced() throws Exception { + public void testSCAZipEjbAppcomp() throws Exception { URL contributionLocation = new File("../contribution-jee-samples/scazip-ejb-appcomp/target/itest-contribution-jee-samples-10-scazip-ejb-appcomp.zip").toURL(); Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java index 216eb45bc9..211f51c9bd 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java +++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java @@ -86,7 +86,7 @@ public class SCAZipWarAppcompTestCase { @Test public void testSCAJarEarNonenhanced() throws Exception { - URL contributionLocation = new File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-4-scazip-war-appcomp.zip").toURL(); + URL contributionLocation = new File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-04-scazip-war-appcomp.zip").toURL(); Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); Assert.assertNotNull(contribution); diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java index a59c6839fe..7696b64f9c 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java +++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java @@ -78,7 +78,7 @@ public class WARAppcompContribImplicitTestCase { */ @Test public void testWARAppcompContribImplicit() throws Exception { - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.war").toURL(); + URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID)); } diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java index 72e2b8bc2e..f54a4f98df 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java +++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java @@ -82,7 +82,7 @@ public class WarAppcompTestCase { @Test public void testEjbAppcom() throws Exception { - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.war").toURL(); + URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); Assert.assertNotNull(contribution); |