geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1165535 - in /geronimo/server/trunk/testsuite/corba-testsuite: ./ corba-helloworld/corba-helloworld-ear/ corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/ corba-marshal/corba-marshal-ear/src/main/filtered-resource...
Date Tue, 06 Sep 2011 07:39:26 GMT
Author: xiaming
Date: Tue Sep  6 07:39:26 2011
New Revision: 1165535

URL: http://svn.apache.org/viewvc?rev=1165535&view=rev
Log:
GERONIMO-5458 Reenable corba testsuite

Modified:
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=1165535&r1=1165534&r2=1165535&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
Tue Sep  6 07:39:26 2011
@@ -147,7 +147,7 @@
                             <!-- =============================================================================
-->
                             <!-- These modules must be running before deploying a CORBA
module can be deployed -->
                             <!-- =============================================================================
-->
-                            <execution>
+                            <!--<execution>
                                 <id>start-j2ee-corba-yoko</id>
                                 <phase>pre-integration-test</phase>
                                 <goals>
@@ -166,7 +166,7 @@
                                 <configuration>
                                     <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</moduleId>
                                 </configuration>
-                            </execution>
+                            </execution>-->
 
                             <!-- ======================= -->
                             <!-- Deploy the CORBA module -->

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=1165535&r1=1165534&r2=1165535&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Tue Sep  6 07:39:26 2011
@@ -41,8 +41,7 @@
                 <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>    
                   
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>
@@ -102,14 +101,12 @@
                 <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-corba-yoko</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>client-corba-yoko</dep:artifactId>  
                     
                         <dep:type>car</dep:type>
                     </dep:dependency>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
                       
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=1165535&r1=1165534&r2=1165535&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Tue Sep  6 07:39:26 2011
@@ -41,8 +41,7 @@
                 <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>    
                   
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>
@@ -97,14 +96,12 @@
                 <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-corba-yoko</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>client-corba-yoko</dep:artifactId>  
                     
                         <dep:type>car</dep:type>
                     </dep:dependency>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
                       
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=1165535&r1=1165534&r2=1165535&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Tue Sep  6 07:39:26 2011
@@ -41,8 +41,7 @@
                 <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
-                        <dep:version>${version}</dep:version>
+                        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>    
                   
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=1165535&r1=1165534&r2=1165535&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Tue Sep  6 07:39:26 2011
@@ -39,9 +39,7 @@
     </description>
 
     <modules>
-<!--
         <module>corba-helloworld</module>
--->
         <module>corba-marshal</module>
         <module>corba-mytime</module>
     </modules>



Mime
View raw message