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 2008/12/07 01:11:00 UTC
svn commit: r724058 - in /geronimo/samples/trunk/samples/app-per-port: ./
app-per-port-jetty/ app-per-port-jetty/src/main/plan/
app-per-port-tomcat/src/main/plan/ app-per-port-war1-jetty/
app-per-port-war1-jetty/src/main/plan/
Author: djencks
Date: Sat Dec 6 16:10:59 2008
New Revision: 724058
URL: http://svn.apache.org/viewvc?rev=724058&view=rev
Log:
app-per-port samples for jetty
Added:
geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/
- copied from r724032, geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/
geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/
- copied from r724032, geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/
Modified:
geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml
geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml
geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/app-per-port/pom.xml
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml?rev=724058&r1=724032&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml Sat Dec 6 16:10:59 2008
@@ -31,11 +31,11 @@
</parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>app-per-port-tomcat</artifactId>
- <name>Geronimo Samples :: app-per-port :: plugin for tomcat</name>
+ <artifactId>app-per-port-jetty</artifactId>
+ <name>Geronimo Samples :: app-per-port :: plugin for jetty</name>
<packaging>car</packaging>
- <description>Geronimo Samples. app-per-port Plugin for Tomcat</description>
+ <description>Geronimo Samples. app-per-port Plugin for Jetty</description>
<dependencies>
<dependency>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>jetty6-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>jetty6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -89,7 +89,7 @@
<properties>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <jettyDeployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jettyDeployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
</properties>
@@ -104,7 +104,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml?rev=724058&r1=724032&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml Sat Dec 6 16:10:59 2008
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2004-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
@@ -21,151 +21,97 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<module>
<web>war1.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<web-container>
- <gbean-link>TomcatWebContainer1</gbean-link>
+ <gbean-link>JettyWebContainer1</gbean-link>
</web-container>
</web-app>
</module>
<module>
<web>war2.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<web-container>
- <gbean-link>TomcatWebContainer2</gbean-link>
+ <gbean-link>JettyWebContainer2</gbean-link>
</web-container>
</web-app>
</module>
<module>
<web>connectors.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
- <gbean name="TomcatWebConnector1" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
- <attribute name="name">HTTP</attribute>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <gbean name="JettyWebConnector1" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
<attribute name="host">localhost</attribute>
- <attribute name="port">8090</attribute>
- <attribute name="maxHttpHeaderSize">8192</attribute>
- <attribute name="maxThreads">150</attribute>
- <attribute name="minSpareThreads">25</attribute>
- <attribute name="maxSpareThreads">75</attribute>
- <attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">8453</attribute>
- <attribute name="acceptCount">100</attribute>
- <attribute name="connectionTimeout">20000</attribute>
- <attribute name="disableUploadTimeout">true</attribute>
- <reference name="TomcatContainer">
- <name>TomcatWebContainer1</name>
+ <attribute name="port">8082</attribute>
+ <attribute name="headerBufferSizeBytes">8192</attribute>
+ <reference name="JettyContainer">
+ <name>JettyWebContainer1</name>
</reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
</reference>
+ <attribute name="maxThreads">50</attribute>
</gbean>
-
- <gbean name="TomcatWebConnector2" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
- <attribute name="name">HTTP</attribute>
+ <gbean name="JettyWebConnector2" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
<attribute name="host">localhost</attribute>
- <attribute name="port">8091</attribute>
- <attribute name="maxHttpHeaderSize">8192</attribute>
- <attribute name="maxThreads">150</attribute>
- <attribute name="minSpareThreads">25</attribute>
- <attribute name="maxSpareThreads">75</attribute>
- <attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">8453</attribute>
- <attribute name="acceptCount">100</attribute>
- <attribute name="connectionTimeout">20000</attribute>
- <attribute name="disableUploadTimeout">true</attribute>
- <reference name="TomcatContainer">
- <name>TomcatWebContainer2</name>
+ <attribute name="port">8083</attribute>
+ <attribute name="headerBufferSizeBytes">8192</attribute>
+ <reference name="JettyContainer">
+ <name>JettyWebContainer2</name>
</reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
</reference>
+ <attribute name="maxThreads">50</attribute>
</gbean>
</web-app>
</module>
- <gbean name="TomcatWebContainer1" class="org.apache.geronimo.tomcat.TomcatContainer">
- <attribute name="catalinaHome">var/catalina</attribute>
- <reference name="EngineGBean">
- <name>TomcatEngine1</name>
- </reference>
+ <gbean name="JettyWebContainer1" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+ <attribute name="jettyHome">var/jetty1</attribute>
+ <!--<reference name="WebManager">-->
+ <!--<name>JettyWebManager</name>-->
+ <!--</reference>-->
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <reference name="WebManager">
- <name>TomcatWebManager</name>
- </reference>
</gbean>
- <gbean name="TomcatEngine1" class="org.apache.geronimo.tomcat.EngineGBean">
- <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
- <attribute name="initParams">
- name=Geronimo1
- </attribute>
- <reference name="DefaultHost">
- <name>TomcatHost1</name>
- </reference>
- <reference name="RealmGBean">
- <name>NoSecurityRealm</name>
- </reference>
- <!--reference name="TomcatValveChain">
- <name>FirstValve</name>
- </reference-->
- </gbean>
-
- <gbean name="TomcatHost1" class="org.apache.geronimo.tomcat.HostGBean">
- <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
- <attribute name="initParams">
- name=localhost1
- appBase=
- workDir=work1
- </attribute>
- </gbean>
-
- <gbean name="TomcatWebContainer2" class="org.apache.geronimo.tomcat.TomcatContainer">
- <attribute name="catalinaHome">var/catalina</attribute>
- <reference name="EngineGBean">
- <name>TomcatEngine2</name>
+ <gbean name="JettyRequestLog1" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+ <reference name="JettyContainer">
+ <name>JettyWebContainer1</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <reference name="WebManager">
- <name>TomcatWebManager</name>
- </reference>
+ <attribute name="filename">var/log/jetty1_yyyy_mm_dd.log</attribute>
+ <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+ <attribute name="logTimeZone">GMT</attribute>
</gbean>
- <gbean name="TomcatEngine2" class="org.apache.geronimo.tomcat.EngineGBean">
- <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
- <attribute name="initParams">
- name=Geronimo2
- </attribute>
- <reference name="DefaultHost">
- <name>TomcatHost2</name>
- </reference>
- <reference name="RealmGBean">
- <name>NoSecurityRealm</name>
- </reference>
- <!--reference name="TomcatValveChain">
- <name>FirstValve</name>
- </reference-->
- </gbean>
-
- <gbean name="TomcatHost2" class="org.apache.geronimo.tomcat.HostGBean">
- <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
- <attribute name="initParams">
- name=localhost2
- appBase=
- workDir=work2
- </attribute>
+ <gbean name="JettyWebContainer2" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+ <attribute name="jettyHome">var/jetty2</attribute>
+ <!--<reference name="WebManager">-->
+ <!--<name>JettyWebManager</name>-->
+ <!--</reference>-->
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
</gbean>
- <gbean name="NoSecurityRealm" class="org.apache.geronimo.tomcat.RealmGBean">
- <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatEJBWSGeronimoRealm</attribute>
+ <gbean name="JettyRequestLog2" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+ <reference name="JettyContainer">
+ <name>JettyWebContainer2</name>
+ </reference>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <attribute name="filename">var/log/jetty2_yyyy_mm_dd.log</attribute>
+ <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+ <attribute name="logTimeZone">GMT</attribute>
</gbean>
-
</application>
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml?rev=724058&r1=724057&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml Sat Dec 6 16:10:59 2008
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2004-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml?rev=724058&r1=724032&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml Sat Dec 6 16:10:59 2008
@@ -31,18 +31,18 @@
</parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>app-per-port-tomcat</artifactId>
- <name>Geronimo Samples :: app-per-port :: plugin for tomcat</name>
+ <artifactId>app-per-port-war1-jetty</artifactId>
+ <name>Geronimo Samples :: app-per-port :: war1 plugin for jetty</name>
<packaging>car</packaging>
- <description>Geronimo Samples. app-per-port Plugin for Tomcat</description>
+ <description>Geronimo Samples. war1 app-per-port Plugin for Jetty</description>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>app-per-port-ear</artifactId>
+ <artifactId>app-per-port-war1</artifactId>
<version>${version}</version>
- <type>ear</type>
+ <type>war</type>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>jetty6-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>jetty6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -89,7 +89,7 @@
<properties>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <jettyDeployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jettyDeployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
</properties>
@@ -104,14 +104,14 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>app-per-port-ear</artifactId>
+ <artifactId>app-per-port-war1</artifactId>
<version>${version}</version>
- <type>ear</type>
+ <type>war</type>
</module>
<useMavenDependencies>
<value>true</value>
@@ -127,7 +127,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
+ <!--<it-server>jetty</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml?rev=724058&r1=724032&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml Sat Dec 6 16:10:59 2008
@@ -1,171 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2004-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
- <module>
- <web>war1.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
- <web-container>
- <gbean-link>TomcatWebContainer1</gbean-link>
- </web-container>
- </web-app>
- </module>
-
- <module>
- <web>war2.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
- <web-container>
- <gbean-link>TomcatWebContainer2</gbean-link>
- </web-container>
- </web-app>
- </module>
-
- <module>
- <web>connectors.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
- <gbean name="TomcatWebConnector1" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
- <attribute name="name">HTTP</attribute>
- <attribute name="host">localhost</attribute>
- <attribute name="port">8090</attribute>
- <attribute name="maxHttpHeaderSize">8192</attribute>
- <attribute name="maxThreads">150</attribute>
- <attribute name="minSpareThreads">25</attribute>
- <attribute name="maxSpareThreads">75</attribute>
- <attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">8453</attribute>
- <attribute name="acceptCount">100</attribute>
- <attribute name="connectionTimeout">20000</attribute>
- <attribute name="disableUploadTimeout">true</attribute>
- <reference name="TomcatContainer">
- <name>TomcatWebContainer1</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
-
- <gbean name="TomcatWebConnector2" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
- <attribute name="name">HTTP</attribute>
- <attribute name="host">localhost</attribute>
- <attribute name="port">8091</attribute>
- <attribute name="maxHttpHeaderSize">8192</attribute>
- <attribute name="maxThreads">150</attribute>
- <attribute name="minSpareThreads">25</attribute>
- <attribute name="maxSpareThreads">75</attribute>
- <attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">8453</attribute>
- <attribute name="acceptCount">100</attribute>
- <attribute name="connectionTimeout">20000</attribute>
- <attribute name="disableUploadTimeout">true</attribute>
- <reference name="TomcatContainer">
- <name>TomcatWebContainer2</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- </web-app>
- </module>
-
-
- <gbean name="TomcatWebContainer1" class="org.apache.geronimo.tomcat.TomcatContainer">
- <attribute name="catalinaHome">var/catalina</attribute>
- <reference name="EngineGBean">
- <name>TomcatEngine1</name>
- </reference>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <context-root>war1</context-root>
+ <web-container>
+ <gbean-link>JettyWebContainer</gbean-link>
+ </web-container>
+
+ <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
+ <attribute name="host">localhost</attribute>
+ <attribute name="port">8082</attribute>
+ <attribute name="headerBufferSizeBytes">8192</attribute>
+ <reference name="JettyContainer">
+ <name>JettyWebContainer</name>
+ </reference>
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <attribute name="maxThreads">50</attribute>
+ </gbean>
+
+ <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+ <attribute name="jettyHome">var/jetty1</attribute>
+ <!--<reference name="WebManager">-->
+ <!--<name>JettyWebManager</name>-->
+ <!--</reference>-->
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <reference name="WebManager">
- <name>TomcatWebManager</name>
- </reference>
</gbean>
- <gbean name="TomcatEngine1" class="org.apache.geronimo.tomcat.EngineGBean">
- <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
- <attribute name="initParams">
- name=Geronimo1
- </attribute>
- <reference name="DefaultHost">
- <name>TomcatHost1</name>
- </reference>
- <reference name="RealmGBean">
- <name>NoSecurityRealm</name>
- </reference>
- <!--reference name="TomcatValveChain">
- <name>FirstValve</name>
- </reference-->
- </gbean>
-
- <gbean name="TomcatHost1" class="org.apache.geronimo.tomcat.HostGBean">
- <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
- <attribute name="initParams">
- name=localhost1
- appBase=
- workDir=work1
- </attribute>
- </gbean>
-
- <gbean name="TomcatWebContainer2" class="org.apache.geronimo.tomcat.TomcatContainer">
- <attribute name="catalinaHome">var/catalina</attribute>
- <reference name="EngineGBean">
- <name>TomcatEngine2</name>
+ <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+ <reference name="JettyContainer">
+ <name>JettyWebContainer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <reference name="WebManager">
- <name>TomcatWebManager</name>
- </reference>
+ <attribute name="filename">var/log/jetty1_yyyy_mm_dd.log</attribute>
+ <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+ <attribute name="logTimeZone">GMT</attribute>
</gbean>
-
- <gbean name="TomcatEngine2" class="org.apache.geronimo.tomcat.EngineGBean">
- <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
- <attribute name="initParams">
- name=Geronimo2
- </attribute>
- <reference name="DefaultHost">
- <name>TomcatHost2</name>
- </reference>
- <reference name="RealmGBean">
- <name>NoSecurityRealm</name>
- </reference>
- <!--reference name="TomcatValveChain">
- <name>FirstValve</name>
- </reference-->
- </gbean>
-
- <gbean name="TomcatHost2" class="org.apache.geronimo.tomcat.HostGBean">
- <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
- <attribute name="initParams">
- name=localhost2
- appBase=
- workDir=work2
- </attribute>
- </gbean>
-
- <gbean name="NoSecurityRealm" class="org.apache.geronimo.tomcat.RealmGBean">
- <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatEJBWSGeronimoRealm</attribute>
- </gbean>
-
-
-</application>
+
+</web-app>
Modified: geronimo/samples/trunk/samples/app-per-port/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/pom.xml?rev=724058&r1=724057&r2=724058&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/pom.xml Sat Dec 6 16:10:59 2008
@@ -43,6 +43,8 @@
<module>app-per-port-war2</module>
<module>app-per-port-connector-war</module>
<module>app-per-port-ear</module>
+ <module>app-per-port-war1-jetty</module>
+ <module>app-per-port-jetty</module>
<module>app-per-port-tomcat</module>
</modules>