geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r451920 - in /geronimo/server/trunk: ./ configs/ configs/clustering/ configs/clustering/src/ configs/clustering/src/plan/ configs/jetty-clustering-builder-wadi/ configs/jetty-clustering-wadi/ configs/jetty-clustering-wadi/src/plan/ configs/...
Date Mon, 02 Oct 2006 08:55:03 GMT
Author: gdamour
Date: Mon Oct  2 01:55:01 2006
New Revision: 451920

URL: http://svn.apache.org/viewvc?view=rev&rev=451920
Log:
GERONIMO-2452 - Remove geronimo-jetty dependency from geronimo-clustering-wadi

* Add clustering configuration: this configuration defines a Node;
* Add wadi-clustering configuration: this configuration defines the WADI 
implementation of the geronimo-clustering contracts;
* Add geronimo-jetty-clustering-wadi: WADIClusteredHandleInterceptor has 
been moved from geronimo-clustering-wadi to this module;
* Remove the SCM configuration from the *clustering* pom.xml; and
* Drop some remanent WADI things from Tomcat.

Added:
    geronimo/server/trunk/configs/clustering/
    geronimo/server/trunk/configs/clustering/LICENSE.txt
    geronimo/server/trunk/configs/clustering/NOTICE.txt
    geronimo/server/trunk/configs/clustering/pom.xml
    geronimo/server/trunk/configs/clustering/src/
    geronimo/server/trunk/configs/clustering/src/plan/
    geronimo/server/trunk/configs/clustering/src/plan/plan.xml
    geronimo/server/trunk/configs/wadi-clustering/
    geronimo/server/trunk/configs/wadi-clustering/LICENSE.txt
    geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt
    geronimo/server/trunk/configs/wadi-clustering/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/src/
    geronimo/server/trunk/configs/wadi-clustering/src/plan/
    geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java
Removed:
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADIClusteredHandleInterceptor.java
    geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java
Modified:
    geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
    geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Added: geronimo/server/trunk/configs/clustering/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/LICENSE.txt?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/clustering/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/clustering/LICENSE.txt Mon Oct  2 01:55:01 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/server/trunk/configs/clustering/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/NOTICE.txt?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/clustering/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/clustering/NOTICE.txt Mon Oct  2 01:55:01 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/server/trunk/configs/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/pom.xml?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/clustering/pom.xml (added)
