diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-06 07:23:44 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-06 07:23:44 +0000 |
commit | 5b67e082ce57df77acc72cd36569a05c9a2fa347 (patch) | |
tree | 2aae54f73b2a9bbd5b8ad71f8e605e82f4595fc5 /branches/sca-java-1.5.1/itest/contribution-jee | |
parent | aafdaec972cfe3439c6fe15c599d46d3e5f13fa9 (diff) |
Branch for 1.5.1
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
95 files changed, 5001 insertions, 0 deletions
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml new file mode 100644 index 0000000000..74687aedbf --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml @@ -0,0 +1,103 @@ +<?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-30-ear-appcomp-contrib-implicit-war-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 30</name> + <packaging>ear</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.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>provided</scope> + </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> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> + <version>1.6-SNAPSHOT</version> + <type>war</type> + <scope>provided</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <modules> + <jarModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <ejbModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <webModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> + <bundleDir>/</bundleDir> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite new file mode 100644 index 0000000000..3b1555f567 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite @@ -0,0 +1,48 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldServiceComponent"> + <implementation.ejb ejb-link="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar#HelloworldServiceBean"/> + <service name="HelloworldService8"> + <interface.java interface="sample.ejb3.HelloworldService8"/> + <binding.sca/> + </service> + <reference name="hwReference" target="HelloworldServiceJavaComponent"/> + <property name="hwProperty">EJB</property> + </component> + + <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/> + + <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/> + + <component name="HelloworldServiceJavaComponent"> + <implementation.java class="sample.java.HelloworldServiceJavaImpl"/> + <property name="hwProperty">Java</property> + </component> + + <service name="JavaService" promote="HelloworldServiceJavaComponent/HelloworldServiceJava"/> + + <reference name="JavaReference" promote="HelloworldServiceJavaComponent/hwReference"/> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml new file mode 100644 index 0000000000..32aa604cba --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml @@ -0,0 +1,103 @@ +<?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-29-ear-appcomp-contrib-implicit</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 29</name> + <packaging>ear</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.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>provided</scope> + </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> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>war</type> + <scope>provided</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <modules> + <jarModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <ejbModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <webModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> + <bundleDir>/</bundleDir> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite new file mode 100644 index 0000000000..b131d375b0 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite @@ -0,0 +1,62 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldServiceComponent"> + <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"/> + <property name="hwProperty">EJB</property> + </component> + + <component name="HelloworldServiceComponent2"> + <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"/> + <property name="hwProperty">EJB</property> + </component> + + <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/> + + <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/> + + <service name="TheService2" promote="HelloworldServiceComponent2/HelloworldService8"/> + + <reference name="TheReference2" promote="HelloworldServiceComponent2/hwReference"/> + + <component name="HelloworldServiceJavaComponent"> + <implementation.java class="sample.java.HelloworldServiceJavaImpl"/> + <property name="hwProperty">Java</property> + </component> + + <service name="JavaService" promote="HelloworldServiceJavaComponent/HelloworldServiceJava"/> + + <reference name="JavaReference" promote="HelloworldServiceJavaComponent/hwReference"/> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite new file mode 100644 index 0000000000..90872041b0 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite @@ -0,0 +1,49 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="CalculatorServiceComponent"> + <implementation.java class="calculator.CalculatorServiceImpl"/> + <reference name="addService" target="AddServiceComponent" /> + <reference name="subtractService" target="SubtractServiceComponent" /> + <reference name="multiplyService" target="MultiplyServiceComponent" /> + <reference name="divideService" target="DivideServiceComponent" /> + </component> + + <component name="AddServiceComponent"> + <implementation.java class="calculator.AddServiceImpl"/> + </component> + + <component name="SubtractServiceComponent"> + <implementation.java class="calculator.SubtractServiceImpl"/> + </component> + + <component name="MultiplyServiceComponent"> + <implementation.java class="calculator.MultiplyServiceImpl"/> + </component> + + <component name="DivideServiceComponent"> + <implementation.java class="calculator.DivideServiceImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml new file mode 100644 index 0000000000..57054b4a5d --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml @@ -0,0 +1,90 @@ +<?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-13-ear-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 13</name> + <packaging>ear</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.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>ejb</type> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>war</type> + <scope>provided</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <modules> + <ejbModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <webModule> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId> + <bundleDir>/</bundleDir> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml new file mode 100644 index 0000000000..1bf1c63799 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/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-12-ejb-appcomp-contrib-implicit</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 12</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.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java new file mode 100644 index 0000000000..ad9003dc67 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java @@ -0,0 +1,40 @@ +/** + * 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 with no SCA enhancement + + */ +@Stateless +public class HelloworldServiceBean implements HelloworldService { + + @Reference + protected HelloworldService nextService; + + public String getGreetings(String name) { + String greeting = "Hello " + name; + System.out.println(greeting); + return greeting; + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite new file mode 100644 index 0000000000..bcaa154913 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite @@ -0,0 +1,35 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldServiceComponent"> + <implementation.ejb ejb-link="HelloworldServiceBean"/> + <service name="HelloworldService"> + <interface.java interface="sample.ejb3.HelloworldService"/> + <binding.sca/> + </service> + </component> + + <service name="TheService" promote="HelloworldServiceComponent/HelloworldService"/> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml new file mode 100644 index 0000000000..9a97cbd535 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/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-12-ejb-appcomp-contrib-implicit</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.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml new file mode 100644 index 0000000000..44a0b85dc2 --- /dev/null +++ b/branches/sca-java-1.5.1/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.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/branches/sca-java-1.5.1/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.5.1/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.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/branches/sca-java-1.5.1/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.5.1/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.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java new file mode 100644 index 0000000000..a6d7f2dd04 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java @@ -0,0 +1,50 @@ +/** + * 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.Property; +import org.osoa.sca.annotations.Reference; + +/** + * HelloworldService EJB implementation SCA enhancement + + */ +@Stateless +public class HelloworldService8Bean implements HelloworldService8, HelloworldLocal8 { + + @Reference + protected HelloworldService8 hwReference; + + @Property + protected String hwProperty; + + 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.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/branches/sca-java-1.5.1/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.5.1/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.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite new file mode 100644 index 0000000000..90872041b0 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite @@ -0,0 +1,49 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="CalculatorServiceComponent"> + <implementation.java class="calculator.CalculatorServiceImpl"/> + <reference name="addService" target="AddServiceComponent" /> + <reference name="subtractService" target="SubtractServiceComponent" /> + <reference name="multiplyService" target="MultiplyServiceComponent" /> + <reference name="divideService" target="DivideServiceComponent" /> + </component> + + <component name="AddServiceComponent"> + <implementation.java class="calculator.AddServiceImpl"/> + </component> + + <component name="SubtractServiceComponent"> + <implementation.java class="calculator.SubtractServiceImpl"/> + </component> + + <component name="MultiplyServiceComponent"> + <implementation.java class="calculator.MultiplyServiceImpl"/> + </component> + + <component name="DivideServiceComponent"> + <implementation.java class="calculator.DivideServiceImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml new file mode 100644 index 0000000000..29690543e8 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/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-07-ejb-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 07</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.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java new file mode 100644 index 0000000000..4df5cd37de --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.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 HelloworldLocal7 { + String getGreetingsLocal(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java new file mode 100644 index 0000000000..41ecddb62e --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.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 HelloworldService7 { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java new file mode 100644 index 0000000000..403ead623c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java @@ -0,0 +1,41 @@ +/** + * 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; + +/** + * HelloworldService EJB implementation with no SCA enhancement + + */ +@Stateless +public class HelloworldService7Bean implements HelloworldService7, HelloworldLocal7 { + + 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.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml new file mode 100644 index 0000000000..7428735903 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/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-7-ejb-nonenhanced</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.5.1/itest/contribution-jee-samples/jar-shared/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml new file mode 100644 index 0000000000..f32ff8f6ab --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml @@ -0,0 +1,72 @@ +<?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-00-jar-shared</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 00</name> + + <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-jar-plugin</artifactId> + <version>2.2</version> + <configuration> + <archive> + <manifest> + <mainClass>sample.java.JarMain</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java new file mode 100644 index 0000000000..5a08769550 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.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.java; + +import org.osoa.sca.annotations.Remotable; + +/** + * HelloworldService EJB interface. + * + * @version $Rev$ $Date$ + */ + +@Remotable +public interface HelloworldServiceJava { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java new file mode 100644 index 0000000000..265af5b3a0 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java @@ -0,0 +1,36 @@ +/** + * 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.java; + +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; + +public class HelloworldServiceJavaImpl implements HelloworldServiceJava { + + @Reference + protected HelloworldServiceJava hwReference; + + @Property + protected String hwProperty; + + public String getGreetings(String name) { + String greeting = hwReference.getGreetings(name) + " " + hwProperty; + System.out.println(greeting); + return greeting; + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java new file mode 100644 index 0000000000..81793e47e6 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java @@ -0,0 +1,24 @@ +/** + * 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.java; + +public class JarMain { + + public static void main(String[] args) { + System.out.println("JarMain called"); + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/pom.xml new file mode 100644 index 0000000000..62f44f9aef --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/pom.xml @@ -0,0 +1,59 @@ +<?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>tuscany-itest</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>itest-contribution-jee-samples</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples</name> + + <packaging>pom</packaging> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>jar-shared</module> + <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> + <module>ear-appcomp-contrib-implicit-war-appcomp</module> + <module>scajar-ear-nonenhanced</module> + <module>scajar-ear-appcomp</module> + <module>scajar-ear-appcomp-war-appcomp</module> + <module>scazip-ejb-appcomp</module> + <module>scazip-war-appcomp</module> + </modules> + </profile> + </profiles> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml new file mode 100644 index 0000000000..7852f46dd3 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml @@ -0,0 +1,72 @@ +<?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>tuscany-sca</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 43</name> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <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.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</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>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java new file mode 100644 index 0000000000..1fad282a75 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java @@ -0,0 +1,28 @@ +/* + * 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.java; + +import org.osoa.sca.annotations.Remotable; + + +@Remotable +public interface HelloworldServiceJava { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java new file mode 100644 index 0000000000..8adb6a5995 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java @@ -0,0 +1,25 @@ +/* + * 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.pojo; + +public interface HelloworldClient2 { + + String getGreetings(String name); + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java new file mode 100644 index 0000000000..ae16263505 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java @@ -0,0 +1,39 @@ +/* + * 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.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; +import sample.java.HelloworldServiceJava; + +public class HelloworldClient2Impl implements HelloworldClient2 { + + @Reference + protected HelloworldService hwService; + + @Reference + protected HelloworldServiceJava hwJavaService; + + public String getGreetings(String name){ + //return hwService.getGreetings(name) + hwJavaService.getGreetings(name); + return hwJavaService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java new file mode 100644 index 0000000000..05885cead7 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java @@ -0,0 +1,29 @@ +/* + * 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.pojo; + +import sample.java.HelloworldServiceJava; + +public class HelloworldTargetImpl implements HelloworldServiceJava { + + public String getGreetings(String name){ + return "Hello " + name; + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..e9346fb2bb --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite @@ -0,0 +1,40 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldClientComponent"> + <implementation.java class="sample.pojo.HelloworldClient2Impl"/> + <reference name="hwService" target="HelloworldServiceComponent/TheService" /> + <reference name="hwJavaService" target="HelloworldServiceComponent/JavaService" /> + </component> + + <component name="HelloworldServiceComponent"> + <implementation.jee archive="itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear"/> + <reference name="JavaReference" target="HelloworldTargetComponent"/> + </component> + + <component name="HelloworldTargetComponent"> + <implementation.java class="sample.pojo.HelloworldTargetImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml new file mode 100644 index 0000000000..306b27fd5c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml @@ -0,0 +1,72 @@ +<?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>tuscany-sca</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 41</name> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <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.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</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>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java new file mode 100644 index 0000000000..1fad282a75 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java @@ -0,0 +1,28 @@ +/* + * 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.java; + +import org.osoa.sca.annotations.Remotable; + + +@Remotable +public interface HelloworldServiceJava { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java new file mode 100644 index 0000000000..8adb6a5995 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java @@ -0,0 +1,25 @@ +/* + * 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.pojo; + +public interface HelloworldClient2 { + + String getGreetings(String name); + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java new file mode 100644 index 0000000000..ae16263505 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java @@ -0,0 +1,39 @@ +/* + * 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.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; +import sample.java.HelloworldServiceJava; + +public class HelloworldClient2Impl implements HelloworldClient2 { + + @Reference + protected HelloworldService hwService; + + @Reference + protected HelloworldServiceJava hwJavaService; + + public String getGreetings(String name){ + //return hwService.getGreetings(name) + hwJavaService.getGreetings(name); + return hwJavaService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java new file mode 100644 index 0000000000..05885cead7 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java @@ -0,0 +1,29 @@ +/* + * 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.pojo; + +import sample.java.HelloworldServiceJava; + +public class HelloworldTargetImpl implements HelloworldServiceJava { + + public String getGreetings(String name){ + return "Hello " + name; + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..ebd8377725 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite @@ -0,0 +1,40 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldClientComponent"> + <implementation.java class="sample.pojo.HelloworldClient2Impl"/> + <reference name="hwService" target="HelloworldServiceComponent/TheService" /> + <reference name="hwJavaService" target="HelloworldServiceComponent/JavaService" /> + </component> + + <component name="HelloworldServiceComponent"> + <implementation.jee archive="itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/> + <reference name="JavaReference" target="HelloworldTargetComponent"/> + </component> + + <component name="HelloworldTargetComponent"> + <implementation.java class="sample.pojo.HelloworldTargetImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml new file mode 100644 index 0000000000..d13e11262c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml @@ -0,0 +1,72 @@ +<?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>tuscany-sca</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 35</name> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <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.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</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>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java new file mode 100644 index 0000000000..6f37c9b272 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java @@ -0,0 +1,25 @@ +/* + * 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.pojo; + +public interface HelloworldClient { + + String getGreetings(String name); + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java new file mode 100644 index 0000000000..a38c4a773f --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java @@ -0,0 +1,34 @@ +/* + * 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.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +public class HelloworldClientImpl implements HelloworldClient { + + @Reference + protected HelloworldService hwService; + + public String getGreetings(String name){ + return hwService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..79c9dd3243 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite @@ -0,0 +1,34 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworlClientComponent"> + <implementation.java class="sample.pojo.HelloworldClientImpl"/> + <reference name="hwService" target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService7" /> + </component> + + <component name="HelloworldServiceComponent"> + <implementation.jee archive="itest-contribution-jee-samples-13-ear-nonenhanced.ear"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml new file mode 100644 index 0000000000..bdbe79a46d --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml @@ -0,0 +1,24 @@ +<!-- + * 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 name="copy-jar-to-zip" default="copy"> + <target name="copy"> + <copy file="${from.file}" + toFile="${to.file}"/> + </target> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml new file mode 100644 index 0000000000..31aace8edc --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml @@ -0,0 +1,134 @@ +<?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>tuscany-sca</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee-samples-10-scazip-ejb-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 10</name> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <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.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</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.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId> + <version>1.6-SNAPSHOT</version> + <type>ejb</type> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId> + <version>${project.version}</version> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + + <executions> + <execution> + <id>copy-jar-to-zip</id> + <phase>verify</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="from.file" value="target/${artifactId}.jar"/> + <property name="to.file" value="target/${artifactId}.zip"/> + <ant antfile="./build.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java new file mode 100644 index 0000000000..6f37c9b272 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java @@ -0,0 +1,25 @@ +/* + * 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.pojo; + +public interface HelloworldClient { + + String getGreetings(String name); + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java new file mode 100644 index 0000000000..a38c4a773f --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java @@ -0,0 +1,34 @@ +/* + * 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.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +public class HelloworldClientImpl implements HelloworldClient { + + @Reference + protected HelloworldService hwService; + + public String getGreetings(String name){ + return hwService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..248c67e3c9 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite @@ -0,0 +1,34 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworlClientComponent"> + <implementation.java class="sample.pojo.HelloworldClientImpl"/> + <reference name="hwService" target="HelloworldServiceComponent/HelloworldServiceBean_HelloworldService" /> + </component> + + <component name="HelloworldServiceComponent"> + <implementation.jee archive="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit-1.6-SNAPSHOT.jar"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml new file mode 100644 index 0000000000..bdbe79a46d --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml @@ -0,0 +1,24 @@ +<!-- + * 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 name="copy-jar-to-zip" default="copy"> + <target name="copy"> + <copy file="${from.file}" + toFile="${to.file}"/> + </target> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml new file mode 100644 index 0000000000..bac2be77fb --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml @@ -0,0 +1,135 @@ +<?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>tuscany-sca</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee-samples-04-scazip-war-appcomp</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 04</name> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <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.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</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.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> + <version>1.6-SNAPSHOT</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId> + <version>${project.version}</version> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + + <executions> + <execution> + <id>copy-jar-to-zip</id> + <phase>verify</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="from.file" value="target/${artifactId}.jar"/> + <property name="to.file" value="target/${artifactId}.zip"/> + <ant antfile="./build.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java new file mode 100644 index 0000000000..6f37c9b272 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java @@ -0,0 +1,25 @@ +/* + * 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.pojo; + +public interface HelloworldClient { + + String getGreetings(String name); + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java new file mode 100644 index 0000000000..a38c4a773f --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java @@ -0,0 +1,34 @@ +/* + * 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.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +public class HelloworldClientImpl implements HelloworldClient { + + @Reference + protected HelloworldService hwService; + + public String getGreetings(String name){ + return hwService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..4285cdf8b2 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite @@ -0,0 +1,29 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="HelloworldServiceComponent"> + <implementation.jee archive="itest-contribution-jee-samples-6-war-appcomp-contrib-implicit-1.6-SNAPSHOT.jar"/> + </component> + +</composite> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml new file mode 100644 index 0000000000..4129a0702b --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml @@ -0,0 +1,66 @@ +<?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-06-war-appcomp-contrib-implicit</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 06</name> + <packaging>war</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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</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> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java new file mode 100644 index 0000000000..ae8613f8db --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java @@ -0,0 +1,66 @@ +/* + * 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; + +import java.io.IOException; +import java.io.Writer; + +import javax.ejb.EJB; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +/** + * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB. + * + * @version $Rev$ $Date$ + */ +public class HelloworldEjbServlet extends HttpServlet { + private static final long serialVersionUID = -4448818871934180718L; + + @EJB + private HelloworldService service; + + @Reference + protected HelloworldService helloworldSca; + + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { + String name = request.getParameter("name"); + String greeting = service.getGreetings(name); + String greeting2 = helloworldSca.getGreetings(name.toUpperCase()); + + Writer out = response.getWriter(); + out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>"); + out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>"); + out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB."); + out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name); + out.write(greeting); + out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean"); + out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase()); + out.write(greeting2); + out.write("</body></html>"); + out.flush(); + out.close(); + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml new file mode 100644 index 0000000000..2563c8b7c8 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + * 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. +--> +<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"> + <environment> + <moduleId> + <groupId>test</groupId> + <artifactId>helloworld-web</artifactId> + <version>1.0</version> + <type>car</type> + </moduleId> + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>helloworld-ejb</artifactId> + <version>1.0</version> + <type>jar</type> + </dependency> + </dependencies> + <hidden-classes /> + <non-overridable-classes /> + </environment> + <context-root>helloworld-web</context-root> + <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"> + <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name> + <nam:pattern> + <nam:groupId>test</nam:groupId> + <nam:artifactId>helloworld-ejb</nam:artifactId> + <nam:version>1.0</nam:version> + <nam:name>HelloworldServiceBean</nam:name> + </nam:pattern> + </nam:ejb-ref> +</web-app>
\ No newline at end of file diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..823085e81f --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,36 @@ +<?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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + name="Helloworld-web"> + + <component name="HelloworldWebComponent"> + <implementation.java class="sample.HelloworldEjbServlet"/> + <reference name="helloworldSca"> + <interface.java interface="sample.ejb3.HelloworldService"/> + <binding.sca uri="http://localhost:8080/SomeService"/> + </reference> + </component> + + <reference name="helloworldSca" promote="HelloworldWebComponent/helloworldSca"/> + +</composite> + diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..628588a974 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + * 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. +--> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web +Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + + <display-name>Helloworld Web Sample</display-name> + + <servlet> + <servlet-name>HelloworldEjbServlet</servlet-name> + <servlet-class>sample.HelloworldEjbServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>HelloworldEjbServlet</servlet-name> + <url-pattern>/HelloworldEjbServlet</url-pattern> + </servlet-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>hello.html</welcome-file> + </welcome-file-list> + +</web-app> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html new file mode 100644 index 0000000000..69473543c9 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html @@ -0,0 +1,50 @@ +<!-- + * 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. +--> +<html> + +<head> +<title>Apache Tuscany Helloworld Web Sample</title> +</head> + +<body> + +<h2>Apache Tuscany Helloworld Web Sample</h2> + +This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB. +The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields. + +<br/><br/> + +<form action="HelloworldEjbServlet" method="post"> + <table> + <tr> + <td>Enter your name:</td> + <td> + <input type="text" name="name" width="10"> + </td> + </tr> + <tr> + <td align="left" colspan="2"> + <button name="submit" type="submit">getGreeting</button> + </td> + </tr> + </table> +</form> +</body> +</html> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml new file mode 100644 index 0000000000..26f996bd6a --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml @@ -0,0 +1,66 @@ +<?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-01-war-nonenhanced</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE Samples 01</name> + <packaging>war</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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</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> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java new file mode 100644 index 0000000000..71055bbdfe --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java @@ -0,0 +1,63 @@ +/* + * 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; + +import java.io.IOException; +import java.io.Writer; + +import javax.ejb.EJB; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +/** + * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB. + * + * @version $Rev$ $Date$ + */ +public class HelloworldEjbServlet extends HttpServlet { + private static final long serialVersionUID = -4448818871934180718L; + + @EJB + private HelloworldService service; + + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { + String name = request.getParameter("name"); + String greeting = service.getGreetings(name); + //String greeting2 = helloworldSca.getGreetings(name.toUpperCase()); + + Writer out = response.getWriter(); + out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>"); + out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>"); + out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB."); + out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name); + out.write(greeting); + out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean"); + out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase()); + //out.write(greeting2); + out.write("</body></html>"); + out.flush(); + out.close(); + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.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 HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml new file mode 100644 index 0000000000..2563c8b7c8 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + * 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. +--> +<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"> + <environment> + <moduleId> + <groupId>test</groupId> + <artifactId>helloworld-web</artifactId> + <version>1.0</version> + <type>car</type> + </moduleId> + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>helloworld-ejb</artifactId> + <version>1.0</version> + <type>jar</type> + </dependency> + </dependencies> + <hidden-classes /> + <non-overridable-classes /> + </environment> + <context-root>helloworld-web</context-root> + <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"> + <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name> + <nam:pattern> + <nam:groupId>test</nam:groupId> + <nam:artifactId>helloworld-ejb</nam:artifactId> + <nam:version>1.0</nam:version> + <nam:name>HelloworldServiceBean</nam:name> + </nam:pattern> + </nam:ejb-ref> +</web-app>
\ No newline at end of file diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..628588a974 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + * 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. +--> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web +Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + + <display-name>Helloworld Web Sample</display-name> + + <servlet> + <servlet-name>HelloworldEjbServlet</servlet-name> + <servlet-class>sample.HelloworldEjbServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>HelloworldEjbServlet</servlet-name> + <url-pattern>/HelloworldEjbServlet</url-pattern> + </servlet-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>hello.html</welcome-file> + </welcome-file-list> + +</web-app> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html new file mode 100644 index 0000000000..69473543c9 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html @@ -0,0 +1,50 @@ +<!-- + * 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. +--> +<html> + +<head> +<title>Apache Tuscany Helloworld Web Sample</title> +</head> + +<body> + +<h2>Apache Tuscany Helloworld Web Sample</h2> + +This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB. +The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields. + +<br/><br/> + +<form action="HelloworldEjbServlet" method="post"> + <table> + <tr> + <td>Enter your name:</td> + <td> + <input type="text" name="name" width="10"> + </td> + </tr> + <tr> + <td align="left" colspan="2"> + <button name="submit" type="submit">getGreeting</button> + </td> + </tr> + </table> +</form> +</body> +</html> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee/pom.xml new file mode 100644 index 0000000000..257666b917 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/pom.xml @@ -0,0 +1,183 @@ +<?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>tuscany-itest</artifactId> + <version>1.6-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-contribution-jee</artifactId> + <name>Apache Tuscany SCA iTest Contribution Java EE</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-embedded</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-contribution</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-contribution-impl</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-contribution-jee-impl</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-webapp</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-ejb</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-jee</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-web-runtime</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-axis2</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jsp_2.1_spec</artifactId> + <version>1.0.1</version> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-el_1.0_spec</artifactId> + <version>1.0.1</version> + </dependency> + + <!-- the sample war, jar and ear files that are used to test JEE contribution processing --> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <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-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-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> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-13-ear-nonenhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>ear</type> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit</artifactId> + <version>1.6-SNAPSHOT</version> + <type>ear</type> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId> + <version>1.6-SNAPSHOT</version> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId> + <version>1.6-SNAPSHOT</version> + <type>jar</type> + </dependency> + + </dependencies> +</project> diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java new file mode 100644 index 0000000000..e7e1d90797 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java @@ -0,0 +1,48 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.provider.ImplementationProvider; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentService; + + +class TestEJBImplementationProvider implements ImplementationProvider { + + TestEJBImplementationProvider(RuntimeComponent component, EJBImplementation ejbImplementation) { + } + + public Invoker createInvoker(RuntimeComponentService service, Operation operation) { + return null; + } + + public boolean supportsOneWayInvocation() { + return false; + } + + public void start() { + } + + public void stop() { + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java new file mode 100644 index 0000000000..4660fee7fd --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java @@ -0,0 +1,47 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.provider.ImplementationProvider; +import org.apache.tuscany.sca.provider.ImplementationProviderFactory; +import org.apache.tuscany.sca.runtime.RuntimeComponent; + +/** + * A factory for resource implementation providers. + * + * @version $Rev$ $Date$ + */ +public class TestEJBImplementationProviderFactory implements ImplementationProviderFactory<EJBImplementation> { + + /** + * Constructs a resource implementation. + */ + public TestEJBImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { + } + + public ImplementationProvider createImplementationProvider(RuntimeComponent component, EJBImplementation implementation) { + return new TestEJBImplementationProvider(component, implementation); + } + + public Class<EJBImplementation> getModelType() { + return EJBImplementation.class; + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java new file mode 100644 index 0000000000..34bf3702d3 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java @@ -0,0 +1,141 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URI; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; + +public class TestExternalEarModelResolver implements ModelResolver { + + private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>(); + private JavaEEIntrospector jeeIntrospector; + private ContributionService contributionService; + + + public TestExternalEarModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) { + jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class); + UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); + contributionService = utilities.getUtility(ContributionService.class); + + } + + public void addModel(Object resolved) { + ExternalEarInfo jeeApp = (ExternalEarInfo)resolved; + map.put(jeeApp.getAppInfo().getUri(), jeeApp); + } + + public Object removeModel(Object resolved) { + return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri()); + } + + public <T> T resolveModel(final Class<T> modelClass, T unresolved) { + URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri(); + if (uri != null) { + ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } else { + // if you don't care about application composites you can + // simply read the EAR directly + /* + try { + File f = new File(uri.toString()); + final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL()); + return (T)new ExternalEarInfo() { + public JavaEEApplicationInfo getAppInfo() { + return (JavaEEApplicationInfo)o; + } + }; + } catch (Exception e) { + throw new RuntimeException(e); + } + */ + + // if you do care about the application composite you + // need to process the ear as a contribution + try{ + // find the location of the ear using a very specific algorithm + URL earLocation = null; + if ( uri.toString().equals("itest-contribution-jee-samples-13-ear-nonenhanced.ear")){ + earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); + } else if ( uri.toString().equals("itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){ + earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit/target/itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear").toURL(); + } else if ( uri.toString().equals("itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear")){ + earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/target/itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear").toURL(); + } else { + return unresolved; + } + + // if you do care about application composites we have + // to process the EAR as a contribution + Contribution contribution = contributionService.contribute(uri.toString(), earLocation, false); + + JavaEEApplicationInfo appInfo = null; + Composite appComposite = null; + + // get the ear info + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof JavaEEApplicationInfo){ + appInfo = (JavaEEApplicationInfo)artifact.getModel(); + } + + if (artifact.getURI().equals("META-INF/application.composite")){ + appComposite = (Composite)artifact.getModel(); + } + } + + + final JavaEEApplicationInfo returnAppInfo = appInfo; + final Composite returnAppComposite = appComposite; + + return (T)new ExternalEarInfo() { + public JavaEEApplicationInfo getAppInfo() { + return returnAppInfo; + } + public Composite getAppComposite() { + return returnAppComposite; + } + }; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + return unresolved; + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver new file mode 100644 index 0000000000..a39171507c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver @@ -0,0 +1,18 @@ +# 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.
+
+org.apache.tuscany.sca.test.contribution.jee.TestExternalEarModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory new file mode 100644 index 0000000000..adc93d9015 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory @@ -0,0 +1,19 @@ +# 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.
+
+# Implementation class for the implementation extension
+org.apache.tuscany.sca.test.contribution.jee.TestEJBImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.ejb.EJBImplementation
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java new file mode 100644 index 0000000000..b81f67c287 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java @@ -0,0 +1,329 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * This is an integration test for Java EE contribution processing. * + * + * @version $Rev$ $Date$ + */ + +public class ContributionServiceTestCase { + private static final String CONTRIBUTION_001_ID = "contribution001/"; + private static final String CONTRIBUTION_002_ID = "contribution002/"; + private static final String JAR_CONTRIBUTION = "/repository/helloworld-service.jar"; + private static final String EJB_JAR_CONTRIBUTION = "/repository/helloworld-ejb.jar"; + private static final String EJB_JAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-ejb-w-dep.jar"; + private static final String WAR_CONTRIBUTION = "/repository/helloworld-web.war"; + private static final String WAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-web-w-dep.war"; + private static final String EAR_CONTRIBUTION = "/repository/helloworld-ejb.ear"; + private static final String EAR_NONENHANCED_CONTRIBUTION = "/repository/simple-app-ear.jar"; + private static final String EAR_ENHANCED_16_CONTRIBUTION = "/repository/simple-app.ear"; + private static final String EAR_ENHANCED_19_CONTRIBUTION = "/repository/enhanced-app.ear"; + + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + /** + * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending + * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and + * to get a reference to the contribution service + */ + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * This method tests a non Java EE contribution. + */ + @Test + public void testContributeJAR() throws Exception { + URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + } + + /** + * This method tests an EJB jar as a contribution. + */ + @Test + public void testContributeEJBJAR() throws Exception { + URL contributionLocation = getClass().getResource(EJB_JAR_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + + Contribution contribution = contributionService.getContribution(contributionId); + List<Artifact> artifacts = contribution.getArtifacts(); + for(Artifact artifact : artifacts) { + if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { + Composite composite = (Composite)artifact.getModel(); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); + EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); + Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); + Service service = ejbImpl.getServices().get(0); + Assert.assertEquals("Service name", "HelloworldService", service.getName()); + } + } + } + + /** + * This method tests an EJB jar with sca-contribution.xml as a contribution. + */ + @Test + public void testContributeEJBJARwDeployable() throws Exception { + URL contributionLocation = getClass().getResource(EJB_JAR_W_DEPLOYABLE_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + + Contribution contribution = contributionService.getContribution(contributionId); + List<Artifact> artifacts = contribution.getArtifacts(); + for(Artifact artifact : artifacts) { + if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { + Composite composite = (Composite)artifact.getModel(); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); + EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); + Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); + Service service = ejbImpl.getServices().get(0); + Assert.assertEquals("Service name", "HelloworldService", service.getName()); + } + } + + List<Composite> deployables = contribution.getDeployables(); + Assert.assertEquals("Deployable composites", 1, deployables.size()); + Composite composite = deployables.get(0); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); + EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); + Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); + Service service = ejbImpl.getServices().get(0); + Assert.assertEquals("Service name", "HelloworldService", service.getName()); + } + + /** + * This method tests WAR as a contribution. + */ + @Test + public void testContributeWAR() throws Exception { + URL contributionLocation = getClass().getResource(WAR_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + + Contribution contribution = contributionService.getContribution(contributionId); + List<Artifact> artifacts = contribution.getArtifacts(); + for(Artifact artifact : artifacts) { + if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { + Composite composite = (Composite)artifact.getModel(); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); + WebImplementation webImpl = (WebImplementation) component.getImplementation(); + Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); + List<String> referenceNames = new ArrayList<String>(); + referenceNames.add("name1"); + referenceNames.add("sample.HelloworldEjbServlet_service"); + for(Reference ref : webImpl.getReferences()) { + Assert.assertTrue(referenceNames.contains(ref.getName())); + } + } + } + } + + /** + * This method tests WAR with sca-contribution.xml as a contribution. + */ + @Test + public void testContributeWARwDeployable() throws Exception { + URL contributionLocation = getClass().getResource(WAR_W_DEPLOYABLE_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + + Contribution contribution = contributionService.getContribution(contributionId); + List<Artifact> artifacts = contribution.getArtifacts(); + for(Artifact artifact : artifacts) { + if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { + Composite composite = (Composite)artifact.getModel(); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); + WebImplementation webImpl = (WebImplementation) component.getImplementation(); + Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); + List<String> referenceNames = new ArrayList<String>(); + referenceNames.add("name1"); + referenceNames.add("sample.HelloworldEjbServlet_service"); + for(Reference ref : webImpl.getReferences()) { + Assert.assertTrue(referenceNames.contains(ref.getName())); + } + } + } + + List<Composite> deployables = contribution.getDeployables(); + Assert.assertEquals("Deployable composites", 1, deployables.size()); + Composite composite = deployables.get(0); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); + WebImplementation webImpl = (WebImplementation) component.getImplementation(); + Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); + List<String> referenceNames = new ArrayList<String>(); + referenceNames.add("name1"); + referenceNames.add("sample.HelloworldEjbServlet_service"); + for(Reference ref : webImpl.getReferences()) { + Assert.assertTrue(referenceNames.contains(ref.getName())); + } + } + + /** + * This method test EAR as a contribution. + */ + @Test + public void testContributeEAR() throws Exception { + URL contributionLocation = getClass().getResource(EAR_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(contributionId)); + } + + /** + * This method tests a JAR containing an EAR as a contribution. + * non-enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. + */ + @Ignore + @Test + public void testContributeEAR_NonEnhanced() throws Exception { + URL contributionLocation = getClass().getResource(EAR_NONENHANCED_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Contribution contribution = contributionService.getContribution(contributionId); + Assert.assertNotNull(contribution); + List<Composite> deployables = contribution.getDeployables(); + Assert.assertEquals("Deployable composites", 1, deployables.size()); + Composite composite = deployables.get(0); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); + JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); + Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); + Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); + } + + /** + * This method tests an EAR as a contribution. + * Enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. + */ + @Test + public void testContributeEAR_Enhanced16() throws Exception { + URL contributionLocation = getClass().getResource(EAR_ENHANCED_16_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Contribution contribution = contributionService.getContribution(contributionId); + Assert.assertNotNull(contribution); + List<Composite> deployables = contribution.getDeployables(); + Assert.assertEquals("Deployable composites", 1, deployables.size()); + Composite composite = deployables.get(0); + Assert.assertEquals("Number of components", 1, composite.getComponents().size()); + Component component = composite.getComponents().get(0); + Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); + JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); + Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); + // TODO - TUSCANY-3008 + // Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); + } + + /** + * This method tests an EAR as a contribution. + * Enhanced EAR w application composite containing non-enhanced WAR, non-enhanced EJB JAR. + */ + @Test + public void testContributeEAR_Enhanced19() throws Exception { + URL contributionLocation = getClass().getResource(EAR_ENHANCED_19_CONTRIBUTION); + String contributionId = CONTRIBUTION_001_ID; + contributionService.contribute(contributionId, contributionLocation, false); + Contribution contribution = contributionService.getContribution(contributionId); + Assert.assertNotNull(contribution); + + List<Artifact> artifacts = contribution.getArtifacts(); + for(Artifact artifact : artifacts) { + if(artifact.getURI().toString().equals("META-INF/application.composite")) { + Composite composite = (Composite)artifact.getModel(); + Assert.assertEquals("Number of components", 3, composite.getComponents().size()); + for(Component component : composite.getComponents()) { + if(component.getName().equals("webComponent")) { + Assert.assertTrue(component.getImplementation() instanceof WebImplementation); + WebImplementation webImpl = (WebImplementation)component.getImplementation(); + Assert.assertEquals("Number of references", 1, webImpl.getReferences().size()); + } else if(component.getName().equals("ejbComponent1")) { + Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); + EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); + Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); + Assert.assertEquals("Number of references", 0, ejbImpl.getReferences().size()); + } else if(component.getName().equals("ejbComponent2")) { + Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); + EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); + Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); + Assert.assertEquals("Number of references", 1, ejbImpl.getReferences().size()); + } + } + } + } + } +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java new file mode 100644 index 0000000000..4241b7928f --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java @@ -0,0 +1,110 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class EjbAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * EJB - It's an JEE EAR file that is a contribution + * appcomp - It has an application composite in it + * + */ + @Test + public void testEjbAppcom() throws Exception { + + URL contributionLocation = new File("../contribution-jee-samples/ejb-appcomp-contrib-implicit/target/itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar").toURL(); + Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); + + Assert.assertNotNull(contribution); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + Assert.assertEquals(1, composite.getComponents().size()); + Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getServices().size()); + Assert.assertEquals("HelloworldService", composite.getComponents().get(0).getImplementation().getServices().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java new file mode 100644 index 0000000000..64c31b4393 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java @@ -0,0 +1,124 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import sample.pojo.HelloworldClient2; + + +public class SCAJarEarAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * SCAJAR - It's an SCA contribution in a JAR with no nested archives + * but which references a... + * EAR - It's an JEE EAR file + * appcomp - It has an application composite in it + * + */ + @Test + public void testSCAJarEarAppcomp() throws Exception { + + URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp/target/itest-contribution-jee-samples-41-scajar-ear-appcomp.jar").toURL(); + Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); + + Assert.assertNotNull(contribution); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + domain.getDomainComposite().getIncludes().add(composite); + + Assert.assertEquals(3, composite.getComponents().size()); + Assert.assertEquals(3, composite.getComponents().get(1).getImplementation().getServices().size()); + Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + domain.getCompositeActivator().activate(composite); + domain.getCompositeActivator().start(composite); + + HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); + Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); + + domain.stop(); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java new file mode 100644 index 0000000000..9f50ea573c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java @@ -0,0 +1,125 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import sample.pojo.HelloworldClient2; + + +public class SCAJarEarAppcompWarAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * SCAJAR - It's an SCA contribution in a JAR with no nested archives + * but which references a... + * EAR - It's an JEE EAR file + * appcomp - It has an application composite in it + * WAR - It has a WAR (and and EAR) in it + * appcomp - It has an application composite in it which should be ignored + */ + @Test + public void testSCAJarEarAppcomp() throws Exception { + + URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp-war-appcomp/target/itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp.jar").toURL(); + Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); + + Assert.assertNotNull(contribution); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + domain.getDomainComposite().getIncludes().add(composite); + + Assert.assertEquals(3, composite.getComponents().size()); + Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size()); + Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + domain.getCompositeActivator().activate(composite); + domain.getCompositeActivator().start(composite); + + HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); + Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); + + domain.stop(); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java new file mode 100644 index 0000000000..334f5eca1b --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java @@ -0,0 +1,139 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class SCAJarEarNonenhancedTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + private static final String CONTRIBUTION_002_ID = "contribution002/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + /** + * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending + * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and + * to get a reference to the contribution service + */ + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * SCAJAR - It's an SCA contribution in a JAR with no nested archives + * but which references a... + * EAR - It's an JEE EAR file + * nonenhanced - It has no SCA enhancements. Just a normal EAR + * + */ + @Test + public void testSCAJarEarNonenhanced() throws Exception{ + /* some thoughts about how to preprocess the ear + * as an alternative to relying on the model resolver + * to do contribution processing. + + // Get some things from the extension registry that help us create the + // link between the contribution and the ear that it references + ExtensionPointRegistry registry = domain.getExtensionPointRegistry(); + ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); + Class<? extends ModelResolver> externalEarModelResolver = modelResolvers.getResolver(ExternalEarInfo.class); + + // locate the ear + URL earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); + contributionService.contribute(CONTRIBUTION_001_ID, earLocation, false); + + // find the app info + for (Artifact artifact : contributionService.getContribution(CONTRIBUTION_001_ID).getArtifacts()){ + if (artifact.getModel() instanceof JavaEEApplicationInfo){ + // need to make this model available to the external ear model + // resolver. But how? + } + } + */ + + URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-nonenhanced/target/itest-contribution-jee-samples-35-scajar-ear-nonenhanced.jar").toURL(); + Contribution contribution = contributionService.contribute(CONTRIBUTION_002_ID, contributionLocation, false); + + Assert.assertNotNull(contribution); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + Assert.assertEquals(2, composite.getComponents().size()); + Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size()); + Assert.assertEquals("HelloworldService7Bean_HelloworldService7", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java new file mode 100644 index 0000000000..8ff51ca85a --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java @@ -0,0 +1,112 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class SCAZipEjbAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * SCAJAR - It's an SCA contribution in a JAR with no nested archives + * but which references a... + * EAR - It's an JEE EAR file + * appcomp - It has an application composite in it + * + */ + @Test + 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); + + Assert.assertNotNull(contribution); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + Assert.assertEquals(2, composite.getComponents().size()); + Assert.assertEquals(1, composite.getComponents().get(1).getImplementation().getServices().size()); + Assert.assertEquals("HelloworldServiceBean_HelloworldService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java new file mode 100644 index 0000000000..211f51c9bd --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java @@ -0,0 +1,114 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class SCAZipWarAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * SCAJAR - It's an SCA contribution in a JAR with no nested archives + * but which references a... + * EAR - It's an JEE EAR file + * appcomp - It has an application composite in it + * + */ + // not picking up references correctly + @Ignore + @Test + public void testSCAJarEarNonenhanced() throws Exception { + + 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); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + Assert.assertEquals(1, composite.getComponents().size()); + Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); + Assert.assertEquals("????", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java new file mode 100644 index 0000000000..7696b64f9c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java @@ -0,0 +1,86 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class WARAppcompContribImplicitTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + /** + * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending + * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and + * to get a reference to the contribution service + */ + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * WAR - It's a WAR + * Appcomp - It has an application composite + * Contrib - It's a contribution in it's own right + * Implicit - Composite deployment is implicit + * + */ + @Test + public void testWARAppcompContribImplicit() throws Exception { + 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.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java new file mode 100644 index 0000000000..f54a4f98df --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java @@ -0,0 +1,110 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class WarAppcompTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * EJB - It's an JEE EAR file that is a contribution + * appcomp - It has an application composite in it + * + */ + @Test + public void testEjbAppcom() throws Exception { + + 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); + + Composite composite = null; + for (Artifact artifact : contribution.getArtifacts()){ + if (artifact.getModel() instanceof Composite){ + composite = (Composite) artifact.getModel(); + } + } + + Assert.assertNotNull(composite); + + Assert.assertEquals(1, composite.getComponents().size()); + Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); + Assert.assertEquals("helloworldSca", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); + + domain.buildComposite(composite); + + // assert that the build process has worked + Assert.assertNotNull(composite); + + } + +} diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear Binary files differnew file mode 100644 index 0000000000..11d2a029ec --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar Binary files differnew file mode 100644 index 0000000000..a5b160c875 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear Binary files differnew file mode 100644 index 0000000000..9fb1ed9d14 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar Binary files differnew file mode 100644 index 0000000000..3a704137ed --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar Binary files differnew file mode 100644 index 0000000000..228f4d27d7 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war Binary files differnew file mode 100644 index 0000000000..0b75db2745 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war Binary files differnew file mode 100644 index 0000000000..938ea75941 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar Binary files differnew file mode 100644 index 0000000000..24f55a5f63 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear Binary files differnew file mode 100644 index 0000000000..c912e64237 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear |