geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r590960 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/src/main/underlay/ configs/jetty6-clustering-builder-wadi/ configs/wadi-clustering/ modules/geronimo-clustering-wadi/ modules/geronimo-clustering-wadi/src/main/...
Date Thu, 01 Nov 2007 10:37:12 GMT
Author: gdamour
Date: Thu Nov  1 03:37:09 2007
New Revision: 590960

URL: http://svn.apache.org/viewvc?rev=590960&view=rev
Log:
Move to WADI version 2.0-M7 which provides a delta replication mechanism.

This fixes GERONIMO-3578 - Delta Replication of HttpSessions - Jetty 
Clustered Web-Applications

Note: the aspectjrt JAR is now included in the assembly. LICENSE and 
NOTICE have been updated accordingly as per Kevan's instructions.

Modified:
    geronimo/server/trunk/LICENSE.txt
    geronimo/server/trunk/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java
    geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
    geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/LICENSE.txt?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/LICENSE.txt (original)
+++ geronimo/server/trunk/LICENSE.txt Thu Nov  1 03:37:09 2007
@@ -1164,6 +1164,223 @@
 
 
 =========================================================================
+==  AspectJ                                                            ==
+=========================================================================
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and 
+documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and 
+are distributed by that particular Contributor. A Contribution 
+'originates' from a Contributor if it was added to the Program by such 
+Contributor itself or anyone acting on such Contributor's behalf. 
+Contributions do not include additions to the Program which: 
+(i) are separate modules of software distributed in conjunction with 
+the Program under their own license agreement, and (ii) are not 
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor 
+which are necessarily infringed by the use or sale of its Contribution 
+alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this 
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, 
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby 
+grants Recipient a non-exclusive, worldwide, royalty-free copyright 
+license to reproduce, prepare derivative works of, publicly display, 
+publicly perform, distribute and sublicense the Contribution of such 
+Contributor, if any, and such derivative works, in source code and 
+object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby 
+grants Recipient a non-exclusive, worldwide, royalty-free patent 
+license under Licensed Patents to make, use, sell, offer to sell, 
+import and otherwise transfer the Contribution of such Contributor, 
+if any, in source code and object code form. This patent license shall 
+apply to the combination of the Contribution and the Program if, at 
+the time the Contribution is added by the Contributor, such addition of 
+the Contribution causes such combination to be covered by the Licensed 
+Patents. The patent license shall not apply to any other combinations 
+which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the 
+licenses to its Contributions set forth herein, no assurances are 
+provided by any Contributor that the Program does not infringe the 
+patent or other intellectual property rights of any other entity. 
+Each Contributor disclaims any liability to Recipient for claims 
+brought by any other entity based on infringement of intellectual 
+property rights or otherwise. As a condition to exercising the rights 
+and licenses granted hereunder, each Recipient hereby assumes sole 
+responsibility to secure any other intellectual property rights needed, 
+if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's 
+responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient 
+copyright rights in its Contribution, if any, to grant the copyright 
+license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code 
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties 
+and conditions, express and implied, including warranties or conditions 
+of title and non-infringement, and implied warranties or conditions of 
+merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability 
+for damages, including direct, indirect, special, incidental and 
+consequential 
+damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are 
+offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such 
+Contributor, and informs licensees how to obtain it in a reasonable 
+manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the
+ Program.
+Contributors may not remove or alter any copyright notices contained 
+within the Program.
+
+Each Contributor must identify itself as the originator of its 
+Contribution, if any, in a manner that reasonably allows subsequent 
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities 
+with respect to end users, business partners and the like. While 
+this license is intended to facilitate the commercial use of the 
+Program, the Contributor who includes the Program in a commercial 
+product offering should do so in a manner which does not create 
+potential liability for other Contributors. Therefore, if a 
+Contributor includes the Program in a commercial product offering, 
+such Contributor ("Commercial Contributor") hereby agrees to defend 
+and indemnify every other Contributor ("Indemnified Contributor") 
+against any losses, damages and costs (collectively "Losses") arising 
+from claims, lawsuits and other legal actions brought by a third party 
+against the Indemnified Contributor to the extent caused by the acts 
+or omissions of such Commercial Contributor in connection with its
+ distribution of the Program in a commercial product offering. The 
+obligations in this section do not apply to any claims or Losses 
+relating to any actual or alleged intellectual property infringement. 
+In order to qualify, an Indemnified Contributor must: a) promptly 
+notify the Commercial Contributor in writing of such claim, and b) 
+allow the Commercial Contributor to control, and cooperate with the 
+Commercial Contributor in, the defense and any related settlement 
+negotiations. The Indemnified Contributor may participate in any such 
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial 
+product offering, Product X. That Contributor is then a Commercial 
+Contributor. If that Commercial Contributor then makes performance 
+claims, or offers warranties related to Product X, those performance 
+claims and warranties are such Commercial Contributor's responsibility 
+alone. Under this section, the Commercial Contributor would have to 
+defend claims against the other Contributors related to those 
+performance claims and warranties, and if a court requires any other 
+Contributor to pay any damages as a result, the Commercial Contributor
+ must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS 
+PROVIDED 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. Each Recipient is solely 
+responsible for determining the appropriateness of using and 
+distributing the Program and assumes all risks associated with 
+its exercise of rights under this Agreement , including but not 
+limited to the risks and costs of program errors, compliance with 
+applicable laws, damage to or loss of data, programs or equipment, 
+and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT 
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
+THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS 
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under 
+applicable law, it shall not affect the validity or enforceability of 
+the remainder of the terms of this Agreement, and without further 
+action by the parties hereto, such provision shall be reformed to the 
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including 
+a cross-claim or counterclaim in a lawsuit) alleging that the Program 
+itself (excluding combinations of the Program with other software or 
+hardware) infringes such Recipient's patent(s), then such Recipient's 
+rights granted under Section 2(b) shall terminate as of the date such 
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails 
+to comply with any of the material terms or conditions of this Agreement 
+and does not cure such failure in a reasonable period of time after 
+becoming aware of such noncompliance. If all Recipient's rights under 
+this Agreement terminate, Recipient agrees to cease use and distribution 
+of the Program as soon as reasonably practicable. However, Recipient's 
+obligations under this Agreement and any licenses granted by Recipient 
+relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, 
+but in order to avoid inconsistency the Agreement is copyrighted and may 
+only be modified in the following manner. The Agreement Steward reserves 
+the right to publish new versions (including revisions) of this Agreement 
+from time to time. No one other than the Agreement Steward has the right 
+to modify this Agreement. The Eclipse Foundation is the initial Agreement 
+Steward. The Eclipse Foundation may assign the responsibility to serve as 
+the Agreement Steward to a suitable separate entity. Each new version of 
+the Agreement will be given a distinguishing version number. The Program 
+(including Contributions) may always be distributed subject to the 
+version of the Agreement under which it was received. In addition, after 
+a new version of the Agreement is published, Contributor may elect to 
+distribute the Program (including its Contributions) under the new version.
+ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient 
+receives no rights or licenses to the intellectual property of any 
+Contributor under this Agreement, whether expressly, by implication, 
+estoppel or otherwise. All rights in the Program not expressly granted 
+under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the 
+intellectual property laws of the United States of America. No party to 
+this Agreement will bring a legal action under this Agreement more than 
+one year after the cause of action arose. Each party waives its rights 
+to a jury trial in any resulting litigation.
+
+
+=========================================================================
 ==  Backport-Util-Concurrent                                           ==
 =========================================================================
 