+++ geronimo/server/trunk/configs/clustering/pom.xml Mon Oct  2 01:55:01 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 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.
+-->
+
+<!-- $Rev: 446727 $ $Date: 2006-09-16 06:43:43 +1000 (Sat, 16 Sep 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>clustering</artifactId>
+    <name>Geronimo Configs :: Clustering</name>
+    <packaging>car</packaging>
+    
+    <properties>
+        <PlanNodeName>NODE</PlanNodeName>
+    </properties>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+    
+</project>

Added: geronimo/server/trunk/configs/clustering/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/src/plan/plan.xml?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/clustering/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/clustering/src/plan/plan.xml Mon Oct  2 01:55:01 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 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.
+-->
+
+<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="Node" class="org.apache.geronimo.clustering.BasicNode">
+        <attribute name="nodeName">${PlanNodeName}</attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml Mon Oct  2 01:55:01 2006
@@ -38,14 +38,13 @@
     </properties>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <artifactId>jetty-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-	
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-clustering</artifactId>
@@ -54,19 +53,19 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
+            <artifactId>geronimo-jetty-clustering-wadi</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering-builder-wadi</artifactId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <artifactId>geronimo-clustering-builder-wadi</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
@@ -104,7 +103,6 @@
             <groupId>org.apache.catalina.tribes</groupId>
             <artifactId>tribes</artifactId>
         </dependency>
-
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml Mon Oct  2 01:55:01 2006
@@ -29,30 +29,13 @@
     </parent>
 
     <artifactId>jetty-clustering-wadi</artifactId>
-    <name>Geronimo Configs :: Jetty Clustering WADI</name>
+    <name>Geronimo Configs :: Jetty Clustering over WADI</name>
     <packaging>car</packaging>
     
-    <properties>
-        <PlanDefaultSweepInterval>36000</PlanDefaultSweepInterval>
-        <PlanDefaultNumPartitions>24</PlanDefaultNumPartitions>
-        <PlanNbReplica>2</PlanNbReplica>
-        <PlanClusterName>DEFAULT_CLUSTER</PlanClusterName>
-        <PlanInactiveTime>3600</PlanInactiveTime>
-        <PlanNodeName>NODE</PlanNodeName>
-        <PlanClusterUri>tcp://localhost:61618</PlanClusterUri>
-    </properties>
-
     <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
+            <artifactId>geronimo-jetty-clustering-wadi</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
@@ -64,40 +47,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-group</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-activecluster</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activecluster</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-             <artifactId>activemq</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-tribes</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.catalina.tribes</groupId>
-            <artifactId>tribes</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
-
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml Mon Oct  2 01:55:01 2006
@@ -18,38 +18,4 @@
 <!-- $Rev$ $Date$ -->
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
-    <gbean name="DefaultReplicationManagerFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicationManagerFactoryGBean">
-    </gbean>
-
-    <gbean name="DefaultReplicaStorageFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicaStorageFactoryGBean">
-    </gbean>
-
-    <gbean name="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
-        <attribute name="nbReplica">${PlanNbReplica}</attribute>
-    </gbean>
-
-    <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.ActiveClusterDispatcherHolder">
-        <attribute name="clusterName">${PlanClusterName}</attribute>
-        <attribute name="clusterUri">${PlanClusterUri}</attribute>
-        <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
-        <reference name="Node">
-            <name>Node</name>
-        </reference>
-    </gbean>
-
-    <!--
-    <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
-        <attribute name="clusterName">${PlanClusterName}</attribute>
-        <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
-        <reference name="Node">
-            <name>Node</name>
-        </reference>
-    </gbean>
-    -->
-
-    <gbean name="Node" class="org.apache.geronimo.clustering.BasicNode">
-        <attribute name="nodeName">${PlanNodeName}</attribute>
-    </gbean>
-
 </module>

Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Mon Oct  2 01:55:01 2006
@@ -55,16 +55,17 @@
             <type>car</type>
         </dependency>
 
-        <!-- This dependency should be retrieved by transitivity -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>clustering</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
 
+        <!-- This dependency should be retrieved by transitivity -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
+            <artifactId>geronimo-jetty</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Oct  2 01:55:01 2006
@@ -121,6 +121,7 @@
         <module>client-system</module>
         <module>client-transaction</module>
         <module>connector-deployer</module>
+        <module>clustering</module>
         <module>webconsole-jetty</module>
         <module>webconsole-tomcat</module>
         <!-- <module>daytrader-jetty</module> -->
@@ -164,6 +165,7 @@
         <module>unavailable-webservices-deployer</module>
         <module>upgrade</module>
         <module>upgrade-cli</module>
+        <module>wadi-clustering</module>
         <module>welcome-jetty</module>
         <module>welcome-tomcat</module>
         <module>dojo-jetty</module>

Added: geronimo/server/trunk/configs/wadi-clustering/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/LICENSE.txt?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/wadi-clustering/LICENSE.txt Mon Oct  2 01:55:01 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt Mon Oct  2 01:55:01 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/server/trunk/configs/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/pom.xml?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/pom.xml (added)
+++ geronimo/server/trunk/configs/wadi-clustering/pom.xml Mon Oct  2 01:55:01 2006
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 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.
+-->
+
+<!-- $Rev: 446727 $ $Date: 2006-09-16 06:43:43 +1000 (Sat, 16 Sep 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>wadi-clustering</artifactId>
+    <name>Geronimo Configs :: Clustering over WADI</name>
+    <packaging>car</packaging>
+    
+    <properties>
+        <PlanDefaultSweepInterval>36000</PlanDefaultSweepInterval>
+        <PlanDefaultNumPartitions>24</PlanDefaultNumPartitions>
+        <PlanNbReplica>2</PlanNbReplica>
+        <PlanClusterName>DEFAULT_CLUSTER</PlanClusterName>
+        <PlanInactiveTime>3600</PlanInactiveTime>
+        <PlanClusterUri>tcp://localhost:61618</PlanClusterUri>
+    </properties>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>clustering</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-group</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-activecluster</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activecluster</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+             <artifactId>activemq</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-tribes</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.catalina.tribes</groupId>
+            <artifactId>tribes</artifactId>
+        </dependency>
+    </dependencies>
+    
+</project>

Added: geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml Mon Oct  2 01:55:01 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 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.
+-->
+
+<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="DefaultReplicationManagerFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicationManagerFactoryGBean">
+    </gbean>
+
+    <gbean name="DefaultReplicaStorageFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicaStorageFactoryGBean">
+    </gbean>
+
+    <gbean name="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
+        <attribute name="nbReplica">${PlanNbReplica}</attribute>
+    </gbean>
+
+    <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.ActiveClusterDispatcherHolder">
+        <attribute name="clusterName">${PlanClusterName}</attribute>
+        <attribute name="clusterUri">${PlanClusterUri}</attribute>
+        <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
+        <reference name="Node">
+            <name>Node</name>
+        </reference>
+    </gbean>
+
+    <!--
+    <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
+        <attribute name="clusterName">${PlanClusterName}</attribute>
+        <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
+        <reference name="Node">
+            <name>Node</name>
+        </reference>
+    </gbean>
+    -->
+
+</module>

Modified: geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml Mon Oct  2 01:55:01 2006
@@ -31,25 +31,11 @@
     <artifactId>geronimo-clustering-builder-wadi</artifactId>
     <name>Geronimo Clustering Builder WADI</name>
     
-    <!--
-    
-    HACK: Need to explicitly configure SCM for this module since its artifactId
-          does not match the directory it lives in.
-    
-    FIXME: Rename module directory or artifactId.
-    
-    -->
-    <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-builder-wadi</connection>
-        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-builder-wadi</developerConnection>
-        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-builder-wadi</url>
-    </scm>
-    
     <dependencies>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
+            <artifactId>geronimo-jetty-clustering-wadi</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java Mon Oct  2 01:55:01 2006
@@ -23,7 +23,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.geronimo.clustering.wadi.BasicWADISessionManager;
-import org.apache.geronimo.clustering.wadi.WADIClusteredHandleInterceptor;
+import org.apache.geronimo.jetty.cluster.wadi.WADIClusteredHandleInterceptor;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml Mon Oct  2 01:55:01 2006
@@ -31,20 +31,6 @@
     <artifactId>geronimo-clustering-wadi</artifactId>
     <name>Geronimo Clustering WADI</name>
     
-    <!--
-    
-    HACK: Need to explicitly configure SCM for this module since its artifactId
-          does not match the directory it lives in.
-    
-    FIXME: Rename module directory or artifactId.
-    
-    -->
-    <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-wadi</connection>
-        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-wadi</developerConnection>
-        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering-wadi</url>
-    </scm>
-
     <repositories>
         <repository>
             <id>wadi-snapshots</id>

Modified: geronimo/server/trunk/modules/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-clustering/pom.xml Mon Oct  2 01:55:01 2006
@@ -31,20 +31,6 @@
     <artifactId>geronimo-clustering</artifactId>
     <name>Geronimo Clustering</name>
     
-    <!--
-    
-    HACK: Need to explicitly configure SCM for this module since its artifactId
-          does not match the directory it lives in.
-    
-    FIXME: Rename module directory or artifactId.
-    
-    -->
-    <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering</connection>
-        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/clustering</developerConnection>
-        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/clustering</url>
-    </scm>
-    
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>

Added: geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml Mon Oct  2 01:55:01 2006
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Copyright 2006 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-jetty-clustering-wadi</artifactId>
+    <name>Geronimo Jetty Clustering over WADI</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+    
+</project>
+

Added: geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java?view=auto&rev=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java (added)
+++ geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java Mon Oct  2 01:55:01 2006
@@ -0,0 +1,130 @@
+/**
+ *
+ * Copyright 2006 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.
+ */
+package org.apache.geronimo.jetty.cluster.wadi;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.geronimo.clustering.ClusteredInvocation;
+import org.apache.geronimo.clustering.ClusteredInvocationException;
+import org.apache.geronimo.clustering.wadi.WADISessionManager;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.jetty.HandleInterceptor;
+import org.apache.geronimo.jetty.cluster.AbstractClusteredHandleInterceptor;
+import org.codehaus.wadi.InvocationException;
+import org.codehaus.wadi.impl.ClusteredManager;
+import org.codehaus.wadi.web.impl.WebInvocation;
+import org.mortbay.http.HttpRequest;
+import org.mortbay.http.HttpResponse;
+import org.mortbay.jetty.servlet.ServletHttpRequest;
+import org.mortbay.jetty.servlet.ServletHttpResponse;
+
+
+/**
+ * 
+ * @version $Rev$ $Date$
+ */
+public class WADIClusteredHandleInterceptor extends AbstractClusteredHandleInterceptor implements GBeanLifecycle {
+    private final WADISessionManager sessionManager;
+    
+    private ClusteredManager wadiManager;
+
+    public WADIClusteredHandleInterceptor(WADISessionManager sessionManager) {
+        this.sessionManager = sessionManager;
+    }
+    
+    public void doStart() throws Exception {
+        wadiManager = sessionManager.getManager();
+    }
+    
+    public void doStop() throws Exception {
+        wadiManager = null;
+    }
+    
+    public void doFail() {
+        wadiManager = null;
+    }
+    
+    protected ClusteredInvocation newClusteredInvocation(String pathInContext, String pathParams, HttpRequest request,
+            HttpResponse response, HandleInterceptor end) {
+        return new WADIWebClusteredInvocation(pathInContext, pathParams, request, response, end);
+    }
+    
+    protected class WADIWebClusteredInvocation extends WebClusteredInvocation {
+        
+        public WADIWebClusteredInvocation(String pathInContext, String pathParams, HttpRequest request,
+                HttpResponse response, HandleInterceptor end) {
+            super(pathInContext, pathParams, request, response, end);
+        }
+
+        public void invoke() throws ClusteredInvocationException {
+            ServletHttpRequest servletHttpRequest = (ServletHttpRequest) request.getWrapper();
+            ServletHttpResponse servletHttpResponse = (ServletHttpResponse) response.getWrapper();
+
+            WebInvocation invocation = WebInvocation.getThreadLocalInstance();
+            FilterChain chainAdapter = new FilterChain() {
+                public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+                    try {
+                        invokeLocally();
+                    } catch (ClusteredInvocationException e) {
+                        throw (IOException) new IOException().initCause(e);
+                    }
+                }
+            };
+            invocation.init(servletHttpRequest, servletHttpResponse, chainAdapter);
+            try {
+                wadiManager.contextualise(invocation);
+            } catch (InvocationException e) {
+                Throwable throwable = e.getCause();
+                if (throwable instanceof IOException) {
+                    throw new ClusteredInvocationException(throwable);
+                } else if (throwable instanceof ServletException) {
+                    throw new ClusteredInvocationException(throwable);
+                } else {
+                    throw new ClusteredInvocationException(e);
+                }
+            }
+        }
+    }
+    
+    public static final GBeanInfo GBEAN_INFO;
+
+    public static final String GBEAN_REF_WADI_SESSION_MANAGER = "WADISessionManager";
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("WADI Clustered Handle Interceptor",
+                WADIClusteredHandleInterceptor.class, NameFactory.GERONIMO_SERVICE);
+        
+        infoBuilder.addReference(GBEAN_REF_WADI_SESSION_MANAGER, WADISessionManager.class, 
+                NameFactory.GERONIMO_SERVICE);
+        
+        infoBuilder.setConstructor(new String[]{GBEAN_REF_WADI_SESSION_MANAGER});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+    
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Mon Oct  2 01:55:01 2006
@@ -219,16 +219,6 @@
             <artifactId>regexp</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-tomcat55</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Mon Oct  2 01:55:01 2006
@@ -73,6 +73,7 @@
         <module>geronimo-j2ee-builder</module>
         <module>geronimo-j2ee-schema</module>
         <module>geronimo-jetty</module>
+        <module>geronimo-jetty-clustering-wadi</module>
         <module>geronimo-jetty-builder</module>
         <module>geronimo-jmx-remoting</module>
         <module>geronimo-kernel</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=451920&r1=451919&r2=451920
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Oct  2 01:55:01 2006
@@ -813,12 +813,6 @@
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
-                <artifactId>wadi-tomcat55</artifactId>
-                <version>2.0M2-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-group</artifactId>
                 <version>2.0M2-SNAPSHOT</version>
             </dependency>



Mime
View raw message