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/11/30 03:41:58 UTC
svn commit: r1040389 - in /geronimo/server/branches/2.1: ./
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/
buildsupport/geronimo-plugin-archetype/src/main/...
Author: rwonly
Date: Tue Nov 30 02:41:57 2010
New Revision: 1040389
URL: http://svn.apache.org/viewvc?rev=1040389&view=rev
Log:
manually upgrade the versions after 2.1.7 release
Added:
geronimo/server/branches/2.1/RELEASE_NOTES-2.1.8-SNAPSHOT.txt
- copied, changed from r1040385, geronimo/server/branches/2.1/RELEASE_NOTES-2.1.7.txt
Removed:
geronimo/server/branches/2.1/RELEASE_NOTES-2.1.7.txt
Modified:
geronimo/server/branches/2.1/README.txt
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml
geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/testset-1/pom.xml
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1/framework/configs/plugin/pom.xml
geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.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
geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/branches/2.1/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/README.txt?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/README.txt (original)
+++ geronimo/server/branches/2.1/README.txt Tue Nov 30 02:41:57 2010
@@ -1,5 +1,5 @@
======================================================
-Apache Geronimo v2.1.7
+Apache Geronimo v##VERSION##
http://geronimo.apache.org/
------------------------------------------------------
@@ -9,7 +9,7 @@ ______________________
Release Notes
======================
- Please read the RELEASE_NOTES-2.1.7.txt for a complete list of new features
+ Please read the RELEASE_NOTES-##VERSION##.txt for a complete list of new features
available in this release.
Copied: geronimo/server/branches/2.1/RELEASE_NOTES-2.1.8-SNAPSHOT.txt (from r1040385, geronimo/server/branches/2.1/RELEASE_NOTES-2.1.7.txt)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/RELEASE_NOTES-2.1.8-SNAPSHOT.txt?p2=geronimo/server/branches/2.1/RELEASE_NOTES-2.1.8-SNAPSHOT.txt&p1=geronimo/server/branches/2.1/RELEASE_NOTES-2.1.7.txt&r1=1040385&r2=1040389&rev=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/RELEASE_NOTES-2.1.7.txt (original)
+++ geronimo/server/branches/2.1/RELEASE_NOTES-2.1.8-SNAPSHOT.txt Tue Nov 30 02:41:57 2010
@@ -1,4 +1,4 @@
-Release Notes -- Apache Geronimo -- Version 2.1.7
+Release Notes -- Apache Geronimo -- Version ##VERSION##
Geronimo URLs
@@ -58,59 +58,27 @@ Plan Creator (added in Geronimo 2.1.2)
the user through a sequence of steps and generates geronimo-web.xml automatically.
-Geronimo 2.1.7 Issues Resolved
+Geronimo ##VERSION## Issues Resolved
------------------------------
** Bug
-GERONIMO-5706 When derby authentication is disabled, DB manager portlet run SQL error: Caused by: java.sql.SQLException: Schema 'DBADMIN' does not exist
-GERONIMO-5695 Upgrade wadi to 2.1.2
-GERONIMO-5693 Encryption logic for connectionPassword attribute in ldap realm
-GERONIMO-5692 Unlock keystore command line utility does not work with Configured Encryption
-GERONIMO-5691 Farming module provision of utilizing encrypted password instead of plain text
-GERONIMO-5690 Clustering module fails to start on disabling JMXService gbean
-GERONIMO-5683 Thread safety for needScanJar(), scanJar(), and scannedJars.add() in GeronimoTldLocationsCache
-GERONIMO-5672 Overriding an env-entry in geronimo-web.xml fails with a DeploymentException
-GERONIMO-5640 Qualified web resource permission for each role should be calculated based its own url set
-GERONIMO-5638 Remove the encrypt(String) method in ConfiguredEncryption
-GERONIMO-5591 Removing the least used and oldest statements from prepared statement cache
-GERONIMO-5590 startup script does not consume --help option
-GERONIMO-5578 incorrect behaviour of security-constraint configuration in web.xml
-GERONIMO-5558 Transaction Commit status is not configured correctly
-GERONIMO-5540 Enable connecting to a ldap server anonymously on console on Geronimo 2.1 and 3.0
-GERONIMO-5530 NullPointerException during MDB deployment
-GERONIMO-5519 Transaction recovery might commit the wrong branch on an XAResource
-GERONIMO-5452 PersistenceUnitBuilder cannot find persistence.xml on inPlace deployments
-GERONIMO-5424 Encrypt truststore pass for tomcat web ssl connector
-GERONIMO-5402 Incorrect instructions to utilize ConfiguredEncryption
-GERONIMO-5401 Geronimo encrypts empty passwords
-GERONIMO-5384 Geronimo console doesn't seem to handle % in sql statements right.
-GERONIMO-5330 env-entry values should not be trimmed
-GERONIMO-5305 DisableMcastInterceptor GBean should disable the mcast receiver also with mcast sender
-GERONIMO-5167 " ERROR [JNDIReferenceFactory] null" when I deploy new JMS Resource Group for Active MQ
-GERONIMO-4757 "java.lang.IllegalStateException" error when use install-plugin goal
-GERONIMO-4217 Check for all data primitive types when shortcutting to the primordial classloader
+
** Improvement
-GERONIMO-5696 Add db2 for iSeries tranql xa connector to server
-GERONIMO-5676 Improve testsuite execution structure in order to be able to run all suites against a manual started server
-GERONIMO-5533 Upgrade to Tomcat 6.0.29
-GERONIMO-5206 Assembly may start failed when server-security-config car is not assembled
-GERONIMO-5196 Add a own authenticator for Spnego login
-GERONIMO-4583 Remove obsolete plugins from plugins group
-GERONIMO-4296 Start Derby NetworkServerControl with credentials to prevent unauthorized shutdowns
+
** New Feature
-GERONIMO-5197 Generic Header based authentication support in geronimo
+
Certification Status
--------------------
-Apache Geronimo v2.1.7 has passed 100% of SUN's Java Enterprise Edition 5.0
+Apache Geronimo v##VERSION## has passed 100% of SUN's Java Enterprise Edition 5.0
Certification Test Suite. See "Distributions" for further details.
Distributions
-------------
-Apache Geronimo v2.1.7 is available in five distributions so you can pick the
+Apache Geronimo v##VERSION## is available in five distributions so you can pick the
one that best fits your environment.
The available distributions are as follows:
@@ -139,8 +107,5 @@ All programming elements of the Java EE
Known Issues and Limitations
----------------------------
** Bug
-GERONIMO-5700 Active MQ Fixes in geronimo for AMQ-1779, AMQ-1431 and AMQ-1760
-GERONIMO-5431 Web Connector portlet does not persist values
-GERONIMO-4861 Deployment Plan XML Parsing - Not add generated namespace names to closing tags
-GERONIMO-4668 Parse XML error after deploying a EJB security jar
+
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=1040389&r1=1040388&r2=1040389&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 Tue Nov 30 02:41:57 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.7/geronimo-cli-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.7/geronimo-commands-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.7/geronimo-deploy-config-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.7/geronimo-deploy-jsr88-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.7/geronimo-deploy-tool-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.7/geronimo-system-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.7/geronimo-plugin-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.7/geronimo-common-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.7/geronimo-crypto-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.8-SNAPSHOT/geronimo-cli-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.8-SNAPSHOT/geronimo-commands-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.8-SNAPSHOT/geronimo-deploy-config-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.8-SNAPSHOT/geronimo-deploy-jsr88-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.8-SNAPSHOT/geronimo-deploy-tool-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.8-SNAPSHOT/geronimo-system-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.8-SNAPSHOT/geronimo-plugin-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.8-SNAPSHOT/geronimo-common-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.8-SNAPSHOT/geronimo-crypto-*.jar
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Nov 30 02:41:57 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.7</geronimoVersion>
+ <geronimoVersion>2.1.8-SNAPSHOT</geronimoVersion>
</properties>
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Tue Nov 30 02:41:57 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.7</geronimoVersion>
+ <geronimoVersion>2.1.8-SNAPSHOT</geronimoVersion>
</properties>
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Nov 30 02:41:57 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.7</geronimoVersion>
+ <geronimoVersion>2.1.8-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Tue Nov 30 02:41:57 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.7</geronimoVersion>
+ <geronimoVersion>2.1.8-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
Modified: geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml Tue Nov 30 02:41:57 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</parent>
<artifactId>${artifactId}</artifactId>
Modified: geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/testset-1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/testset-1/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/testset-1/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/testset-1/pom.xml Tue Nov 30 02:41:57 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>${artifactId}</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</parent>
<artifactId>testset-1</artifactId>
Modified: geronimo/server/branches/2.1/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/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Tue Nov 30 02:41:57 2010
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</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.7</version>
+ <version>2.1.8-SNAPSHOT</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.7</version>
+ <version>2.1.8-SNAPSHOT</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1/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/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Tue Nov 30 02:41:57 2010
@@ -46,7 +46,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</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.7</version>
+ <version>2.1.8-SNAPSHOT</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.7</version>
+ <version>2.1.8-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/branches/2.1/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/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Tue Nov 30 02:41:57 2010
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Modified: geronimo/server/branches/2.1/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/plugin/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/plugin/pom.xml Tue Nov 30 02:41:57 2010
@@ -122,9 +122,9 @@
<plugin-artifact>
<config-xml-content>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.7.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.8-SNAPSHOT.txt</attribute>
<!--<attribute name="userRepositories">~/.m2/repository</attribute>-->
- <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.7</attribute>
+ <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.8-SNAPSHOT</attribute>
</gbean>
</config-xml-content>
</plugin-artifact>
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=1040389&r1=1040388&r2=1040389&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 Tue Nov 30 02:41:57 2010
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -45,7 +45,7 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/2.1.7/car</dependency>
+ <dependency>geronimo/j2ee-server/2.1.8-SNAPSHOT/car</dependency>
<dependency>geronimo/geronimo-daytrader-derby-db/2.1/jar</dependency>
</plugin-artifact>
</plugin>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>client</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
<type>car</type>
</dependency>
</plugin-artifact>
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=1040389&r1=1040388&r2=1040389&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 Tue Nov 30 02:41:57 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.7</dep:version>
+ <dep:version>2.1.8-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=1040389&r1=1040388&r2=1040389&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 Tue Nov 30 02:41:57 2010
@@ -24,7 +24,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>welcome</dep:artifactId>
- <dep:version>2.1.7</dep:version>
+ <dep:version>2.1.8-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml Tue Nov 30 02:41:57 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>enterprise-testsuite</artifactId>
- <version>2.1.7</version>
+ <version>2.1.8-SNAPSHOT</version>
</parent>
<artifactId>ejbcontainer-tests</artifactId>
Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1040389&r1=1040388&r2=1040389&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Nov 30 02:41:57 2010
@@ -34,7 +34,7 @@
<protocol>http</protocol>
<host>localhost</host>
<port>8080</port>
- <uri>/jaxrpc-war-2.1.7/servlet</uri>
+ <uri>/jaxrpc-war-2.1.8-SNAPSHOT/servlet</uri>
</port>
</service-ref>