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/12 04:56:53 UTC
svn commit: r933078 - in /geronimo/server/branches/2.1:
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
framework/modules/geronimo-plugin/src/test/resources/
framework/modules/geronimo-upgrade/src/test/resources/
plugins/remote-deploy/ge...
Author: rwonly
Date: Mon Apr 12 02:56:53 2010
New Revision: 933078
URL: http://svn.apache.org/viewvc?rev=933078&view=rev
Log:
upgrade some versions manually from 2.1.5 to 2.1.6-SNAPSHOT after 2.1.5 release
Modified:
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Mon Apr 12 02:56:53 2010
@@ -60,12 +60,12 @@ main is org.apache.geronimo.gshell.cli.M
load ${gshell.home}/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-*.jar
load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-*.jar
load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.5/geronimo-cli-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.5/geronimo-commands-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.5/geronimo-deploy-config-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.5/geronimo-deploy-jsr88-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.5/geronimo-deploy-tool-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.5/geronimo-system-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.5/geronimo-plugin-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.5/geronimo-common-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.5/geronimo-crypto-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.6-SNAPSHOT/geronimo-cli-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.6-SNAPSHOT/geronimo-commands-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.6-SNAPSHOT/geronimo-deploy-config-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.6-SNAPSHOT/geronimo-deploy-jsr88-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.6-SNAPSHOT/geronimo-deploy-tool-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.6-SNAPSHOT/geronimo-system-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.6-SNAPSHOT/geronimo-plugin-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.6-SNAPSHOT/geronimo-common-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.6-SNAPSHOT/geronimo-crypto-*.jar
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Mon Apr 12 02:56:53 2010
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.5</version>
+ <version>2.1.6-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -45,7 +45,7 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/2.1.5/car</dependency>
+ <dependency>geronimo/j2ee-server/2.1.6-SNAPSHOT/car</dependency>
<dependency>geronimo/geronimo-daytrader-derby-db/2.0-SNAPSHOT/jar</dependency>
</plugin-artifact>
</plugin>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.5</version>
+ <version>2.1.6-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>client</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml Mon Apr 12 02:56:53 2010
@@ -18,7 +18,7 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
configId="hello"
- parentId="geronimo/j2ee-security/2.1.5/car">
+ parentId="geronimo/j2ee-security/2.1.6-SNAPSHOT/car">
<gbean name="hello-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
@@ -27,10 +27,10 @@
<name>hello-login-chain</name>
</reference>
<reference name="ServerInfo">
- <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/2.1.5/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/2.1.6-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
</reference>
<reference name="LoginService">
- <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/2.1.5/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/2.1.6-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
</reference>
</gbean>
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml Mon Apr 12 02:56:53 2010
@@ -28,7 +28,7 @@
<dep:dependency>
<dep:groupId>geronimo</dep:groupId>
<dep:artifactId>j2ee-security</dep:artifactId>
- <dep:version>2.1.5</dep:version>
+ <dep:version>2.1.6-SNAPSHOT</dep:version>
<dep:type>car</dep:type>
</dep:dependency>
</dep:dependencies>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Mon Apr 12 02:56:53 2010
@@ -26,7 +26,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>geronimo-remote-deploy</dep:artifactId>
- <dep:version>2.1.5</dep:version>
+ <dep:version>2.1.6-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?rev=933078&r1=933077&r2=933078&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Mon Apr 12 02:56:53 2010
@@ -24,7 +24,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>welcome</dep:artifactId>
- <dep:version>2.1.5</dep:version>
+ <dep:version>2.1.6-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>