Return-Path: 
 <scm-return-47906-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 45A869D50
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Sun, 18 Dec 2011 08:40:57 +0000 (UTC)
Received: (qmail 57222 invoked by uid 500); 18 Dec 2011 08:40:56 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 57185 invoked by uid 500); 18 Dec 2011 08:40:54 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 57178 invoked by uid 99); 18 Dec 2011 08:40:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 08:40:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 08:40:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E4C20238899C;
	Sun, 18 Dec 2011 08:40:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1220355 - in /geronimo/server/branches/2.1:
 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-deplo...
Date: Sun, 18 Dec 2011 08:40:28 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111218084028.E4C20238899C@eris.apache.org>

Author: xiaming
Date: Sun Dec 18 08:40:27 2011
New Revision: 1220355

URL: http://svn.apache.org/viewvc?rev=1220355&view=rev
Log:
More hard coded version updates for G 2.1.8 release

Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
    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/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
    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/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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -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.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
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.8/geronimo-cli-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.8/geronimo-commands-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.8/geronimo-deploy-config-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.8/geronimo-deploy-jsr88-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.8/geronimo-deploy-tool-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.8/geronimo-system-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.8/geronimo-plugin-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.8/geronimo-common-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.8/geronimo-crypto-*.jar

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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -44,7 +44,7 @@
         <dependency start="false">
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
-            <version>2.1.8-SNAPSHOT</version>
+            <version>2.1.8</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.8-SNAPSHOT</version>
+            <version>2.1.8</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.8-SNAPSHOT</version>
+            <version>2.1.8</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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -46,7 +46,7 @@ specific services - those should be prov
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-common</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</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.8-SNAPSHOT</version>
+        <version>2.1.8</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.8-SNAPSHOT</version>
+        <version>2.1.8</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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -53,7 +53,7 @@
         <dependency start="false">
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>2.1.8-SNAPSHOT</version>
+            <version>2.1.8</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=1220355&r1=1220354&r2=1220355&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/plugin/pom.xml Sun Dec 18 08:40:27 2011
@@ -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.8-SNAPSHOT.txt</attribute>
+                                    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.8.txt</attribute>
                                     <!--<attribute name="userRepositories">~/.m2/repository</attribute>-->
-                                    <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.8-SNAPSHOT</attribute>
+                                    <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.8</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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -29,7 +29,7 @@
                 <type>car</type>
             </module-id>
             <geronimo-versions>
-                <version>2.1.8-SNAPSHOT</version>
+                <version>2.1.8</version>
             </geronimo-versions>
             <prerequisite>
                 <id>
@@ -45,7 +45,7 @@
                     from another Tomcat Geronimo installation.
                 </description>
             </prerequisite>
-            <dependency>geronimo/j2ee-server/2.1.8-SNAPSHOT/car</dependency>
+            <dependency>geronimo/j2ee-server/2.1.8/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.8-SNAPSHOT</version>
+                <version>2.1.8</version>
             </geronimo-versions>
             <prerequisite>
                 <id>
@@ -81,7 +81,7 @@
             <dependency>
                 <groupId>geronimo</groupId>
                 <artifactId>client</artifactId>
-                <version>2.1.8-SNAPSHOT</version>
+                <version>2.1.8</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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -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.8-SNAPSHOT</dep:version>
+        <dep:version>2.1.8</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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -24,7 +24,7 @@
     <dep:moduleId>
       <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
       <dep:artifactId>welcome</dep:artifactId>
-      <dep:version>2.1.8-SNAPSHOT</dep:version>
+      <dep:version>2.1.8</dep:version>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>

Modified: geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=1220355&r1=1220354&r2=1220355&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Sun Dec 18 08:40:27 2011
@@ -271,7 +271,7 @@ deploy.[bat|sh] deploy MyWebApp-1.0.war<
             <img src="<%=request.getContextPath()%>/images/powered_by_100x30.gif" alt="Powered by Geronimo"/>
             </font><br />
             &nbsp;
-            <font size=-1>Copyright &copy; 2003-2010 Apache Software Foundation</font><br />
+            <font size=-1>Copyright &copy; 2003-2011 Apache Software Foundation</font><br />
             <font size=-1>All Rights Reserved</font> <br />
             &nbsp;</p>
             <p align="right">&nbsp;</p>

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=1220355&r1=1220354&r2=1220355&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 Sun Dec 18 08:40:27 2011
@@ -34,7 +34,7 @@
       <protocol>http</protocol>
       <host>localhost</host>
       <port>8080</port>
-      <uri>/jaxrpc-war-2.1.8-SNAPSHOT/servlet</uri>
+      <uri>/jaxrpc-war-2.1.8/servlet</uri>
    </port>
  </service-ref>