Modified: geronimo/server/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/NOTICE.txt (original)
+++ geronimo/server/trunk/NOTICE.txt Thu Nov  1 03:37:09 2007
@@ -414,6 +414,16 @@
 Copyright (c) 2000-2005 INRIA, France Telecom
 All rights reserved.
 
+=========================================================================
+==  AspectJ Notice                                                     ==
+=========================================================================
+
+This product includes software developed by
+  the Eclipse Foundation (http://www.eclipse.org/).
+
+AspectJ source code can be obtained from the AspectJ web site
+  http://www.eclipse.org/aspectj/
+
 
 =========================================================================
 ==  Backport Util Concurrent Notice                                    ==

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt Thu Nov  1 03:37:09 2007
@@ -1164,6 +1164,223 @@
 
 
 =========================================================================
+==  AspectJ                                                            ==
+=========================================================================
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and 
+documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and 
+are distributed by that particular Contributor. A Contribution 
+'originates' from a Contributor if it was added to the Program by such 
+Contributor itself or anyone acting on such Contributor's behalf. 
+Contributions do not include additions to the Program which: 
+(i) are separate modules of software distributed in conjunction with 
+the Program under their own license agreement, and (ii) are not 
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor 
+which are necessarily infringed by the use or sale of its Contribution 
+alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this 
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, 
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby 
+grants Recipient a non-exclusive, worldwide, royalty-free copyright 
+license to reproduce, prepare derivative works of, publicly display, 
+publicly perform, distribute and sublicense the Contribution of such 
+Contributor, if any, and such derivative works, in source code and 
+object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby 
+grants Recipient a non-exclusive, worldwide, royalty-free patent 
+license under Licensed Patents to make, use, sell, offer to sell, 
+import and otherwise transfer the Contribution of such Contributor, 
+if any, in source code and object code form. This patent license shall 
+apply to the combination of the Contribution and the Program if, at 
+the time the Contribution is added by the Contributor, such addition of 
+the Contribution causes such combination to be covered by the Licensed 
+Patents. The patent license shall not apply to any other combinations 
+which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the 
+licenses to its Contributions set forth herein, no assurances are 
+provided by any Contributor that the Program does not infringe the 
+patent or other intellectual property rights of any other entity. 
+Each Contributor disclaims any liability to Recipient for claims 
+brought by any other entity based on infringement of intellectual 
+property rights or otherwise. As a condition to exercising the rights 
+and licenses granted hereunder, each Recipient hereby assumes sole 
+responsibility to secure any other intellectual property rights needed, 
+if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's 
+responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient 
+copyright rights in its Contribution, if any, to grant the copyright 
+license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code 
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties 
+and conditions, express and implied, including warranties or conditions 
+of title and non-infringement, and implied warranties or conditions of 
+merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability 
+for damages, including direct, indirect, special, incidental and 
+consequential 
+damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are 
+offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such 
+Contributor, and informs licensees how to obtain it in a reasonable 
+manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the
+ Program.
+Contributors may not remove or alter any copyright notices contained 
+within the Program.
+
+Each Contributor must identify itself as the originator of its 
+Contribution, if any, in a manner that reasonably allows subsequent 
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities 
+with respect to end users, business partners and the like. While 
+this license is intended to facilitate the commercial use of the 
+Program, the Contributor who includes the Program in a commercial 
+product offering should do so in a manner which does not create 
+potential liability for other Contributors. Therefore, if a 
+Contributor includes the Program in a commercial product offering, 
+such Contributor ("Commercial Contributor") hereby agrees to defend 
+and indemnify every other Contributor ("Indemnified Contributor") 
+against any losses, damages and costs (collectively "Losses") arising 
+from claims, lawsuits and other legal actions brought by a third party 
+against the Indemnified Contributor to the extent caused by the acts 
+or omissions of such Commercial Contributor in connection with its
+ distribution of the Program in a commercial product offering. The 
+obligations in this section do not apply to any claims or Losses 
+relating to any actual or alleged intellectual property infringement. 
+In order to qualify, an Indemnified Contributor must: a) promptly 
+notify the Commercial Contributor in writing of such claim, and b) 
+allow the Commercial Contributor to control, and cooperate with the 
+Commercial Contributor in, the defense and any related settlement 
+negotiations. The Indemnified Contributor may participate in any such 
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial 
+product offering, Product X. That Contributor is then a Commercial 
+Contributor. If that Commercial Contributor then makes performance 
+claims, or offers warranties related to Product X, those performance 
+claims and warranties are such Commercial Contributor's responsibility 
+alone. Under this section, the Commercial Contributor would have to 
+defend claims against the other Contributors related to those 
+performance claims and warranties, and if a court requires any other 
+Contributor to pay any damages as a result, the Commercial Contributor
+ must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS 
+PROVIDED 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. Each Recipient is solely 
+responsible for determining the appropriateness of using and 
+distributing the Program and assumes all risks associated with 
+its exercise of rights under this Agreement , including but not 
+limited to the risks and costs of program errors, compliance with 
+applicable laws, damage to or loss of data, programs or equipment, 
+and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT 
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
+THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS 
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under 
+applicable law, it shall not affect the validity or enforceability of 
+the remainder of the terms of this Agreement, and without further 
+action by the parties hereto, such provision shall be reformed to the 
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including 
+a cross-claim or counterclaim in a lawsuit) alleging that the Program 
+itself (excluding combinations of the Program with other software or 
+hardware) infringes such Recipient's patent(s), then such Recipient's 
+rights granted under Section 2(b) shall terminate as of the date such 
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails 
+to comply with any of the material terms or conditions of this Agreement 
+and does not cure such failure in a reasonable period of time after 
+becoming aware of such noncompliance. If all Recipient's rights under 
+this Agreement terminate, Recipient agrees to cease use and distribution 
+of the Program as soon as reasonably practicable. However, Recipient's 
+obligations under this Agreement and any licenses granted by Recipient 
+relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, 
+but in order to avoid inconsistency the Agreement is copyrighted and may 
+only be modified in the following manner. The Agreement Steward reserves 
+the right to publish new versions (including revisions) of this Agreement 
+from time to time. No one other than the Agreement Steward has the right 
+to modify this Agreement. The Eclipse Foundation is the initial Agreement 
+Steward. The Eclipse Foundation may assign the responsibility to serve as 
+the Agreement Steward to a suitable separate entity. Each new version of 
+the Agreement will be given a distinguishing version number. The Program 
+(including Contributions) may always be distributed subject to the 
+version of the Agreement under which it was received. In addition, after 
+a new version of the Agreement is published, Contributor may elect to 
+distribute the Program (including its Contributions) under the new version.
+ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient 
+receives no rights or licenses to the intellectual property of any 
+Contributor under this Agreement, whether expressly, by implication, 
+estoppel or otherwise. All rights in the Program not expressly granted 
+under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the 
+intellectual property laws of the United States of America. No party to 
+this Agreement will bring a legal action under this Agreement more than 
+one year after the cause of action arose. Each party waives its rights 
+to a jury trial in any resulting litigation.
+
+
+=========================================================================
 ==  Backport-Util-Concurrent                                           ==
 =========================================================================
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt Thu Nov  1 03:37:09 2007
@@ -416,6 +416,18 @@
 
 
 =========================================================================
