geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r882333 [11/11] - in /geronimo/server/trunk/plugins: ./ jetty7/ jetty8/ jetty8/geronimo-jetty7-builder/ jetty8/geronimo-jetty7-clustering-builder-wadi/ jetty8/geronimo-jetty7-clustering-wadi/ jetty8/geronimo-jetty7/ jetty8/geronimo-jetty8-b...
Date Thu, 19 Nov 2009 22:21:55 GMT
Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml?rev=882333&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml Thu Nov 19 22:21:48
2009
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!-- david jencks is not convinced that these 2 gbeans should be in this
+         plan and thinks they might belong in the console plan.  Aaron thinks
+         they definitely don't belong in the console plan, but could go into
+         a management layer plan. -->
+    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty8.JettyManagerImpl"/>
+
+    <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty8.requestlog.JettyLogManagerImpl">
+        <references name="LogGBeans">
+            <pattern>
+                <!-- This is lame and should be replaced by an interface reference -->
+                <name>JettyRequestLog</name>
+            </pattern>
+        </references>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- default WAR container using Jetty -->
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty8.JettyContainerImpl">
+        <attribute name="jettyHome">var/jetty</attribute>
+        <reference name="WebManager">
+            <name>JettyWebManager</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty8.requestlog.NCSARequestLog">
+        <reference name="JettyContainer">
+            <name>JettyWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
+        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+        <attribute name="logTimeZone">GMT</attribute>
+    </gbean>
+
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty8.connector.HTTPSelectChannelConnector">
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPPort}</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="JettyAJP13Connector" class="org.apache.geronimo.jetty8.connector.AJP13Connector">
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanAJPPort}</attribute>
+        <reference name="JettyContainer">
+            <name>JettyWebContainer</name>
+        </reference>
+        <reference name="ThreadPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <attribute name="maxThreads">50</attribute>
+    </gbean>
+
+    <!-- DONT USE THIS ONE -->
+    <!--
+        <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty8.connector.HTTPSSocketConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPort}</attribute>
+            <attribute name="keyStore">geronimo-default</attribute>
+            <attribute name="keyAlias">geronimo</attribute>
+            <attribute name="trustStore">geronimo-default</attribute>
+            <attribute name="clientAuthRequired">false</attribute>
+            <attribute name="algorithm">Default</attribute>
+            <attribute name="secureProtocol">TLS</attribute>
+            <attribute name="maxThreads">50</attribute>
+            <reference name="JettyContainer">
+                <name>JettyWebContainer</name>
+            </reference>
+            <reference name="ThreadPool">
+                <name>DefaultThreadPool</name>
+            </reference>
+            <reference name="KeystoreManager">
+                <name>KeystoreManager</name>
+            </reference>
+        </gbean>
+    -->
+    <!-- USE THIS ONE -->
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty8.connector.HTTPSSelectChannelConnector">
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="headerBufferSizeBytes">8192</attribute>
+        <attribute name="keyStore">geronimo-default</attribute>
+        <attribute name="keyAlias">geronimo</attribute>
+        <attribute name="trustStore">geronimo-default</attribute>
+        <attribute name="clientAuthRequired">false</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="maxThreads">50</attribute>
+        <reference name="JettyContainer">
+            <name>JettyWebContainer</name>
+        </reference>
+        <reference name="ThreadPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="KeystoreManager">
+            <name>KeystoreManager</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=882333&r1=882242&r2=882333&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Thu Nov 19 22:21:48 2009
@@ -28,12 +28,12 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jetty7</artifactId>
-    <name>Geronimo Plugins, Jetty7</name>
+    <artifactId>jetty8</artifactId>
+    <name>Geronimo Plugins, jetty8</name>
     <packaging>pom</packaging>
 
     <description>
-        Jetty7 plugin
+        jetty8 plugin
     </description>
 
     <properties>
@@ -105,14 +105,14 @@
 
 
     <modules>
-        <module>geronimo-jetty7</module>
-        <module>geronimo-jetty7-builder</module>
-        <module>jetty7</module>
-        <module>jetty7-deployer</module>
-        <module>geronimo-jetty7-clustering-builder-wadi</module>
-        <module>geronimo-jetty7-clustering-wadi</module>
-        <module>jetty7-clustering-builder-wadi</module>
-        <module>jetty7-clustering-wadi</module>
+        <module>geronimo-jetty8</module>
+        <module>geronimo-jetty8-builder</module>
+        <module>jetty8</module>
+        <module>jetty8-deployer</module>
+        <module>geronimo-jetty8-clustering-builder-wadi</module>
+        <module>geronimo-jetty8-clustering-wadi</module>
+        <module>jetty8-clustering-builder-wadi</module>
+        <module>jetty8-clustering-wadi</module>
     </modules>
 
     <repositories>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=882333&r1=882332&r2=882333&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Nov 19 22:21:48 2009
@@ -133,7 +133,7 @@
         <!--<module>welcome</module>-->
         <!--<module>concurrent</module>-->
         <!--<module>procrun</module>-->
-        <module>jetty7</module>
+        <module>jetty8</module>
         <module>tomcat</module>
     </modules>
 
@@ -208,7 +208,7 @@
                 <module>welcome</module>
                 <module>concurrent</module>
                 <module>procrun</module>
-                <module>jetty7</module>
+                <module>jetty8</module>
                 <module>tomcat</module>
             </modules>
         </profile>



Mime
View raw message