You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/07/15 18:49:13 UTC

svn commit: r794326 - in /tuscany/branches/sca-java-1.x/itest: contribution-jee-samples/scazip-ejb-appcomp/ contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/ contribution-jee-samples/scazip-war-appcomp/ contribution-jee-samples/scazip-war...

Author: slaws
Date: Wed Jul 15 16:49:12 2009
New Revision: 794326

URL: http://svn.apache.org/viewvc?rev=794326&view=rev
Log:
TUSCANY-3148 remove version dependency from zip based JEE itests

Modified:
    tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
    tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
    tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
    tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
    tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java

Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml?rev=794326&r1=794325&r2=794326&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml Wed Jul 15 16:49:12 2009
@@ -95,6 +95,7 @@
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>

Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite?rev=794326&r1=794325&r2=794326&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite Wed Jul 15 16:49:12 2009
@@ -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>

Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml?rev=794326&r1=794325&r2=794326&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml Wed Jul 15 16:49:12 2009
@@ -96,6 +96,7 @@
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>

Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite?rev=794326&r1=794325&r2=794326&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite Wed Jul 15 16:49:12 2009
@@ -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>

Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java?rev=794326&r1=794325&r2=794326&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java Wed Jul 15 16:49:12 2009
@@ -75,9 +75,9 @@
     }
 
     /**
-     * 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
      *    
      */