From 1a46b03433786252a6a484c49e5d3936f8aca31e Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 15 Jul 2009 15:46:01 +0000
Subject: TUSCANY-3148 remove version dependency from zip based JEE itests

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794306 13f79535-47bb-0310-9956-ffa450edef68
---
 .../itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml       | 1 +
 .../scazip-ejb-appcomp/src/main/resources/helloworld.composite      | 2 +-
 .../itest/contribution-jee-samples/scazip-war-appcomp/pom.xml       | 1 +
 .../scazip-war-appcomp/src/main/resources/helloworld.composite      | 2 +-
 .../tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java | 6 +++---
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
index cffadddee6..a1ba27f632 100644
--- a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
+++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
@@ -95,6 +95,7 @@
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
index 248c67e3c9..909b8a1484 100644
--- a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
+++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
@@ -28,7 +28,7 @@
     </component>
 
     <component name="HelloworldServiceComponent">
-        <implementation.jee archive="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit-1.6-SNAPSHOT.jar"/>
+        <implementation.jee archive="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar"/>
     </component>
 
 </composite>
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
index 119415855c..021ea52440 100644
--- a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
+++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
@@ -96,6 +96,7 @@
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
index 4285cdf8b2..eaa567595e 100644
--- a/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
+++ b/branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
@@ -23,7 +23,7 @@
            name="Calculator">
 
     <component name="HelloworldServiceComponent">
-        <implementation.jee archive="itest-contribution-jee-samples-6-war-appcomp-contrib-implicit-1.6-SNAPSHOT.jar"/>
+        <implementation.jee archive="itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.jar"/>
     </component>
 
 </composite>
diff --git a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
index 8ff51ca85a..db4d9e5bf6 100644
--- a/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
+++ b/branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
@@ -75,9 +75,9 @@ public class SCAZipEjbAppcompTestCase {
     }
 
     /**
-     * SCAJAR      - It's an SCA contribution in a JAR with no nested archives
-     *               but which references a...
-     * EAR         - It's an JEE EAR file
+     * SCAZIP      - It's an SCA contribution in a ZIP with no nested archive
+     *               but with a reference to an EJB Jar
+     * JAR
      *    appcomp  - It has an application composite in it
      *    
      */
-- 
cgit v1.2.3