geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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>



Mime
View raw message