You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/04/06 13:31:02 UTC
svn commit: r931094 [4/6] - in /geronimo/server/branches/2.1: ./ assemblies/
assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-framework/
assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-minimal/
assemblies/geronimo-tomcat6-jav...
Modified: geronimo/server/branches/2.1/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/openjpa/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/openjpa/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>openjpa</artifactId>
Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>plancreator-console-jetty</artifactId>
Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>plancreator-console-tomcat</artifactId>
Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plancreator</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>plancreator-portlets</artifactId>
@@ -146,9 +146,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/branches/2.1/plugins/plancreator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>plancreator</artifactId>
Modified: geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>geronimo-pluto</artifactId>
Modified: geronimo/server/branches/2.1/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pluto/pluto-support/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/pluto/pluto-support/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>pluto-support</artifactId>
Modified: geronimo/server/branches/2.1/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pluto/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pluto/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/pluto/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>pluto</artifactId>
Modified: geronimo/server/branches/2.1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
Modified: geronimo/server/branches/2.1/plugins/procrun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/procrun/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/procrun/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/procrun/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
@@ -39,7 +39,7 @@
Provides a Windows service wrapper with Apache Commons Daemon procrun for Geronimo.
</description>
- <dependencies/>
+ <dependencies />
<build>
<plugins>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>geronimo-remote-deploy</artifactId>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>remote-deploy</artifactId>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-jetty/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/sharedlib/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/sharedlib/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/sharedlib/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
@@ -66,10 +66,10 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.outputDirectory}"/>
+ <mkdir dir="${project.build.outputDirectory}" />
<copy todir="${project.build.outputDirectory}">
<fileset dir="src/main/resources">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/branches/2.1/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/spring/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/spring/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/spring/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/geronimo-derby/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/geronimo-derby/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>system-database</artifactId>
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>sysdb-console-jetty</artifactId>
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>sysdb-console-tomcat</artifactId>
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>sysdb-portlets</artifactId>
@@ -145,9 +145,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/branches/2.1/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/system-database/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/system-database/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
@@ -157,13 +157,13 @@
</goals>
<configuration>
<tasks>
- <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml"/>
+ <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml" />
<copy todir="${project.build.directory}/var/catalina/webapps">
<fileset dir="src/test/resources/deployables">
- <include name="war1/**"/>
- <include name="war3/**"/>
- <include name="war4/**"/>
- <include name="war6-jee5/**"/>
+ <include name="war1/**" />
+ <include name="war3/**" />
+ <include name="war4/**" />
+ <include name="war6-jee5/**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>tomcat</artifactId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
@@ -70,7 +70,7 @@
<category>Tomcat</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
@@ -127,8 +127,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-no-ha/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-no-ha/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-no-ha/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/uddi/geronimo-uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/geronimo-uddi-db/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/geronimo-uddi-db/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/geronimo-uddi-db/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>geronimo-uddi-db</artifactId>
@@ -49,8 +49,8 @@
</goals>
<configuration>
<tasks>
- <delete dir="${derby.system.home}"/>
- <mkdir dir="${derby.system.home}"/>
+ <delete dir="${derby.system.home}" />
+ <mkdir dir="${derby.system.home}" />
</tasks>
</configuration>
</execution>
Modified: geronimo/server/branches/2.1/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>uddi</artifactId>
Modified: geronimo/server/branches/2.1/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-server</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>geronimo-uddi-server</artifactId>
Modified: geronimo/server/branches/2.1/plugins/uddi/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/uddi-server/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/uddi-server/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/uddi-server/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>uddi-server</artifactId>
Modified: geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-jetty6/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-jetty6/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-server</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/uddi/uddi-server/uddi-tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-server</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices-builder/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>webservices</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/webservices/geronimo-webservices/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>webservices</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/2.1/plugins/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/webservices/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>webservices</artifactId>
Modified: geronimo/server/branches/2.1/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/webservices-common/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/webservices/webservices-common/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>webservices</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>welcome</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>geronimo-welcome</artifactId>
Modified: geronimo/server/branches/2.1/plugins/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>welcome</artifactId>
Modified: geronimo/server/branches/2.1/plugins/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/welcome-jetty/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/welcome-jetty/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>welcome</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/plugins/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/welcome-tomcat/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/welcome-tomcat/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>welcome</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Apr 6 11:30:53 2010
@@ -33,7 +33,7 @@
<name>Geronimo</name>
<packaging>pom</packaging>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
<description>
Apache Geronimo, the JavaEE server project of the Apache Software Foundation.
@@ -53,9 +53,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/branches/2.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/branches/2.1</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/server/branches/2.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/geronimo/server/tags/geronimo-2.1.5</url>
</scm>
<properties>
@@ -69,7 +69,7 @@
element, and it will need to be changed manually before a release,
as the maven-release-plugin will not update this value.
-->
- <version>2.1.5-SNAPSHOT</version>
+ <version>${version}</version>
<!-- This property is required by the car:package mojo -->
<geronimoVersion>${version}</geronimoVersion>
Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Tue Apr 6 11:30:53 2010
@@ -18,15 +18,14 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>repository</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>commands-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>deploy</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>commands-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>gshell</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml Tue Apr 6 11:30:53 2010
@@ -15,14 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>commands-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>jaxws</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>commands-testsuite</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/shutdown/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/shutdown/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/shutdown/pom.xml Tue Apr 6 11:30:53 2010
@@ -15,14 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>commands-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>shutdown</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>console-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>advanced</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/basic/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/basic/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>console-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>basic</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/pom.xml Tue Apr 6 11:30:53 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>console-testsuite</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>corba-helloworld</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>corba-helloworld-client</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>corba-helloworld</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>corba-helloworld-ear</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml Tue Apr 6 11:30:53 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>corba-helloworld</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>corba-helloworld-ejb</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>corba-helloworld</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>corba-helloworld-war</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/pom.xml Tue Apr 6 11:30:53 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>corba-testsuite</artifactId>
- <version>2.1.5-SNAPSHOT</version>
+ <version>2.1.5</version>
</parent>
<artifactId>corba-helloworld</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Tue Apr 6 11:30:53 2010
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-marshal</artifactId>
- <version>2.1.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-marshal-client</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
- <packaging>jar</packaging>
- <description>Example using CORBA to access a stateless EJB</description>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-marshal-ejb</artifactId>
- <version>${version}</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>child</id>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>
- <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>corba-marshal</artifactId>
+ <version>2.1.5</version>
+ </parent>
+
+ <artifactId>corba-marshal-client</artifactId>
+ <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
+ <packaging>jar</packaging>
+ <description>Example using CORBA to access a stateless EJB</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>corba-marshal-ejb</artifactId>
+ <version>${version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>child</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>
+ <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
+</project>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Tue Apr 6 11:30:53 2010
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-marshal</artifactId>
- <version>2.1.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-marshal-ear</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EAR</name>
- <packaging>ear</packaging>
- <description>Example using CORBA to access a stateless EJB</description>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
-
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-marshal-ejb</artifactId>
- <version>${version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-marshal-client</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>child</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <version>${version}</version>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>install</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- <!--
- Merging the configuration of this plugin with the one it inherits.
- Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
- -->
- <configuration>
- <grandParent>true</grandParent>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <description>Geronimo Marshal Enterprise Application EAR</description>
- <displayName>Geronimo Marshal Enterprise Application EAR</displayName>
- <version>5</version>
- <modules>
- <ejbModule>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-marshal-ejb</artifactId>
- <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
- </ejbModule>
- <jarModule>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-marshal-client</artifactId>
- <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
- </jarModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- Deploy the ear and invoke the imbedded CORBA app client -->
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <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/${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/${version}/car</moduleId>
- </configuration>
- </execution>
-
- <!-- Deploy the CORBA module -->
- <execution>
- <id>deploy-ear</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <!-- Invoke the CORBA app client -->
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
- <!--
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- -->
- </configuration>
- </execution>
-
- <!-- Undeploy the CORBA module -->
- <execution>
- <id>undeploy-ear</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>corba-marshal</artifactId>
+ <version>2.1.5</version>
+ </parent>
+
+ <artifactId>corba-marshal-ear</artifactId>
+ <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EAR</name>
+ <packaging>ear</packaging>
+ <description>Example using CORBA to access a stateless EJB</description>
+
+ <properties>
+ <clientLogFile>${basedir}/target/client.log</clientLogFile>
+ </properties>
+
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>corba-marshal-ejb</artifactId>
+ <version>${version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>corba-marshal-client</artifactId>
+ <version>${version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>child</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>install</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ <!--
+ Merging the configuration of this plugin with the one it inherits.
+ Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+ -->
+ <configuration>
+ <grandParent>true</grandParent>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <description>Geronimo Marshal Enterprise Application EAR</description>
+ <displayName>Geronimo Marshal Enterprise Application EAR</displayName>
+ <version>5</version>
+ <modules>
+ <ejbModule>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>corba-marshal-ejb</artifactId>
+ <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
+ </ejbModule>
+ <jarModule>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>corba-marshal-client</artifactId>
+ <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
+ </jarModule>
+ </modules>
+ </configuration>
+ </plugin>
+
+ <!-- Deploy the ear and invoke the imbedded CORBA app client -->
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <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/${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/${version}/car</moduleId>
+ </configuration>
+ </execution>
+
+ <!-- Deploy the CORBA module -->
+ <execution>
+ <id>deploy-ear</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <!-- Invoke the CORBA app client -->
+ <execution>
+ <phase>pre-integration-test</phase>
+ <id>run-client</id>
+ <goals>
+ <goal>run-client</goal>
+ </goals>
+ <configuration>
+ <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
+ <!--
+ <logOutput>true</logOutput>
+ <logFile>${clientLogFile}</logFile>
+ -->
+ </configuration>
+ </execution>
+
+ <!-- Undeploy the CORBA module -->
+ <execution>
+ <id>undeploy-ear</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
+</project>
Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=931094&r1=931093&r2=931094&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml Tue Apr 6 11:30:53 2010
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-marshal</artifactId>
- <version>2.1.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-marshal-ejb</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>
- <packaging>ejb</packaging>
- <description>Geronimo Marshal Enterprise Stateless EJB</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>corba-marshal</artifactId>
+ <version>2.1.5</version>
+ </parent>
+
+ <artifactId>corba-marshal-ejb</artifactId>
+ <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>
+ <packaging>ejb</packaging>
+ <description>Geronimo Marshal Enterprise Stateless EJB</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>