summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-07-15 15:46:01 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-07-15 15:46:01 +0000
commit1a46b03433786252a6a484c49e5d3936f8aca31e (patch)
tree0a34e8a025ebdf40a836a91287e930df5278df9f
parentff5f740f195dbccc18b49365c0226f8da55d232d (diff)
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
-rw-r--r--branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml1
-rw-r--r--branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite2
-rw-r--r--branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml1
-rw-r--r--branches/sca-java-1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite2
-rw-r--r--branches/sca-java-1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java6
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
*
*/