Return-Path: 
 <scm-return-12641-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 9619 invoked from network); 1 Jun 2006 03:29:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 1 Jun 2006 03:29:14 -0000
Received: (qmail 62117 invoked by uid 500); 1 Jun 2006 03:29:14 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 61973 invoked by uid 500); 1 Jun 2006 03:29:13 -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 61962 invoked by uid 99); 1 Jun 2006 03:29:13 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 20:29:13 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 20:29:13 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B4F341A983A; Wed, 31 May 2006 20:28:52 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r410730 - in /geronimo/trunk/assemblies:
 j2ee-jetty-server/src/var/config/config.xml
 j2ee-tomcat-server/src/var/config/config.xml
 minimal-jetty-server/src/var/config/config.xml
 minimal-tomcat-server/src/var/config/config.xml
Date: Thu, 01 Jun 2006 03:28:51 -0000
To: scm@geronimo.apache.org
From: jsisson@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060601032852.B4F341A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jsisson
Date: Wed May 31 20:28:51 2006
New Revision: 410730

URL: http://svn.apache.org/viewvc?rev=410730&view=rev
Log:
Geronimo-2058 Merge rev 409499 from 1.1 branch to trunk - Incorrect GBean name in configs.  Server should not start.

Modified:
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/trunk/assemblies/minimal-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=410730&r1=410729&r2=410730&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Wed May 31 20:28:51 2006
@@ -19,7 +19,7 @@
     <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
     </module>
     <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
-        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+        <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=410730&r1=410729&r2=410730&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Wed May 31 20:28:51 2006
@@ -19,7 +19,7 @@
     <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
     </module>
     <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
-        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+        <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>

Modified: geronimo/trunk/assemblies/minimal-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/minimal-jetty-server/src/var/config/config.xml?rev=410730&r1=410729&r2=410730&view=diff
==============================================================================
--- geronimo/trunk/assemblies/minimal-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/minimal-jetty-server/src/var/config/config.xml Wed May 31 20:28:51 2006
@@ -18,7 +18,7 @@
     </module>
     <module name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
     <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
-        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+        <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>

Modified: geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml?rev=410730&r1=410729&r2=410730&view=diff
==============================================================================
--- geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml Wed May 31 20:28:51 2006
@@ -18,7 +18,7 @@
     </module>
     <module name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
     <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
-        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+        <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>