TUSCANY-2978 - Add some more sample archives based on the scenarios here http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Java+EE+Integration

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

3 files changed, 3 insertions, 48 deletions

diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
index fb6cceabf0..d408db67c9 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
@@ -50,6 +50,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
             <version>1.6-SNAPSHOT</version>
+            <type>ejb</type>
             <scope>provided</scope>
         </dependency>
         
@@ -70,11 +71,11 @@
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <modules>
-                        <jarModule>
+                        <ejbModule>
                             <groupId>org.apache.tuscany.sca</groupId>
                             <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
                             <bundleDir>/</bundleDir>
-                        </jarModule>
+                        </ejbModule>
                         <webModule>
                             <groupId>org.apache.tuscany.sca</groupId>
                             <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
deleted file mode 100644
index ccbc1a0f12..0000000000
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
-  <description>simple-app ear</description>
-  <display-name>simple-app ear</display-name>
-  <module>
-    <ejb>ejb-nonenhanced.jar</ejb>
-  </module>
-  <module>
-    <web>
-      <web-uri>war-nonenhanced.war</web-uri>
-      <context-root>/webroot</context-root>
-    </web>
-  </module>
-</application>
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 7e4cfb3577..0000000000
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <moduleId>
-            <groupId>test</groupId>
-            <artifactId>simple-app</artifactId>
-            <version>1.0</version>
-            <type>ear</type>
-        </moduleId>
-    </environment>
-</application>