geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r882092 [2/2] - in /geronimo/server/branches/2.2/plugins/tomcat: geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ geronimo-tomcat6/src/test/resources/deployables/ to...
Date Thu, 19 Nov 2009 10:01:52 GMT
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
Thu Nov 19 10:00:43 2009
@@ -1,10 +1,19 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation,
vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>

-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.02 at 10:12:18 AM PDT 
-//
-
+/**
+ *  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.
+ */
 
 package org.apache.geronimo.tomcat.model;
 

Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
Thu Nov 19 10:00:43 2009
@@ -1,10 +1,19 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation,
vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>

-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.02 at 10:12:18 AM PDT 
-//
-
+/**
+ *  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.
+ */
 
 package org.apache.geronimo.tomcat.model;
 

Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
Thu Nov 19 10:00:43 2009
@@ -1,10 +1,19 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation,
vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>

-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.02 at 10:12:18 AM PDT 
-//
-
+/**
+ *  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.
+ */
 
 package org.apache.geronimo.tomcat.model;
 

Added: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java?rev=882092&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
(added)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
Thu Nov 19 10:00:43 2009
@@ -0,0 +1,68 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.tribes.transport.MultiPointSender;
+import org.apache.catalina.tribes.transport.nio.PooledParallelSender;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransportType")
+public class TransportType {
+
+    @XmlAttribute
+    protected String className = PooledParallelSender.class.getName();
+
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    public String getClassName() {
+        return className;
+    }
+
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
+
+    public MultiPointSender getTransport(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+        for (Map.Entry<QName, String> entry : otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        MultiPointSender multiPointSender = (MultiPointSender) recipe.create(cl);
+        return multiPointSender;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+}

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransportType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
Thu Nov 19 10:00:43 2009
@@ -1,10 +1,19 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation,
vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>

-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.02 at 10:12:18 AM PDT 
-//
-
+/**
+ *  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.
+ */
 
 package org.apache.geronimo.tomcat.model;
 

Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
Thu Nov 19 10:00:43 2009
@@ -17,26 +17,29 @@
  * under the License.
  */
 
-
 package org.apache.geronimo.tomcat;
 
 import java.io.File;
 import java.io.FileReader;
 
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Server;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.testsupport.TestSupport;
+import org.apache.geronimo.tomcat.model.ChannelType;
+import org.apache.geronimo.tomcat.model.ClusterType;
 import org.apache.geronimo.tomcat.model.ServerType;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.system.serverinfo.BasicServerInfo;
-import org.apache.catalina.Server;
-import org.apache.catalina.Lifecycle;
 
 /**
  * @version $Rev$ $Date$
  */
-
 public class TomcatServerGBeanTest extends TestSupport {
+
     private static final String SERVER_1 = "src/test/resources/deployables/server-1.xml";
 
+    private static final String SERVER_2 = "src/test/resources/deployables/server-2.xml";
+
     public void testLoadServer1() throws Exception {
         File server1 = resolveFile(SERVER_1);
         FileReader in = new FileReader(server1);
@@ -45,17 +48,43 @@
             assertEquals(4, serverType.getListener().size());
             Server server = serverType.build(getClass().getClassLoader(), null);
             try {
-                ((Lifecycle)server).start();
+                ((Lifecycle) server).start();
             } finally {
-                ((Lifecycle)server).stop();
+                ((Lifecycle) server).stop();
             }
         } finally {
             in.close();
         }
     }
+
+    public void testLoadServer2() throws Exception {
+        File server2 = resolveFile(SERVER_2);
+        FileReader in = new FileReader(server2);
+        try {
+            ServerType serverType = TomcatServerGBean.loadServerType(in);
+            ClusterType engineClusterType = serverType.getService().get(0).getEngine().getCluster();
+            assertNotNull(engineClusterType);
+            validateClusterType(engineClusterType);
+            ClusterType hostClusterType = serverType.getService().get(0).getEngine().getHost().get(0).getCluster();
+            assertNotNull(hostClusterType);
+            validateClusterType(hostClusterType);
+            serverType.build(getClass().getClassLoader(), null);
+        } finally {
+            in.close();
+        }
+    }
+
+    private void validateClusterType(ClusterType clusterType) {
+        assertEquals(2, clusterType.getValve().size());
+        assertEquals(2, clusterType.getClusterListener().size());
+        ChannelType channelType = clusterType.getChannel();
+        assertEquals(3, channelType.getInterceptor().size());        
+        assertEquals(1, channelType.getInterceptor().get(2).getMember().size());
+    }
+
     public void testGBeanServer1() throws Exception {
         ServerInfo serverInfo = new BasicServerInfo(BASEDIR.getAbsolutePath());
-        TomcatServerGBean tomcatServerGBean = new TomcatServerGBean(null, SERVER_1, null
,serverInfo, null, null, getClass().getClassLoader(), null);
+        TomcatServerGBean tomcatServerGBean = new TomcatServerGBean(null, SERVER_1, null,
serverInfo, null, null, getClass().getClassLoader(), null);
         try {
             tomcatServerGBean.doStart();
         } finally {

Added: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml?rev=882092&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
(added)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
Thu Nov 19 10:00:43 2009
@@ -0,0 +1,168 @@
+<?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.
+-->
+
+    <!-- this is the basic tomcat server.xml -->
+    
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="18005" shutdown="SHUTDOWN">
+
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html
-->
+  <Listener className="org.apache.catalina.core.JasperListener" />
+  <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread
pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="18080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443
+         This connector uses the JSSE configuration, when using APR, the
+         connector should be using the OpenSSL style configuration
+         described in the APR documentation -->
+    <!--
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="18009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request and response data received and sent by Tomcat.
+           Documentation at: /docs/config/valve.html -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+        -->
+        <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
+                <Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false"
notifyListenersOnReplication="true" name="aaa"/>
+                <Channel className="org.apache.catalina.tribes.group.GroupChannel">
+                    <Membership className="org.apache.catalina.tribes.membership.McastService"
address="228.0.0.4" port="45564" frequency="500" dropTime="3000" />
+                        <Receiver className="org.apache.catalina.tribes.transport.nio.NioReceiver"
address="auto" port="4000" autoBind="100" selectorTimeout="5000" maxThreads="6" />
+                        <Sender className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
+                            <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"
/>
+                        </Sender>
+                    <Interceptor className="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"
/>
+                    <Interceptor className="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor"
/>
+                    <Interceptor className="org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor">
+                        <Member port="5002" securePort="-1" host="9.186.10.60" domain="test-domain"
UniqueId="{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}" />
+                    </Interceptor>
+                </Channel>
+
+                <Valve className="org.apache.catalina.ha.tcp.ReplicationValve" filter=""
/>
+                <Valve className="org.apache.catalina.ha.session.JvmRouteBinderValve"
/>
+                <ClusterListener className="org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener"
/>
+                <ClusterListener className="org.apache.catalina.ha.session.ClusterSessionListener"
/>
+            </Cluster>
+      </Host>
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
+            <Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false"
notifyListenersOnReplication="true" name="aaa"/>
+            <Channel className="org.apache.catalina.tribes.group.GroupChannel">
+                <Membership className="org.apache.catalina.tribes.membership.McastService"
address="228.0.0.4" port="45564" frequency="500" dropTime="3000" />
+                <Receiver className="org.apache.catalina.tribes.transport.nio.NioReceiver"
address="auto" port="4000" autoBind="100" selectorTimeout="5000" maxThreads="6" />
+                <Sender className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
+                    <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"
/>
+                </Sender>
+                <Interceptor className="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"
/>
+                <Interceptor className="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor"
/>
+                <Interceptor className="org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor">
+                    <Member port="5002" securePort="-1" host="9.186.10.60" domain="test-domain"
uniqueId="{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}" />
+                </Interceptor>
+            </Channel>
+
+            <Valve className="org.apache.catalina.ha.tcp.ReplicationValve" filter="" />
+            <Valve className="org.apache.catalina.ha.session.JvmRouteBinderValve" />
+            <ClusterListener className="org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener"
/>
+            <ClusterListener className="org.apache.catalina.ha.session.ClusterSessionListener"
/>
+    </Cluster>
+    </Engine>    
+  </Service>
+</Server>

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml?rev=882092&r1=882091&r2=882092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml
(original)
+++ geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml
Thu Nov 19 10:00:43 2009
@@ -134,6 +134,30 @@
             <Host name="${ServerHostname}" appBase=""
                   unpackWARs="true" autoDeploy="true"
                   xmlValidation="false" xmlNamespaceAware="false">
+                
+                <!--
+                <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8">
+                    <Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false"
notifyListenersOnReplication="true" name="${clusterName}" channelSendOptions="6" mapSendOptions="6"/>
+                    <Channel className="org.apache.catalina.tribes.group.GroupChannel">
+                        <Membership className="org.apache.catalina.tribes.membership.McastService"
address="228.0.0.4" port="45564" frequency="500" dropTime="3000" />
+                        <Receiver className="org.apache.catalina.tribes.transport.nio.NioReceiver"
address="auto" port="4000" autoBind="100" selectorTimeout="5000" maxThreads="6" />
+                        <Sender className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
+                            <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"
/>
+                        </Sender>
+                        <Interceptor className="org.apache.geronimo.tomcat.interceptor.DisableMcastInterceptor"
/>
+                        <Interceptor className="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"
interval="60"/>
+                        <Interceptor className="org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor">
+                            <Member port="5002" securePort="-1" host="9.186.10.60" domain="test-domain"
UniqueId="{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}" />
+                        </Interceptor>
+                        <Interceptor className="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor"
/>
+                        <Interceptor className="org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor"
/>
+                    </Channel>
+                    <Valve className="org.apache.catalina.ha.tcp.ReplicationValve" filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"
/>
+                    <Valve className="org.apache.catalina.ha.session.JvmRouteBinderValve"
/>
+                    <ClusterListener className="org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener"
/>
+                    <ClusterListener className="org.apache.catalina.ha.session.ClusterSessionListener"
/>
+                </Cluster>
+                -->
 
                 <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                        prefix="${ServerHostname}_access_log." suffix=".txt" pattern="common"
resolveHosts="false"/>
@@ -148,8 +172,7 @@
                 <!--
                 <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                        prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
-                -->
-
+                -->                
             </Host>
         </Engine>
     </Service>



Mime
View raw message