You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/06/16 13:45:47 UTC
svn commit: r955207 - in /geronimo/server/branches/2.1.6: ./
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/
framework/configs/geronimo-gbean-d...
Author: rickmcguire
Date: Wed Jun 16 11:45:46 2010
New Revision: 955207
URL: http://svn.apache.org/viewvc?rev=955207&view=rev
Log:
some release prep work
Modified:
geronimo/server/branches/2.1.6/README.txt
geronimo/server/branches/2.1.6/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1.6/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1.6/pom.xml
Modified: geronimo/server/branches/2.1.6/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/README.txt?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/README.txt (original)
+++ geronimo/server/branches/2.1.6/README.txt Wed Jun 16 11:45:46 2010
@@ -1,5 +1,5 @@
======================================================
-Apache Geronimo v2.1.5
+Apache Geronimo v2.1.6
http://geronimo.apache.org/
------------------------------------------------------
@@ -9,7 +9,7 @@ ______________________
Release Notes
======================
- Please read the RELEASE_NOTES-2.1.5.txt for a complete list of new features
+ Please read the RELEASE_NOTES-2.1.6.txt for a complete list of new features
available in this release.
Modified: geronimo/server/branches/2.1.6/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1.6/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Wed Jun 16 11:45:46 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/geronimo-cli-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.6/geronimo-commands-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.6/geronimo-deploy-config-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.6/geronimo-deploy-jsr88-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.6/geronimo-deploy-tool-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.6/geronimo-system-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.6/geronimo-plugin-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.6/geronimo-common-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.6/geronimo-crypto-*.jar
Modified: geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Wed Jun 16 11:45:46 2010
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>car</type>
</module-id>
<dependency start="false">
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -56,7 +56,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -110,7 +110,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Wed Jun 16 11:45:46 2010
@@ -25,7 +25,7 @@ specific services - those should be prov
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>car</type>
</moduleId>
<dependencies>
@@ -46,7 +46,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -60,7 +60,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -123,7 +123,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Wed Jun 16 11:45:46 2010
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Modified: geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Wed Jun 16 11:45:46 2010
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.5</version>
+ <version>2.1.6</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.5</version>
+ <version>2.1.6</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</version>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml (original)
+++ geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml Wed Jun 16 11:45:46 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/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/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/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
</reference>
</gbean>
Modified: geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml (original)
+++ geronimo/server/branches/2.1.6/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml Wed Jun 16 11:45:46 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</dep:version>
<dep:type>car</dep:type>
</dep:dependency>
</dep:dependencies>
Modified: geronimo/server/branches/2.1.6/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.6/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Wed Jun 16 11:45:46 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</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1.6/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Wed Jun 16 11:45:46 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</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1.6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/pom.xml?rev=955207&r1=955206&r2=955207&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/pom.xml (original)
+++ geronimo/server/branches/2.1.6/pom.xml Wed Jun 16 11:45:46 2010
@@ -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>${version}</version>
+ <version>2.1.6</version>
<!-- This property is required by the car:package mojo -->
<geronimoVersion>${version}</geronimoVersion>