TUSCANY-2935 Integration tests for Java EE contribution processing

 o Adding more needed dependencies
 o Not enabling the module contribution-jee in itests since it will required OPENEJB-1005 be resolved for the tests to run successfully on Windows.

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

3 files changed, 14 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/itest/contribution-jee/pom.xml b/branches/sca-java-1.x/itest/contribution-jee/pom.xml
index b8e0db8a04..83f4a220a7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/pom.xml
+++ b/branches/sca-java-1.x/itest/contribution-jee/pom.xml
@@ -62,6 +62,12 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.5-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>
@@ -94,5 +100,11 @@
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
             <version>1.0.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
index 240fb103bd..f57337ca93 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
@@ -231,7 +231,6 @@ public class ContributionServiceTestCase {
      * This method test EAR as a contribution.
      */
     @Test
-    @Ignore
     public void testContributeEAR() throws Exception {
         URL contributionLocation = getClass().getResource(EAR_CONTRIBUTION);
         String contributionId = CONTRIBUTION_001_ID;
diff --git a/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml b/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml
index 5661b3ebfe..2a55908944 100644
--- a/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml
+++ b/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml
@@ -66,13 +66,13 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <version>3.0</version>
+            <version>3.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-jee</artifactId>
-            <version>3.0</version>
+            <version>3.0.1</version>
         </dependency>
 
         <dependency>