Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 151 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6/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/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/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/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/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>