+==  AspectJ Notice                                                     ==
+=========================================================================
+
+This product includes software developed by
+  the Eclipse Foundation (http://www.eclipse.org/).
+
+AspectJ source code can be obtained from the AspectJ web site
+  http://www.eclipse.org/aspectj/
+
+
+
+=========================================================================
 ==  Backport Util Concurrent Notice                                    ==
 =========================================================================
 

Modified: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml Thu Nov  1 03:37:09 2007
@@ -48,48 +48,12 @@
             <version>${version}</version>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
-            <version>${version}</version>
-        </dependency>
--->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </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-tribes</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
-        </dependency>
--->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/pom.xml Thu Nov  1 03:37:09 2007
@@ -38,6 +38,17 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>1.3.4</version>
+        </dependency>
+
        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>clustering</artifactId>
@@ -52,33 +63,33 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-core</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>juli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-group</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tribes</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-tribes</artifactId>
+            <artifactId>wadi-aop</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-core</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>juli</artifactId>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-group</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>1.3.4</version>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-tribes</artifactId>
         </dependency>
     </dependencies>
 

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?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml Thu Nov  1 03:37:09 2007
@@ -52,6 +52,11 @@
         
         <dependency>
             <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-aop</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
             <artifactId>wadi-group</artifactId>
         </dependency>
         

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java Thu Nov  1 03:37:09 2007
@@ -34,6 +34,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.codehaus.wadi.aop.replication.AOPStackContext;
 import org.codehaus.wadi.core.assembler.StackContext;
 import org.codehaus.wadi.core.manager.Manager;
 import org.codehaus.wadi.core.manager.SessionMonitor;
@@ -77,13 +78,25 @@
         Dispatcher underlyingDisp = cluster.getCluster().getDispatcher();
         
         ServiceSpaceName serviceSpaceName = new ServiceSpaceName(configInfo.getServiceSpaceURI());
-        StackContext stackContext = new StackContext(cl,
+        StackContext stackContext;
+        if (configInfo.isDeltaReplication()) {
+            stackContext = new AOPStackContext(cl,
                 serviceSpaceName,
                 underlyingDisp,
                 configInfo.getSessionTimeoutSeconds(),
                 configInfo.getNumPartitions(),
                 configInfo.getSweepInterval(),
                 backingStrategyFactory);
+        } else {
+            stackContext = new StackContext(cl,
+                serviceSpaceName,
+                underlyingDisp,
+                configInfo.getSessionTimeoutSeconds(),
+                configInfo.getNumPartitions(),
+                configInfo.getSweepInterval(),
+                backingStrategyFactory);
+        }
+        stackContext.setDisableReplication(configInfo.isDisableReplication());
         stackContext.build();
 
         serviceSpace = stackContext.getServiceSpace();

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java Thu Nov  1 03:37:09 2007
@@ -23,6 +23,7 @@
 import org.codehaus.wadi.replication.strategy.BackingStrategy;
 import org.codehaus.wadi.replication.strategy.BackingStrategyFactory;
 import org.codehaus.wadi.replication.strategy.RoundRobinBackingStrategyFactory;
+import org.codehaus.wadi.servicespace.ServiceSpace;
 
 /**
  * 
@@ -32,6 +33,7 @@
     private final int nbReplica;
     
     private BackingStrategyFactory strategyFactory;
+    private ServiceSpace serviceSpace;
     
     public RoundRobinBackingStrategyFactoryGBean(int nbReplica) {
         this.nbReplica = nbReplica;
@@ -39,6 +41,10 @@
 
     public BackingStrategy factory() {
         return strategyFactory.factory();
+    }
+    
+    public void setServiceSpace(ServiceSpace serviceSpace) {
+        strategyFactory.setServiceSpace(serviceSpace);
     }
 
     public void doFail() {

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java Thu Nov  1 03:37:09 2007
@@ -27,6 +27,8 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.codehaus.wadi.core.reflect.base.DeclaredMemberFilter;
+import org.codehaus.wadi.core.reflect.jdk.JDKClassIndexerRegistry;
 import org.codehaus.wadi.group.Dispatcher;
 import org.codehaus.wadi.group.DispatcherRegistry;
 import org.codehaus.wadi.group.MessageExchangeException;
@@ -72,7 +74,7 @@
             Collections.EMPTY_SET);
         dispatcher.start();
         
-        adminServiceSpace = new AdminServiceSpace(dispatcher);
+        adminServiceSpace = new AdminServiceSpace(dispatcher, new JDKClassIndexerRegistry(new DeclaredMemberFilter()));
         
         registerCustomAdminServices();
         

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java Thu Nov  1 03:37:09 2007
@@ -24,5 +24,4 @@
  */
 public interface WADICluster extends Cluster {
     org.codehaus.wadi.group.Cluster getCluster();
-    
 }

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java (original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java Thu Nov  1 03:37:09 2007
@@ -28,9 +28,13 @@
     private final int sweepInterval;
     private final int numPartitions;
     private final int sessionTimeoutSeconds;
+    private final boolean disableReplication;
+    private final boolean deltaReplication;
     
     public WADISessionManagerConfigInfo(URI serviceSpaceURI, int sweepInterval, int numPartitions,
-            int sessionTimeoutSeconds) {
+            int sessionTimeoutSeconds,
+            boolean disableReplication,
+            boolean deltaReplication) {
         if (null == serviceSpaceURI) {
             throw new IllegalArgumentException("serviceSpaceURI is required");
         } else if (1 > sweepInterval) {
@@ -44,6 +48,8 @@
         this.sweepInterval = sweepInterval;
         this.numPartitions = numPartitions;
         this.sessionTimeoutSeconds = sessionTimeoutSeconds;
+        this.disableReplication = disableReplication;
+        this.deltaReplication = deltaReplication;
     }
 
     public int getNumPartitions() {
@@ -60,6 +66,14 @@
 
     public int getSweepInterval() {
         return sweepInterval;
+    }
+
+    public boolean isDisableReplication() {
+        return disableReplication;
+    }
+
+    public boolean isDeltaReplication() {
+        return deltaReplication;
     }
     
 }

Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java Thu Nov  1 03:37:09 2007
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.jetty6.cluster.wadi.builder;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -100,7 +102,7 @@
         }
     }
 
-    private GBeanData extractWebModule(DeploymentContext moduleContext) throws DeploymentException {
+    protected GBeanData extractWebModule(DeploymentContext moduleContext) throws DeploymentException {
         Configuration configuration = moduleContext.getConfiguration();
         AbstractNameQuery webModuleQuery = new AbstractNameQuery(configuration.getId(), Collections.EMPTY_MAP, Collections.singleton(JettyWebAppContext.class.getName()));
         try {
@@ -118,7 +120,7 @@
         return CLUSTERING_WADI_QNAME_SET;
     }
 
-    private GerClusteringWadiType getWadiClusterConfig(XmlObject container) throws DeploymentException {
+    protected GerClusteringWadiType getWadiClusterConfig(XmlObject container) throws DeploymentException {
         XmlObject[] items = container.selectChildren(CLUSTERING_WADI_QNAME_SET);
         if (items.length > 1) {
             throw new DeploymentException("Unexpected count of clustering elements in geronimo plan " + items.length + " qnameset: " + CLUSTERING_WADI_QNAME_SET);
@@ -129,7 +131,7 @@
         return null;
     }
 
-    private AbstractName addSessionManager(GerClusteringWadiType clustering,
+    protected AbstractName addSessionManager(GerClusteringWadiType clustering,
             GBeanData webModuleData,
             DeploymentContext moduleContext) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
@@ -146,29 +148,67 @@
         return name;
     }
     
-    private void setConfigInfo(GerClusteringWadiType clustering, GBeanData webModuleData, GBeanData beanData) {
-        int sweepInterval = defaultSweepInterval;
-        if (clustering.isSetSweepInterval()) {
-            sweepInterval = clustering.getSweepInterval().intValue();
-        }
-        int numPartitions = defaultNumPartitions;
-        if (clustering.isSetNumPartitions()) {
-            numPartitions = clustering.getNumPartitions().intValue();
-        }
-        Integer sessionTimeout = (Integer) webModuleData.getAttribute(JettyWebAppContext.GBEAN_ATTR_SESSION_TIMEOUT);
-        if (null == sessionTimeout) {
-            throw new AssertionError();
+    protected void setConfigInfo(GerClusteringWadiType clustering, GBeanData webModuleData, GBeanData beanData) {
+        int sweepInterval = getSweepInterval(clustering);
+        int numPartitions = getNumberOfPartitions(clustering);
+        Integer sessionTimeout = getSessionTimeout(webModuleData);
+        boolean disableReplication = isDisableReplication(clustering);
+        boolean deltaReplication = isDeltaReplication(clustering);
+        
+        String contextPath = (String) webModuleData.getAttribute("contextPath");
+        URI serviceSpaceName;
+        try {
+            serviceSpaceName = new URI(contextPath);
+        } catch (URISyntaxException e) {
+            throw (AssertionError) new AssertionError("contextPath [" + contextPath + "] cannot be parsed as an URI.").initCause(e);
         }
         
-        WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(
-                beanData.getAbstractName().toURI(),
+        WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(serviceSpaceName,
                 sweepInterval,
                 numPartitions,
-                sessionTimeout.intValue());
+                sessionTimeout.intValue(),
+                disableReplication,
+                deltaReplication);
         beanData.setAttribute(BasicWADISessionManager.GBEAN_ATTR_WADI_CONFIG_INFO, configInfo);
     }
 
-    private void setCluster(GerClusteringWadiType clustering, GBeanData beanData) {
+    protected Integer getSessionTimeout(GBeanData webModuleData) throws AssertionError {
+        Integer sessionTimeout = (Integer) webModuleData.getAttribute(JettyWebAppContext.GBEAN_ATTR_SESSION_TIMEOUT);
+        if (null == sessionTimeout) {
+            throw new AssertionError();
+        }
+        return sessionTimeout;
+    }
+
+    protected boolean isDeltaReplication(GerClusteringWadiType clustering) {
+        if (clustering.isSetDeltaReplication()) {
+            return clustering.getDeltaReplication();
+        }
+        return false;
+    }
+
+    protected boolean isDisableReplication(GerClusteringWadiType clustering) {
+        if (clustering.isSetDisableReplication()) {
+            return clustering.getDisableReplication();
+        }
+        return false;
+    }
+
+    protected int getNumberOfPartitions(GerClusteringWadiType clustering) {
+        if (clustering.isSetNumPartitions()) {
+            return clustering.getNumPartitions().intValue();
+        }
+        return defaultNumPartitions;
+    }
+
+    protected int getSweepInterval(GerClusteringWadiType clustering) {
+        if (clustering.isSetSweepInterval()) {
+            return clustering.getSweepInterval().intValue();
+        }
+        return defaultSweepInterval;
+    }
+
+    protected void setCluster(GerClusteringWadiType clustering, GBeanData beanData) {
         Set patterns = new HashSet();
         if (clustering.isSetCluster()) {
             addAbstractNameQueries(patterns, clustering.getCluster().getPatternArray());
@@ -178,7 +218,7 @@
         beanData.setReferencePatterns(BasicWADISessionManager.GBEAN_REF_CLUSTER, patterns);
     }
 
-    private void setBackingStrategyFactory(GerClusteringWadiType clustering, GBeanData beanData) {
+    protected void setBackingStrategyFactory(GerClusteringWadiType clustering, GBeanData beanData) {
         Set patterns = new HashSet();
         if (clustering.isSetBackingStrategyFactory()) {
             addAbstractNameQueries(patterns, clustering.getBackingStrategyFactory().getPatternArray());
@@ -188,7 +228,7 @@
         beanData.setReferencePatterns(BasicWADISessionManager.GBEAN_REF_BACKING_STRATEGY_FACTORY, patterns);
     }
 
-    private AbstractName addPreHandlerFactory(DeploymentContext moduleContext,
+    protected AbstractName addPreHandlerFactory(DeploymentContext moduleContext,
             GBeanData webModuleData, AbstractName sessionManagerName) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
                 "WADIClusteredPreHandlerFactory", NameFactory.GERONIMO_SERVICE);
@@ -203,7 +243,7 @@
         return name;
     }
 
-    private AbstractName addSessionHandlerFactory(DeploymentContext moduleContext,
+    protected AbstractName addSessionHandlerFactory(DeploymentContext moduleContext,
             GBeanData webModuleData, AbstractName sessionManagerName) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
                 "ClusteredSessionHandlerFactory", NameFactory.GERONIMO_SERVICE);
@@ -218,7 +258,7 @@
         return name;
     }
 
-    private void addAbstractNameQueries(Set patterns, GerPatternType[] patternTypes) {
+    protected void addAbstractNameQueries(Set patterns, GerPatternType[] patternTypes) {
         for (int i = 0; i < patternTypes.length; i++) {
             AbstractNameQuery query = ENCConfigBuilder.buildAbstractNameQuery(patternTypes[i], null, null, null);
             patterns.add(query);

Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd Thu Nov  1 03:37:09 2007
@@ -40,6 +40,8 @@
                 <xs:element name="sweepInterval" type="xs:integer" minOccurs="0"/>
                 <xs:element name="numPartitions" type="xs:integer" minOccurs="0"/>
                 <xs:element name="cluster" type="naming:gbean-refType" minOccurs="0"/>
+                <xs:element name="disableReplication" type="xs:boolean" minOccurs="0"/>
+                <xs:element name="deltaReplication" type="xs:boolean" minOccurs="0"/>
                 <xs:element name="backing-strategy-factory" type="naming:gbean-refType" minOccurs="0"/>
             </xs:sequence>
         </xs:extension>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Thu Nov  1 03:37:09 2007
@@ -52,6 +52,11 @@
         
         <dependency>
             <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-aop</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
             <artifactId>wadi-group</artifactId>
         </dependency>
         

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java Thu Nov  1 03:37:09 2007
@@ -34,6 +34,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.codehaus.wadi.aop.replication.AOPStackContext;
 import org.codehaus.wadi.core.assembler.StackContext;
 import org.codehaus.wadi.core.manager.Manager;
 import org.codehaus.wadi.core.manager.SessionMonitor;
@@ -77,13 +78,25 @@
         Dispatcher underlyingDisp = cluster.getCluster().getDispatcher();
         
         ServiceSpaceName serviceSpaceName = new ServiceSpaceName(configInfo.getServiceSpaceURI());
-        StackContext stackContext = new StackContext(cl,
+        StackContext stackContext;
+        if (configInfo.isDeltaReplication()) {
+            stackContext = new AOPStackContext(cl,
                 serviceSpaceName,
                 underlyingDisp,
                 configInfo.getSessionTimeoutSeconds(),
                 configInfo.getNumPartitions(),
                 configInfo.getSweepInterval(),
                 backingStrategyFactory);
+        } else {
+            stackContext = new StackContext(cl,
+                serviceSpaceName,
+                underlyingDisp,
+                configInfo.getSessionTimeoutSeconds(),
+                configInfo.getNumPartitions(),
+                configInfo.getSweepInterval(),
+                backingStrategyFactory);
+        }
+        stackContext.setDisableReplication(configInfo.isDisableReplication());
         stackContext.build();
 
         serviceSpace = stackContext.getServiceSpace();

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java Thu Nov  1 03:37:09 2007
@@ -23,6 +23,7 @@
 import org.codehaus.wadi.replication.strategy.BackingStrategy;
 import org.codehaus.wadi.replication.strategy.BackingStrategyFactory;
 import org.codehaus.wadi.replication.strategy.RoundRobinBackingStrategyFactory;
+import org.codehaus.wadi.servicespace.ServiceSpace;
 
 /**
  * 
@@ -32,6 +33,7 @@
     private final int nbReplica;
     
     private BackingStrategyFactory strategyFactory;
+    private ServiceSpace serviceSpace;
     
     public RoundRobinBackingStrategyFactoryGBean(int nbReplica) {
         this.nbReplica = nbReplica;
@@ -39,6 +41,10 @@
 
     public BackingStrategy factory() {
         return strategyFactory.factory();
+    }
+    
+    public void setServiceSpace(ServiceSpace serviceSpace) {
+        strategyFactory.setServiceSpace(serviceSpace);
     }
 
     public void doFail() {

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java Thu Nov  1 03:37:09 2007
@@ -27,6 +27,8 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.codehaus.wadi.core.reflect.base.DeclaredMemberFilter;
+import org.codehaus.wadi.core.reflect.jdk.JDKClassIndexerRegistry;
 import org.codehaus.wadi.group.Dispatcher;
 import org.codehaus.wadi.group.DispatcherRegistry;
 import org.codehaus.wadi.group.MessageExchangeException;
@@ -72,7 +74,7 @@
             Collections.EMPTY_SET);
         dispatcher.start();
         
-        adminServiceSpace = new AdminServiceSpace(dispatcher);
+        adminServiceSpace = new AdminServiceSpace(dispatcher, new JDKClassIndexerRegistry(new DeclaredMemberFilter()));
         
         registerCustomAdminServices();
         

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADICluster.java Thu Nov  1 03:37:09 2007
@@ -24,5 +24,4 @@
  */
 public interface WADICluster extends Cluster {
     org.codehaus.wadi.group.Cluster getCluster();
-    
 }

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java Thu Nov  1 03:37:09 2007
@@ -28,9 +28,13 @@
     private final int sweepInterval;
     private final int numPartitions;
     private final int sessionTimeoutSeconds;
+    private final boolean disableReplication;
+    private final boolean deltaReplication;
     
     public WADISessionManagerConfigInfo(URI serviceSpaceURI, int sweepInterval, int numPartitions,
-            int sessionTimeoutSeconds) {
+            int sessionTimeoutSeconds,
+            boolean disableReplication,
+            boolean deltaReplication) {
         if (null == serviceSpaceURI) {
             throw new IllegalArgumentException("serviceSpaceURI is required");
         } else if (1 > sweepInterval) {
@@ -44,6 +48,8 @@
         this.sweepInterval = sweepInterval;
         this.numPartitions = numPartitions;
         this.sessionTimeoutSeconds = sessionTimeoutSeconds;
+        this.disableReplication = disableReplication;
+        this.deltaReplication = deltaReplication;
     }
 
     public int getNumPartitions() {
@@ -60,6 +66,14 @@
 
     public int getSweepInterval() {
         return sweepInterval;
+    }
+
+    public boolean isDisableReplication() {
+        return disableReplication;
+    }
+
+    public boolean isDeltaReplication() {
+        return deltaReplication;
     }
     
 }

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Thu Nov  1 03:37:09 2007
@@ -38,6 +38,17 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>1.3.4</version>
+        </dependency>
+
        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>clustering</artifactId>
@@ -52,33 +63,33 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-core</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>juli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-group</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tribes</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-tribes</artifactId>
+            <artifactId>wadi-aop</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-core</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>juli</artifactId>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-group</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>1.3.4</version>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-tribes</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java Thu Nov  1 03:37:09 2007
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.jetty6.cluster.wadi.builder;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -100,7 +102,7 @@
         }
     }
 
-    private GBeanData extractWebModule(DeploymentContext moduleContext) throws DeploymentException {
+    protected GBeanData extractWebModule(DeploymentContext moduleContext) throws DeploymentException {
         Configuration configuration = moduleContext.getConfiguration();
         AbstractNameQuery webModuleQuery = new AbstractNameQuery(configuration.getId(), Collections.EMPTY_MAP, Collections.singleton(JettyWebAppContext.class.getName()));
         try {
@@ -118,7 +120,7 @@
         return CLUSTERING_WADI_QNAME_SET;
     }
 
-    private GerClusteringWadiType getWadiClusterConfig(XmlObject container) throws DeploymentException {
+    protected GerClusteringWadiType getWadiClusterConfig(XmlObject container) throws DeploymentException {
         XmlObject[] items = container.selectChildren(CLUSTERING_WADI_QNAME_SET);
         if (items.length > 1) {
             throw new DeploymentException("Unexpected count of clustering elements in geronimo plan " + items.length + " qnameset: " + CLUSTERING_WADI_QNAME_SET);
@@ -129,7 +131,7 @@
         return null;
     }
 
-    private AbstractName addSessionManager(GerClusteringWadiType clustering,
+    protected AbstractName addSessionManager(GerClusteringWadiType clustering,
             GBeanData webModuleData,
             DeploymentContext moduleContext) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
@@ -146,29 +148,67 @@
         return name;
     }
     
-    private void setConfigInfo(GerClusteringWadiType clustering, GBeanData webModuleData, GBeanData beanData) {
-        int sweepInterval = defaultSweepInterval;
-        if (clustering.isSetSweepInterval()) {
-            sweepInterval = clustering.getSweepInterval().intValue();
-        }
-        int numPartitions = defaultNumPartitions;
-        if (clustering.isSetNumPartitions()) {
-            numPartitions = clustering.getNumPartitions().intValue();
-        }
-        Integer sessionTimeout = (Integer) webModuleData.getAttribute(JettyWebAppContext.GBEAN_ATTR_SESSION_TIMEOUT);
-        if (null == sessionTimeout) {
-            throw new AssertionError();
+    protected void setConfigInfo(GerClusteringWadiType clustering, GBeanData webModuleData, GBeanData beanData) {
+        int sweepInterval = getSweepInterval(clustering);
+        int numPartitions = getNumberOfPartitions(clustering);
+        Integer sessionTimeout = getSessionTimeout(webModuleData);
+        boolean disableReplication = isDisableReplication(clustering);
+        boolean deltaReplication = isDeltaReplication(clustering);
+        
+        String contextPath = (String) webModuleData.getAttribute("contextPath");
+        URI serviceSpaceName;
+        try {
+            serviceSpaceName = new URI(contextPath);
+        } catch (URISyntaxException e) {
+            throw (AssertionError) new AssertionError("contextPath [" + contextPath + "] cannot be parsed as an URI.").initCause(e);
         }
         
-        WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(
-                beanData.getAbstractName().toURI(),
+        WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(serviceSpaceName,
                 sweepInterval,
                 numPartitions,
-                sessionTimeout.intValue());
+                sessionTimeout.intValue(),
+                disableReplication,
+                deltaReplication);
         beanData.setAttribute(BasicWADISessionManager.GBEAN_ATTR_WADI_CONFIG_INFO, configInfo);
     }
 
-    private void setCluster(GerClusteringWadiType clustering, GBeanData beanData) {
+    protected Integer getSessionTimeout(GBeanData webModuleData) throws AssertionError {
+        Integer sessionTimeout = (Integer) webModuleData.getAttribute(JettyWebAppContext.GBEAN_ATTR_SESSION_TIMEOUT);
+        if (null == sessionTimeout) {
+            throw new AssertionError();
+        }
+        return sessionTimeout;
+    }
+
+    protected boolean isDeltaReplication(GerClusteringWadiType clustering) {
+        if (clustering.isSetDeltaReplication()) {
+            return clustering.getDeltaReplication();
+        }
+        return false;
+    }
+
+    protected boolean isDisableReplication(GerClusteringWadiType clustering) {
+        if (clustering.isSetDisableReplication()) {
+            return clustering.getDisableReplication();
+        }
+        return false;
+    }
+
+    protected int getNumberOfPartitions(GerClusteringWadiType clustering) {
+        if (clustering.isSetNumPartitions()) {
+            return clustering.getNumPartitions().intValue();
+        }
+        return defaultNumPartitions;
+    }
+
+    protected int getSweepInterval(GerClusteringWadiType clustering) {
+        if (clustering.isSetSweepInterval()) {
+            return clustering.getSweepInterval().intValue();
+        }
+        return defaultSweepInterval;
+    }
+
+    protected void setCluster(GerClusteringWadiType clustering, GBeanData beanData) {
         Set patterns = new HashSet();
         if (clustering.isSetCluster()) {
             addAbstractNameQueries(patterns, clustering.getCluster().getPatternArray());
@@ -178,7 +218,7 @@
         beanData.setReferencePatterns(BasicWADISessionManager.GBEAN_REF_CLUSTER, patterns);
     }
 
-    private void setBackingStrategyFactory(GerClusteringWadiType clustering, GBeanData beanData) {
+    protected void setBackingStrategyFactory(GerClusteringWadiType clustering, GBeanData beanData) {
         Set patterns = new HashSet();
         if (clustering.isSetBackingStrategyFactory()) {
             addAbstractNameQueries(patterns, clustering.getBackingStrategyFactory().getPatternArray());
@@ -188,7 +228,7 @@
         beanData.setReferencePatterns(BasicWADISessionManager.GBEAN_REF_BACKING_STRATEGY_FACTORY, patterns);
     }
 
-    private AbstractName addPreHandlerFactory(DeploymentContext moduleContext,
+    protected AbstractName addPreHandlerFactory(DeploymentContext moduleContext,
             GBeanData webModuleData, AbstractName sessionManagerName) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
                 "WADIClusteredPreHandlerFactory", NameFactory.GERONIMO_SERVICE);
@@ -203,7 +243,7 @@
         return name;
     }
 
-    private AbstractName addSessionHandlerFactory(DeploymentContext moduleContext,
+    protected AbstractName addSessionHandlerFactory(DeploymentContext moduleContext,
             GBeanData webModuleData, AbstractName sessionManagerName) throws GBeanAlreadyExistsException {
         AbstractName name = moduleContext.getNaming().createChildName(moduleContext.getModuleName(),
                 "ClusteredSessionHandlerFactory", NameFactory.GERONIMO_SERVICE);
@@ -218,7 +258,7 @@
         return name;
     }
 
-    private void addAbstractNameQueries(Set patterns, GerPatternType[] patternTypes) {
+    protected void addAbstractNameQueries(Set patterns, GerPatternType[] patternTypes) {
         for (int i = 0; i < patternTypes.length; i++) {
             AbstractNameQuery query = ENCConfigBuilder.buildAbstractNameQuery(patternTypes[i], null, null, null);
             patterns.add(query);

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd Thu Nov  1 03:37:09 2007
@@ -40,6 +40,8 @@
                 <xs:element name="sweepInterval" type="xs:integer" minOccurs="0"/>
                 <xs:element name="numPartitions" type="xs:integer" minOccurs="0"/>
                 <xs:element name="cluster" type="naming:gbean-refType" minOccurs="0"/>
+                <xs:element name="disableReplication" type="xs:boolean" minOccurs="0"/>
+                <xs:element name="deltaReplication" type="xs:boolean" minOccurs="0"/>
                 <xs:element name="backing-strategy-factory" type="naming:gbean-refType" minOccurs="0"/>
             </xs:sequence>
         </xs:extension>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml Thu Nov  1 03:37:09 2007
@@ -48,48 +48,12 @@
             <version>${version}</version>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
-            <version>${version}</version>
-        </dependency>
--->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </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-tribes</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
-        </dependency>
--->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=590960&r1=590959&r2=590960&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Nov  1 03:37:09 2007
@@ -340,6 +340,12 @@
                 <version>2.2.3</version>
             </dependency>
 
+            <dependency>
+                <groupId>aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>1.5.2a</version>
+            </dependency>
+
             <!--
             NOTE: This is included for AMQ 4.1 support only.  Need to use 2.2 to
                   be compatible with AMQ 4.1, latest 3.0 causes CCE problems.
@@ -1003,20 +1009,26 @@
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
+                <artifactId>wadi-aop</artifactId>
+                <version>2.0-M7</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-core</artifactId>
-                <version>2.0-M5</version>
+                <version>2.0-M7</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-group</artifactId>
-                <version>2.0-M5</version>
+                <version>2.0-M7</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-tribes</artifactId>
-                <version>2.0-M5</version>
+                <version>2.0-M7</version>
             </dependency>
 
             <dependency>



Mime
View raw message