You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/06/07 19:08:05 UTC
svn commit: r952335 - in /geronimo/server/trunk: plugingroups/client/
plugingroups/client/src/main/history/
testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/
testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/
Author: gawor
Date: Mon Jun 7 17:08:05 2010
New Revision: 952335
URL: http://svn.apache.org/viewvc?rev=952335&view=rev
Log:
install client-corba-yoko plugin
Modified:
geronimo/server/trunk/plugingroups/client/pom.xml
geronimo/server/trunk/plugingroups/client/src/main/history/dependencies.xml
geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
Modified: geronimo/server/trunk/plugingroups/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/pom.xml?rev=952335&r1=952334&r2=952335&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/client/pom.xml Mon Jun 7 17:08:05 2010
@@ -38,12 +38,12 @@
</description>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>client-corba-yoko</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-corba-yoko</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugingroups/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/src/main/history/dependencies.xml?rev=952335&r1=952334&r2=952335&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/client/src/main/history/dependencies.xml Mon Jun 7 17:08:05 2010
@@ -8,6 +8,11 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-deployer</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=952335&r1=952334&r2=952335&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Mon Jun 7 17:08:05 2010
@@ -97,28 +97,6 @@
<artifactId>geronimo-maven-plugin</artifactId>
<executions>
- <!-- These modules must be running before deploying a CORBA module can be deployed -->
- <execution>
- <id>start-j2ee-corba-yoko</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
- </configuration>
- </execution>
- <execution>
- <id>openejb-corba-deployer</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</moduleId>
- </configuration>
- </execution>
-
<!-- Deploy the CORBA module -->
<execution>
<id>deploy-ear</id>
Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=952335&r1=952334&r2=952335&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Mon Jun 7 17:08:05 2010
@@ -149,30 +149,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
<executions>
-
- <!-- These two modules must be running before a CORBA module can be deployed -->
- <execution>
- <id>start-j2ee-corba-yoko</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
- </configuration>
- </execution>
- <execution>
- <id>openejb-corba-deployer</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car
- </moduleId>
- </configuration>
- </execution>
-
<!-- Deploy the CORBA module -->
<execution>
<id>deploy-ear</id>
@@ -181,8 +157,7 @@
<goal>deploy-module</goal>
</goals>
<configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear
- </moduleArchive>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
</configuration>
</execution>