summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml103
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite48
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml103
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite62
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite49
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml90
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java31
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java40
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite35
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml32
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml22
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java40
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite35
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml32
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java50
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml32
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite49
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml32
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java36
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java24
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml60
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java31
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html46
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java28
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java39
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite40
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java28
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java39
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite40
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml72
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml24
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml135
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml24
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml136
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml66
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java66
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml49
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite36
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html50
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml66
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java63
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml49
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html50
90 files changed, 4095 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
new file mode 100644
index 0000000000..74687aedbf
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..32aa604cba
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
new file mode 100644
index 0000000000..90872041b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
new file mode 100644
index 0000000000..57054b4a5d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
new file mode 100644
index 0000000000..e7ea217b2a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/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-11-ejb-appcomp-contrib-explicit</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 11</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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..73d816311f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+@Remote
+public interface HelloworldService {
+ String getGreetings(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
new file mode 100644
index 0000000000..19879d9c42
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/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.ComponentName;
+
+/**
+ * HelloworldService EJB implementation with no SCA enhancement
+
+ */
+@Stateless
+public class HelloworldServiceBean implements HelloworldService {
+
+ @ComponentName
+ protected String componentName;
+
+ public String getGreetings(String name) {
+ String greeting = componentName+" says, Hello " + name;
+ System.out.println(greeting);
+ return greeting;
+ }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
new file mode 100644
index 0000000000..a6701d36cb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/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="itest-contribution-jee-samples-11">
+
+ <component name="HelloworldServiceEJBComponent">
+ <implementation.ejb ejb-link="HelloworldServiceBean"/>
+ <service name="HelloworldService">
+ <interface.java interface="sample.ejb3.HelloworldService"/>
+ <binding.sca/>
+ <!--binding.ws uri="http://alexander:8080/tuscany/HelloworldService11"/-->
+ </service>
+ </component>
+
+ <!--service name="TheService" promote="HelloworldServiceComponent/HelloworldService"/-->
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
new file mode 100644
index 0000000000..13a375bc0b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/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-11-ejb-appcomp-contrib-explicit</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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..74f92c024b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sample="http://sample">
+ <deployable composite="sample:itest-contribution-jee-samples-11" />
+</contribution> \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..1bf1c63799
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
new file mode 100644
index 0000000000..44a0b85dc2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
new file mode 100644
index 0000000000..b5224a2319
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
new file mode 100644
index 0000000000..e5e9fe6a82
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
new file mode 100644
index 0000000000..a6d7f2dd04
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
new file mode 100644
index 0000000000..90872041b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
new file mode 100644
index 0000000000..29690543e8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
new file mode 100644
index 0000000000..4df5cd37de
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
new file mode 100644
index 0000000000..41ecddb62e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
new file mode 100644
index 0000000000..403ead623c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
new file mode 100644
index 0000000000..97242bff96
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.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;
+
+/**
+ * Another HelloworldService EJB implementation with no SCA enhancement
+ * A test for TUSCANY-3198
+ */
+@Stateless
+public class HelloworldService7aBean 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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml
new file mode 100644
index 0000000000..f32ff8f6ab
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
new file mode 100644
index 0000000000..5a08769550
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
new file mode 100644
index 0000000000..265af5b3a0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
new file mode 100644
index 0000000000..81793e47e6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml
new file mode 100644
index 0000000000..a1a80f047c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml
@@ -0,0 +1,60 @@
+<?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>scajar-ejb-nonenhanced</module>
+ <module>scazip-ejb-appcomp</module>
+ <module>scazip-war-appcomp</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml
new file mode 100644
index 0000000000..15eaa7f3f3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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-11-client</artifactId>
+ <name>JEE Integration Samples :: Sample 11 Client</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>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.1</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>
+ <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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
new file mode 100644
index 0000000000..43870422c0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
@@ -0,0 +1,72 @@
+/*
+ * 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.servlet.ServletConfig;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+/**
+ * A servlet that invokes Helloworld SCA service through injected references.
+ *
+ */
+public class HelloworldServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ @Reference(name="service")
+ protected HelloworldService service;
+
+ @ComponentName
+ protected String scaComponentName;
+
+ @Override
+ public void init(ServletConfig config) {
+ // This method assumes that componentContext is injected.
+ }
+
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+ String name = request.getParameter("name");
+ String greeting0 = service.getGreetings(name);
+
+ Writer out = response.getWriter();
+ out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample 11 Client</title></head><body>");
+ out.write("<h2>Apache Tuscany Helloworld Servlet Sample 11 Client</h2>");
+ out.write("<h3>SCA Service provided by EJB</h3>");
+ out.write("<br>Reference injected. <br><strong>Result: </strong>" + greeting0);
+ out.write("<hr>");
+
+ out.write("<h3>@ComponentName</h3>");
+ out.write("<br>Injected into field: "+scaComponentName);
+ out.write("<hr>");
+ out.write("</body></html>");
+ out.flush();
+ out.close();
+ }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..73d816311f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+@Remote
+public interface HelloworldService {
+ String getGreetings(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..1f4d7195c0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,33 @@
+<?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>itest-contribution-jee-samples-11-client</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </moduleId>
+ <dependencies/>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <context-root>/itest-contribution-jee-samples-11-client</context-root>
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..b284b201e4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.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:xsd="http://www.w3.org/2001/XMLSchema"
+ name="itest-contribution-jee-samples-11-client">
+
+ <component name="sample-11-client">
+ <implementation.web web-uri="itest-contribution-jee-samples-11-client.war"/>
+ <reference name="service" target="HelloworldServiceEJBComponent">
+ <interface.java interface="sample.ejb3.HelloworldService"/>
+ <binding.sca/>
+ </reference>
+ </component>
+</composite>
+
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..1947a53cf0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/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>JEE Samples :: Sample 11 Client</display-name>
+
+ <servlet>
+ <servlet-name>HelloworldServlet</servlet-name>
+ <servlet-class>sample.HelloworldServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloworldServlet</servlet-name>
+ <url-pattern>/HelloworldServlet</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>hello.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
new file mode 100644
index 0000000000..bba288b4aa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
@@ -0,0 +1,46 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<html>
+
+<head>
+<title>Apache Tuscany Helloworld Servlet Sample 11 Client</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Servlet Sample 11 Client</h2>
+
+<form action="HelloworldServlet" 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">Submit</button>
+ </td>
+ </tr>
+ </table>
+</form>
+
+</body>
+</html>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
new file mode 100644
index 0000000000..7852f46dd3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
new file mode 100644
index 0000000000..306b27fd5c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..8f8d46ccd7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
new file mode 100644
index 0000000000..d13e11262c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..79c9dd3243
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
new file mode 100644
index 0000000000..258e7c73d1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-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-44-scajar-ejb-nonenhanced</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 44</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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
new file mode 100644
index 0000000000..6f37c9b272
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
new file mode 100644
index 0000000000..a38c4a773f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..5fa7cda269
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-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-07-ejb-nonenhanced.jar"/>
+ </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
new file mode 100644
index 0000000000..bdbe79a46d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
new file mode 100644
index 0000000000..417a97c087
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-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-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>
+ <stripVersion>true</stripVersion>
+ </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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..909b8a1484
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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.jar"/>
+ </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
new file mode 100644
index 0000000000..bdbe79a46d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
new file mode 100644
index 0000000000..5965b2aaa8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
@@ -0,0 +1,136 @@
+<?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>
+ <stripVersion>true</stripVersion>
+ </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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..eaa567595e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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.jar"/>
+ </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..4129a0702b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
new file mode 100644
index 0000000000..69473543c9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
new file mode 100644
index 0000000000..26f996bd6a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
new file mode 100644
index 0000000000..71055bbdfe
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..628588a974
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
new file mode 100644
index 0000000000..69473543c9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.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>