You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/07 07:44:16 UTC
svn commit: r279249 - in /geronimo/trunk/modules/assembly: maven.xml
src/plan/j2ee-jetty-plan.xml src/plan/j2ee-jetty-runtime-deployer-plan.xml
src/var/config/config.list src/var/config/config.xml
Author: djencks
Date: Tue Sep 6 22:44:11 2005
New Revision: 279249
URL: http://svn.apache.org/viewcvs?rev=279249&view=rev
Log:
enable switching between jetty and tomcat with the tomcat goal. The preferred web container gets the standard ports 8080, 8443, 8009. The other container gets nonstandard 8090, 8453, 8019
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
geronimo/trunk/modules/assembly/src/var/config/config.list
geronimo/trunk/modules/assembly/src/var/config/config.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=279249&r1=279248&r2=279249&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Tue Sep 6 22:44:11 2005
@@ -262,13 +262,6 @@
<!-- Substitution variables for default hostname, ports, etc. -->
<j:set var="PlanServerHostname" value="0.0.0.0"/>
- <j:set var="PlanHTTPPort" value="8080"/>
- <j:set var="PlanHTTPSPort" value="8443"/>
- <j:set var="PlanClientCertHTTPSPort" value="8444"/>
- <j:set var="PlanAJPPort" value="8009"/>
- <j:set var="PlanHTTPPort2" value="8090"/>
- <j:set var="PlanHTTPSPort2" value="8453"/>
- <j:set var="PlanAJPPort2" value="8019"/>
<j:set var="PlanNamingPort" value="1099"/>
<j:set var="PlanOpenEJBPort" value="4201"/>
<j:set var="PlanClientAddresses" value="127.0.0.1"/>
@@ -279,6 +272,29 @@
<j:set var="PlanDerbyPort" value="1527"/>
<j:set var="PlanRemoteLoginPort" value="4242"/>
<j:set var="PlanLdapPort" value="1389"/>
+ <echo>CHOOSING CONTAINER ${geronimo.web.container}</echo>
+ <j:if test="${context.getVariable('geronimo.web.container').equals('jetty')}">
+ <echo>JETTY CONTAINER</echo>
+ <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/jetty"/>
+ <j:set var="PlanHTTPPort" value="8080"/>
+ <j:set var="PlanHTTPSPort" value="8443"/>
+ <j:set var="PlanClientCertHTTPSPort" value="8444"/>
+ <j:set var="PlanAJPPort" value="8009"/>
+ <j:set var="PlanHTTPPort2" value="8090"/>
+ <j:set var="PlanHTTPSPort2" value="8453"/>
+ <j:set var="PlanAJPPort2" value="8019"/>
+ </j:if>
+ <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">
+ <echod>TOMCAT CONTAINER</echod>
+ <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/tomcat"/>
+ <j:set var="PlanHTTPPort" value="8090"/>
+ <j:set var="PlanHTTPSPort" value="8453"/>
+ <j:set var="PlanAJPPort" value="8019"/>
+ <j:set var="PlanHTTPPort2" value="8080"/>
+ <j:set var="PlanHTTPSPort2" value="8443"/>
+ <j:set var="PlanAJPPort2" value="8009"/>
+ </j:if>
+ <echo>CHOSE CONTAINER</echo>
<fileScanner var="plans">
<fileset dir="${basedir}/src/plan">
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml?rev=279249&r1=279248&r2=279249&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml Tue Sep 6 22:44:11 2005
@@ -78,25 +78,4 @@
</reference>
</gbean>
- <gbean name="JettyClientCertSSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanClientCertHTTPSPort}</attribute>
- <attribute name="keystoreFileName">var/security/keystore</attribute>
- <attribute name="keystoreType">JKS</attribute>
- <attribute name="keystorePassword">secret</attribute>
- <attribute name="keyPassword">secret</attribute>
- <attribute name="clientAuthRequired">true</attribute>
- <attribute name="secureProtocol">TLS</attribute>
- <attribute name="maxThreads">50</attribute>
- <attribute name="minThreads">10</attribute>
- <reference name="JettyContainer">
- <name>JettyWebContainer</name>
- </reference>
- <reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
-
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml?rev=279249&r1=279248&r2=279249&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml Tue Sep 6 22:44:11 2005
@@ -37,7 +37,7 @@
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
- <attribute name="jettyContainerObjectName">geronimo.server:name=WebContainer,*</attribute>
+ <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
<reference name="DefaultServlets">
<gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,*</gbean-name>
</reference>
Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=279249&r1=279248&r2=279249&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Tue Sep 6 22:44:11 2005
@@ -5,6 +5,7 @@
org/apache/geronimo/SystemDatabase
org/apache/geronimo/SystemJMS
org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/JettyRuntimeDeployer
org/apache/geronimo/TomcatRuntimeDeployer
org/apache/geronimo/applications/Welcome
org/apache/geronimo/Console
Modified: geronimo/trunk/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.xml?rev=279249&r1=279248&r2=279249&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.xml Tue Sep 6 22:44:11 2005
@@ -3,7 +3,7 @@
<attributes>
<configuration name="org/apache/geronimo/RuntimeDeployer">
<gbean name="WebBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/web/tomcat</attribute>
+ <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
</gbean>
</configuration>
<configuration name="org/apache/geronimo/RMINaming">