Return-Path: 
 <scm-return-8207-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 65571 invoked from network); 18 Oct 2005 19:33:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Oct 2005 19:33:35 -0000
Received: (qmail 46614 invoked by uid 500); 18 Oct 2005 19:33:35 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 46589 invoked by uid 500); 18 Oct 2005 19:33:34 -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 46578 invoked by uid 99); 18 Oct 2005 19:33:34 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Oct 2005 12:33:34 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 18 Oct 2005 12:33:34 -0700
Received: (qmail 65362 invoked by uid 65534); 18 Oct 2005 19:33:13 -0000
Message-ID: <20051018193313.65361.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r326210 - in
 /geronimo/trunk/modules/assembly/src/var/config:
 config.jetty.list config.jetty.xml config.list config.tomcat.list
 config.tomcat.xml
Date: Tue, 18 Oct 2005 19:33:12 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Tue Oct 18 12:33:08 2005
New Revision: 326210

URL: http://svn.apache.org/viewcvs?rev=326210&view=rev
Log:
Update jetty and tomcat config xmls to be the config lists as well

Removed:
    geronimo/trunk/modules/assembly/src/var/config/config.jetty.list
    geronimo/trunk/modules/assembly/src/var/config/config.list
    geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list
Modified:
    geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
    geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml

Modified: geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml?rev=326210&r1=326209&r2=326210&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml Tue Oct 18 12:33:08 2005
@@ -10,17 +10,9 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/OfflineDeployer">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
-        </gbean>
-        <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-        </gbean>
-    </configuration>
     <configuration name="org/apache/geronimo/RuntimeDeployer">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
@@ -37,22 +29,6 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Tomcat">
-        <gbean name="TomcatWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortSecondary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
-        </gbean>
-        <gbean name="TomcatAJPConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanAJPPortSecondary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
-        </gbean>
-        <gbean name="TomcatWebSSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortSecondary}</attribute>
-        </gbean>
-    </configuration>
     <configuration name="org/apache/geronimo/Server">
         <gbean name="openejb:type=NetworkService,name=EJB">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -67,7 +43,18 @@
         <gbean name="JMXConnector">
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
-        <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
+    </configuration>
+    <configuration name="org/apache/geronimo/ServerCORBA" load="false">
+        <gbean name="NameServer">
+            <attribute name="dbDir">var/cosnaming.db</attribute>
+            <attribute name="port">${PlanCOSNamingPort}</attribute>
+        </gbean>
+        <gbean name="Server">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/ActiveMQServer">
         <gbean name="ActiveMQ.tcp.default">
@@ -75,6 +62,7 @@
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
+    <configuration name="org/apache/geronimo/SystemJMS"/>
     <configuration name="org/apache/geronimo/SystemDatabase">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -87,4 +75,7 @@
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
+    <configuration name="org/apache/geronimo/JettyRuntimeDeployer"/>
+    <configuration name="org/apache/geronimo/applications/Welcome/Jetty"/>
+    <configuration name="org/apache/geronimo/Console/Jetty"/>
 </attributes>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml?rev=326210&r1=326209&r2=326210&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml Tue Oct 18 12:33:08 2005
@@ -10,33 +10,14 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/OfflineDeployer">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
-        </gbean>
-        <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
-        </gbean>
-    </configuration>
     <configuration name="org/apache/geronimo/RuntimeDeployer">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Jetty">
-        <gbean name="JettyWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortSecondary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
-        </gbean>
-        <gbean name="JettySSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortSecondary}</attribute>
-        </gbean>
-    </configuration>
     <configuration name="org/apache/geronimo/Tomcat">
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -67,7 +48,18 @@
         <gbean name="JMXConnector">
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
-        <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
+    </configuration>
+    <configuration name="org/apache/geronimo/ServerCORBA" load="false">
+        <gbean name="NameServer">
+            <attribute name="dbDir">var/cosnaming.db</attribute>
+            <attribute name="port">${PlanCOSNamingPort}</attribute>
+        </gbean>
+        <gbean name="Server">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/ActiveMQServer">
         <gbean name="ActiveMQ.tcp.default">
@@ -75,6 +67,7 @@
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
+    <configuration name="org/apache/geronimo/SystemJMS"/>
     <configuration name="org/apache/geronimo/SystemDatabase">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -87,4 +80,7 @@
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
+    <configuration name="org/apache/geronimo/TomcatRuntimeDeployer"/>
+    <configuration name="org/apache/geronimo/applications/Welcome/Tomcat"/>
+    <configuration name="org/apache/geronimo/Console/Tomcat"/>
 </attributes>