incubator-wadi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdud...@apache.org
Subject svn commit: r356933 [27/35] - in /incubator/wadi/trunk: ./ etc/ modules/ modules/assembly/ modules/assembly/src/ modules/assembly/src/bin/ modules/assembly/src/conf/ modules/assembly/src/main/ modules/assembly/src/main/assembly/ modules/core/ modules/c...
Date Wed, 14 Dec 2005 23:36:16 GMT
Added: incubator/wadi/trunk/modules/tomcat55/src/main/java/org/codehaus/wadi/tomcat55/Valve.java
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/main/java/org/codehaus/wadi/tomcat55/Valve.java?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/main/java/org/codehaus/wadi/tomcat55/Valve.java (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/main/java/org/codehaus/wadi/tomcat55/Valve.java Wed Dec 14 15:32:56 2005
@@ -0,0 +1,69 @@
+/**
+ *
+ * Copyright 2003-2005 Core Developers Network Ltd.
+ *
+ *  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.codehaus.wadi.tomcat55;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletException;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A Tomcat Valve which checks incoming proxied requests to see if they were originally from
+ * a secure connection. If this is the case, it modifies the request object so that it encodes
+ * this fact.
+ *
+ * @author <a href="mailto:jules@coredevelopers.net">Jules Gosnell</a>
+ * @version $Revision: 1.2 $
+ */
+
+// how do we install this ?
+
+public class Valve extends ValveBase {
+
+	protected final Log _log=LogFactory.getLog(getClass());
+	protected final Pattern _trustedIps;
+
+	public Valve(Pattern trustedIps) {
+		_trustedIps=trustedIps;
+		if (_log.isInfoEnabled()) _log.info("WADI Valve in place: "+_trustedIps.pattern());
+	}
+
+	public void invoke(Request request, Response response) throws IOException, ServletException {
+		// request must have been :
+		//  proxied by WADI
+		String val=request.getHeader("Via");
+		if (val!=null && val.endsWith("\"WADI\"")) { // TODO - should we ignore case ?
+			String ip=request.getRemoteAddr();
+			//  from a trusted IP...
+			if (_trustedIps.matcher(ip).matches()) {
+				if (_log.isTraceEnabled()) _log.trace("securing proxied request: "+request.getRequestURL());
+				request.setSecure(true);
+			} else {
+				// otherwise we have a configuration issue or are being spoofed...
+				if (_log.isWarnEnabled()) _log.warn("purported WADI request arrived from suspect IP address: "+_trustedIps.pattern()+" !~ "+ip);
+			}
+		}
+		getNext().invoke(request, response);
+	}
+
+}

Added: incubator/wadi/trunk/modules/tomcat55/src/main/resources/org/codehaus/wadi/tomcat55/tomcat55Config.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/main/resources/org/codehaus/wadi/tomcat55/tomcat55Config.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/main/resources/org/codehaus/wadi/tomcat55/tomcat55Config.xml (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/main/resources/org/codehaus/wadi/tomcat55/tomcat55Config.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,6 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+  <bean id="SessionWrapperFactory" class="org.codehaus.wadi.impl.StandardSessionWrapperFactory"/>
+  <bean id="SessionFactory" class="org.codehaus.wadi.tomcat55.TomcatSessionFactory"/>
+</beans>

Added: incubator/wadi/trunk/modules/tomcat55/src/site/apt/license.apt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/apt/license.apt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/site/apt/license.apt (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/site/apt/license.apt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,210 @@
+Overiew
+
+  Typically the licenses listed for the project are that of the project itself, and not of dependencies.
+  
+Project License
+
+---------------
+
+                                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: incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/maven-theme.css
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/maven-theme.css?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/maven-theme.css (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/maven-theme.css Wed Dec 14 15:32:56 2005
@@ -0,0 +1,175 @@
+body {
+        background-color: #fff;
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	margin-left: auto;
+	margin-right: auto;
+	background-repeat: repeat-y;
+	font-size: 13px;
+	padding: 0px;
+}
+td, select, input, li{
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	color:#333333;
+}
+code{
+  font-size: 12px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#47a;
+}
+a:visited  {
+  color:#666666;
+}
+a:active, a:hover {
+  color:#990000;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+	font-size: 17px;
+	color: #333333;  
+}
+h3 {
+	padding: 4px 4px 4px 24px;
+	color: #666;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+p {
+  line-height: 1.3em;
+  font-size: 12px;
+  color: #000;
+}
+#breadcrumbs {
+	height: 13px;
+	background-image: url(../images/breadcrumbs.jpg);
+	padding: 5px 10px 14px 20px;
+}
+* html #breadcrumbs {
+	padding-bottom: 8px;
+}
+#leftColumn {
+	margin: 10px 0 10px 0;
+	border-top-color: #ccc;
+	border-top-style: solid;
+	border-top-width: 1px;
+	border-right-color: #ccc;
+	border-right-style: solid;
+	border-right-width: 1px;
+	border-bottom-color: #ccc;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+#navcolumn h5 {
+	font-size: smaller;
+	border-bottom: 1px solid #aaaaaa;
+	padding-top: 2px;
+	padding-left: 9px;
+	color: #49635a;
+	background-image: url(../images/h5.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 11px;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+.source {
+  border: 1px solid #999;
+  overflow:auto
+}
+dt {
+	padding: 4px 4px 4px 24px;
+	color: #333333;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+.subsectionTitle {
+	font-size: 13px;
+	font-weight: bold;
+	color: #666;
+
+}
+
+table {
+	font-size: 10px;
+}
+.xright a:link, .xright a:visited, .xright a:active {
+  color: #666;
+}
+.xright a:hover {
+  color: #003300;
+}
+#banner {
+	height: 93px;
+}
+#navcolumn ul {
+	margin: 5px 0 15px -0em;
+}
+#navcolumn ul a {
+	color: #333333;
+}
+#navcolumn ul a:hover {
+	color: red;
+}
+#intro {
+	border: solid #ccc 1px;
+	margin: 6px 0px 0px 0px;
+	padding: 10px 40px 10px 40px;
+}
+.subsection {
+	margin-left: 3px;
+	color: #333333;
+}
+
+.subsection p {
+	font-size: 12px;
+}
+#footer {
+  padding: 10px;
+  margin: 20px 0px 20px 0px;
+  border-top: solid #ccc 1px; 
+  color: #333333;
+}

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/site.css
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/site.css?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/site.css (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/site/resources/css/site.css Wed Dec 14 15:32:56 2005
@@ -0,0 +1,52 @@
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: none;
+  padding-right: 0;
+}
+
+/*
+body ul {
+  list-style-type: square;
+}
+*/
+
+#downloadbox {
+  float: right;
+  margin: 0 10px 20px 20px;
+  padding: 5px;
+  border: 1px solid #999;
+  background-color: #eee;
+}
+
+#downloadbox h5 {
+  color: #000;
+  margin: 0;
+  border-bottom: 1px solid #aaaaaa;
+  font-size: smaller;
+  padding: 0;
+}
+
+#downloadbox p {
+  margin-top: 1em;
+  margin-bottom: 0;
+}
+
+#downloadbox ul {
+  margin-top: 0;
+  margin-bottom: 1em;
+  list-style-type: disc;
+}
+
+#downloadbox li {
+  font-size: smaller;
+}
+
+/*
+h4 {
+  padding: 0;
+  border: none;
+  color: #000;
+  margin: 0;
+  font-size: larger;
+  font-weight: bold;
+}
+*/

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/breadcrumbs.jpg
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/breadcrumbs.jpg?rev=356933&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/breadcrumbs.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/codehaus-small.png
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/codehaus-small.png?rev=356933&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/codehaus-small.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/folder-open.gif
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/folder-open.gif?rev=356933&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/folder-open.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/h5.jpg
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/h5.jpg?rev=356933&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/h5.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/wadi.png
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/wadi.png?rev=356933&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/wadi/trunk/modules/tomcat55/src/site/resources/images/wadi.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/wadi/trunk/modules/tomcat55/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat55/src/site/site.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat55/src/site/site.xml (added)
+++ incubator/wadi/trunk/modules/tomcat55/src/site/site.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,24 @@
+<project name="Mojo">
+   <bannerLeft>
+      <name>WADI</name>
+      <src>/images/wadi.png</src>
+      <href>http://wadi.codehaus.org</href>
+   </bannerLeft>
+   <bannerRight>
+      <name>Codehaus</name>
+      <src>/images/codehaus-small.png</src>
+      <href>http://www.codehaus.org</href>
+   </bannerRight>
+   <body>
+      <links>
+         <item name="Geronimo" href="http://geronimo.apache.org"/>
+         <item name="Tomcat" href="http://tomcat.apache.org"/>
+         <item name="Jetty" href="http://jetty.mortbay.org/jetty/index.html"/>
+      </links>
+      
+      <menu name="WADI">
+         <item name="Wadi" href="../index.html"/>
+      </menu>
+      ${reports}
+   </body>
+</project>

Added: incubator/wadi/trunk/modules/webapp/.classpath
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/.classpath?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/.classpath (added)
+++ incubator/wadi/trunk/modules/webapp/.classpath Wed Dec 14 15:32:56 2005
@@ -0,0 +1,28 @@
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="target/jsp-source"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" sourcepath="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/2.0_01_pd/backport-util-concurrent-2.0_01_pd.jar"/>
+  <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-servlet/2.4-rc4/geronimo-spec-servlet-2.4-rc4.jar" sourcepath="M2_REPO/geronimo-spec/geronimo-spec-servlet/2.4-rc4/geronimo-spec-servlet-2.4-rc4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/axion/axion/1.0-M3-dev/axion-1.0-M3-dev.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jcache/jcache/1.0-dev-2/jcache-1.0-dev-2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/activemq/activemq/WADI-3.2/activemq-WADI-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-j2ee-management/1.0-rc4/geronimo-spec-j2ee-management-1.0-rc4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-primitives/commons-primitives/1.0/commons-primitives-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/1.2.5/spring-1.2.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.12/jasper-runtime-5.5.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
+  <classpathentry kind="src" path="/wadi-core"/>
+  <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-jsp/2.0-rc4/geronimo-spec-jsp-2.0-rc4.jar" sourcepath="M2_REPO/geronimo-spec/geronimo-spec-jsp/2.0-rc4/geronimo-spec-jsp-2.0-rc4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-jms/1.1-rc4/geronimo-spec-jms-1.1-rc4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/activecluster/activecluster/1.2-20051115174934/activecluster-1.2-20051115174934.jar"/>
+</classpath>
\ No newline at end of file

Added: incubator/wadi/trunk/modules/webapp/.cvsignore
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/.cvsignore?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/.cvsignore (added)
+++ incubator/wadi/trunk/modules/webapp/.cvsignore Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+.wtpmodules
+target

Added: incubator/wadi/trunk/modules/webapp/.project
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/.project?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/.project (added)
+++ incubator/wadi/trunk/modules/webapp/.project Wed Dec 14 15:32:56 2005
@@ -0,0 +1,30 @@
+<projectDescription>
+  <name>wadi-webapp</name>
+  <comment/>
+  <projects>
+    <project>wadi-core</project>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</name>
+      <arguments/>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+      <arguments/>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+      <arguments/>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</name>
+      <arguments/>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: incubator/wadi/trunk/modules/webapp/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/.settings/org.eclipse.jdt.core.prefs?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/.settings/org.eclipse.jdt.core.prefs (added)
+++ incubator/wadi/trunk/modules/webapp/.settings/org.eclipse.jdt.core.prefs Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+#Mon Dec 12 11:31:47 MST 2005
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4

Added: incubator/wadi/trunk/modules/webapp/.wtpmodules
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/.wtpmodules?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/.wtpmodules (added)
+++ incubator/wadi/trunk/modules/webapp/.wtpmodules Wed Dec 14 15:32:56 2005
@@ -0,0 +1,14 @@
+<project-modules id="moduleCoreId">
+  <wb-module deploy-name="wadi-webapp">
+    <module-type module-type-id="jst.web">
+      <version>2.4</version>
+      <property name="context-root" value="wadi-webapp"/>
+    </module-type>
+    <wb-resource deploy-path="/" source-path="/src/webapp"/>
+    <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar">
+      <dependency-type>uses</dependency-type>
+    </dependent-module>
+    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+    <wb-resource deploy-path="/WEB-INF/classes" source-path="target/jsp-source"/>
+  </wb-module>
+</project-modules>
\ No newline at end of file

Added: incubator/wadi/trunk/modules/webapp/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/pom.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/pom.xml (added)
+++ incubator/wadi/trunk/modules/webapp/pom.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,200 @@
+<project>
+    <parent>
+        <groupId>wadi</groupId>
+        <artifactId>wadi</artifactId>
+        <version>2.0M1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wadi-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>WADI :: WebApp</name>
+    <scm>
+        <connection>scm:cvs:pserver:anoncvs@cvs.wadi.codehaus.org:/home/projects/wadi/scm:wadi/modules/webapp</connection>
+        <developerConnection>scm:cvs:ext:${maven.username}@cvs.wadi.codehaus.org/home/projects/wadi/scm:wadi/modules/webapp</developerConnection>
+        <url>http://cvs.wadi.codehaus.org/viewrep/wadi/wadi/modules/webapp</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jsp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-servlet</artifactId>
+        </dependency>
+
+        <!-- run time -->
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warSourceDirectory>src/webapp</warSourceDirectory>
+                    <webXml>${basedir}/target/jspweb.xml</webXml>
+                </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>maven-jetty6-plugin</artifactId>
+             <dependencies>
+               <dependency>
+                   <groupId>wadi</groupId>
+                   <artifactId>wadi-jetty6</artifactId>
+                   <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                   <groupId>wadi</groupId>
+                   <artifactId>wadi-core</artifactId>
+                   <version>${project.version}</version>
+               </dependency>
+              <dependency>
+                  <groupId>regexp</groupId>
+                  <artifactId>regexp</artifactId>
+                   <version>1.3</version>
+              </dependency>
+              <dependency>
+                  <groupId>mx4j</groupId>
+                  <artifactId>mx4j-remote</artifactId>
+                   <version>3.0.1</version>
+              </dependency>
+             </dependencies>
+              <configuration>
+                <scanIntervalSeconds>10</scanIntervalSeconds>
+                <webAppSourceDirectory>src/webapp</webAppSourceDirectory>
+                <contextPath>/wadi</contextPath>
+                <connectors>
+                  <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                    <port>${http.port}</port>
+                    <maxIdleTime>60000</maxIdleTime>
+                  </connector>
+                </connectors>
+                <systemProperties>
+                  <systemProperty implementation="org.mortbay.jetty.plugin.SystemProperty">
+                    <name>java.io.tmpdir</name>
+                    <value>${basedir}/target</value>
+                  </systemProperty>
+                  <systemProperty>
+                    <name>wadi.home</name>
+                    <value>${basedir}</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.Log</name>
+                     <value>org.apache.commons.logging.impl.SimpleLog</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.showdatetime</name>
+                     <value>true</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.log.org.codehaus.wadi</name>
+                     <value>debug</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.log.org.codehaus.wadi.impl.AbsoluteEvicter</name>
+                     <value>info</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.log.org.codehaus.wadi.impl.NeverEvicter</name>
+                     <value>info</value>
+                  </systemProperty>
+<!--
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.log.org.codehaus.wadi.MESSAGES</name>
+                     <value>trace</value>
+                  </systemProperty>
+                  <systemProperty>
+                     <name>org.apache.commons.logging.simplelog.log.org.codehaus.wadi.LOCKS</name>
+                     <value>trace</value>
+                  </systemProperty>
+-->
+                  <systemProperty>
+                     <name>wadi.properties</name>
+                     <value>${wadi.properties}</value>
+                  </systemProperty>
+	          <systemProperty>
+	            <name>node.name</name>
+	            <value>${node.name}</value>
+	          </systemProperty>
+                </systemProperties>
+              </configuration>
+            </plugin>
+            <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	</plugin>
+            <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-site-plugin</artifactId>
+	<configuration>
+	  <outputDirectory>../../wadi-site/target/site/${artifactId}</outputDirectory>
+	</configuration>
+
+      </plugin>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-javadoc-plugin</artifactId>
+	<configuration>
+	  <source>1.4</source>
+	  <destDir>../../wadi-site/target/site/${artifactId}</destDir>
+	</configuration>
+      </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>surefire-report-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>

Added: incubator/wadi/trunk/modules/webapp/profiles.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/profiles.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/profiles.xml (added)
+++ incubator/wadi/trunk/modules/webapp/profiles.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,156 @@
+<profiles>
+  <profile>
+    <id>green</id>
+    <activation>
+      <property>
+        <name>node</name>
+        <value>green</value>
+      </property>
+    </activation>
+    <properties>
+      <http.port>8081</http.port>
+      <ajp.port>8010</ajp.port>
+      <node.name>green</node.name>
+      <jndi.port>1100</jndi.port>
+      <STOP.PORT>8041</STOP.PORT>
+      <wadi.properties>../assembly/src/conf/node.green.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>red</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>red</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8080</http.port>
+     <node.name>red</node.name>
+     <ajp.port>8009</ajp.port>
+     <jndi.port>1099</jndi.port>
+     <STOP.PORT>8040</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.red.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>blue</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>blue</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8082</http.port>
+     <node.name>blue</node.name>
+     <ajp.port>8011</ajp.port>
+     <jndi.port>1101</jndi.port>
+     <STOP.PORT>8142</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.blue.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>orange</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>orange</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8085</http.port>
+     <node.name>orange</node.name>
+     <ajp.port>8014</ajp.port>
+     <jndi.port>1104</jndi.port>
+     <STOP.PORT>8145</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.orange.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>brown</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>brown</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8087</http.port>
+     <node.name>brown</node.name>
+     <ajp.port>8016</ajp.port>
+     <jndi.port>1106</jndi.port>
+     <STOP.PORT>8147</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.brown.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>pink</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>pink</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8084</http.port>
+     <node.name>pink</node.name>
+     <ajp.port>8013</ajp.port>
+     <jndi.port>1103</jndi.port>
+     <STOP.PORT>8144</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.pink.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>purple</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>purple</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8086</http.port>
+     <node.name>purple</node.name>
+     <ajp.port>8015</ajp.port>
+     <jndi.port>1105</jndi.port>
+     <STOP.PORT>8146</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.purple.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>white</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>white</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8088</http.port>
+     <node.name>white</node.name>
+     <ajp.port>8017</ajp.port>
+     <jndi.port>1107</jndi.port>
+     <STOP.PORT>8148</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.white.properties</wadi.properties>
+    </properties>
+  </profile>
+  <profile>
+    <id>yellow</id>
+    <activation>
+      <property>
+         <name>node</name>
+         <value>yellow</value>
+      </property>
+    </activation>
+    <properties>
+     <http.port>8083</http.port>
+     <node.name>yellow</node.name>
+     <ajp.port>8012</ajp.port>
+     <jndi.port>1102</jndi.port>
+     <STOP.PORT>8143</STOP.PORT>
+     <wadi.properties>../assembly/src/conf/node.yellow.properties</wadi.properties>
+    </properties>
+  </profile>
+
+</profiles>

Added: incubator/wadi/trunk/modules/webapp/src/main/java/org/codehaus/wadi/webapp/Counter.java
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/main/java/org/codehaus/wadi/webapp/Counter.java?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/main/java/org/codehaus/wadi/webapp/Counter.java (added)
+++ incubator/wadi/trunk/modules/webapp/src/main/java/org/codehaus/wadi/webapp/Counter.java Wed Dec 14 15:32:56 2005
@@ -0,0 +1,41 @@
+/**
+ *
+ * Copyright 2003-2005 Core Developers Network Ltd.
+ *
+ *  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.codehaus.wadi.webapp;
+
+import java.io.Serializable;
+
+public class Counter implements Serializable {
+	
+	protected int _counter;
+	
+	public Counter() {
+		_counter=0;
+	}
+	
+	public void increment() {
+		_counter++;
+	}
+	
+	public String toString() {
+		return ""+_counter;
+	}
+
+	public int getValue() {
+		return _counter;
+	}
+	
+}

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/context.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/context.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/context.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/context.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,3 @@
+<Context cookies="true" crossContext="true">
+  <Manager className="org.codehaus.wadi.tomcat55.TomcatManager"/>
+</Context>

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/geronimo-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/geronimo-web.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/geronimo-web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,9 @@
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="WADI">
+
+    <context-root>/wadi</context-root>
+    <context-priority-classloader>false</context-priority-classloader>
+    <manager>WADI</manager>
+
+    <gbean name="WADI" class="org.apache.geronimo.tomcat.cluster.WADIGBean"/>
+
+</web-app>

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty-web.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty-web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+
+<Configure class="org.mortbay.jetty.servlet.WebApplicationContext">
+
+<!-- Set up the WADI Proxy Handler
+
+  <Call name="addHandler">
+    <Arg>
+     <New class="org.codehaus.wadi.jetty5.Handler">
+	  <Arg>
+	   <Call class="java.util.regex.Pattern" name="compile">
+	    <Arg>127\\.0\\.0\\.1|192\\.168\\.0\\.\\d{1,3}</Arg>
+	   </Call>
+	  </Arg>
+     </New>
+    </Arg>
+  </Call>
+ -->
+
+<!-- needed for StopGracefully (set on Server) to work -->
+  <Set name="StatsOn">true</Set>
+<!-- needed for session evacuation under load -->
+
+<!-- Set up the WADI Session Manager -->
+
+  <Get name="ServletHandler">
+    <Set name="SessionManager">
+      <New class="org.codehaus.wadi.jetty5.JettyManager"/>
+    </Set>
+  </Get>
+
+</Configure>

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty6-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty6-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty6-web.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/jetty6-web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,66 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+<!-- Set up the WADI Proxy Handler
+
+  <Call name="addHandler">
+    <Arg>
+     <New class="org.codehaus.wadi.jetty5.Handler">
+	  <Arg>
+	   <Call class="java.util.regex.Pattern" name="compile">
+	    <Arg>127\\.0\\.0\\.1|192\\.168\\.0\\.\\d{1,3}</Arg>
+	   </Call>
+	  </Arg>
+     </New>
+    </Arg>
+  </Call>
+ -->
+
+
+<!-- Set up the WADI Filter -->
+<!-- OhOh, this will overwrite Filters defined in web.xml ?? -->
+
+  <Get name="ServletHandler">
+
+    <Set name="Filters">
+      <Array type="org.mortbay.jetty.servlet.FilterHolder">
+	<Item>
+	  <New class="org.mortbay.jetty.servlet.FilterHolder">
+	    <Set name="Name">WadiFilter</Set>
+	    <Set name="ClassName">org.codehaus.wadi.impl.Filter</Set>
+	  </New>
+	</Item>
+      </Array>
+    </Set>
+    <Set name="FilterMappings">
+      <Array type="org.mortbay.jetty.servlet.FilterMapping">
+	<Item>
+	  <New class="org.mortbay.jetty.servlet.FilterMapping">
+	    <Set name="PathSpec">/*</Set>
+	    <Set name="Dispatches">15</Set><!--  TODO: is this value still correct? -->
+	    <Set name="FilterName">WadiFilter</Set>
+	  </New>
+	</Item>
+      </Array>
+    </Set>
+
+  </Get>
+
+<!-- needed for StopGracefully (set on Server) to work -->
+<!--
+  <Set name="StatsOn">true</Set>
+-->
+<!-- needed for session evacuation under load -->
+
+<!-- Set up the WADI Session Manager -->
+
+  <Get name="SessionHandler">
+    <Set name="SessionManager">
+      <New class="org.codehaus.wadi.jetty6.JettyManager"/>
+    </Set>
+  </Get>
+
+</Configure>

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.clustered.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.clustered.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.clustered.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.clustered.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,424 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+<!--
+  Three Beans have already been created as part of the contract between WADI and Spring:
+
+    SessionFactory, SessionWrapperFactory
+
+  This is so because these three types need to be parameterised according to within which
+  WebContainer we are running...
+-->
+
+  <bean
+    id="SessionPool"
+    class="org.codehaus.wadi.impl.SimpleSessionPool"
+    >
+    <constructor-arg><ref bean="SessionFactory"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="AttributesFactory"
+    class="org.codehaus.wadi.impl.DistributableAttributesFactory"
+    >
+  </bean>
+
+  <bean
+    id="ValueFactory"
+    class="org.codehaus.wadi.impl.DistributableValueFactory"
+    >
+  </bean>
+
+  <bean
+    id="ValuePool"
+    class="org.codehaus.wadi.impl.SimpleValuePool"
+    >
+    <constructor-arg><ref bean="ValueFactory"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="SessionIdFactory"
+    class="org.codehaus.wadi.impl.TomcatSessionIdFactory"
+    >
+  </bean>
+
+  <bean
+    id="Streamer"
+    class="org.codehaus.wadi.impl.SimpleStreamer"
+    >
+  </bean>
+
+  <!-- the Contextualiser stack...(shorthand for now) -->
+
+  <bean
+    id="MemoryMap"
+    class="EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap"
+    >
+  </bean>
+
+  <bean
+    id="DatabaseURL"
+    class="java.lang.String"
+    >
+    <constructor-arg><value>jdbc:axiondb:WADI</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="DataSource"
+    class="org.axiondb.jdbc.AxionDataSource"
+    >
+    <constructor-arg><ref bean="DatabaseURL"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="ContextPool"
+    class="org.codehaus.wadi.impl.SessionToContextPoolAdapter"
+    >
+    <constructor-arg><ref bean="SessionPool"/></constructor-arg>
+  </bean>
+
+<!--
+  <bean
+    id="Relocater"
+    class="org.codehaus.wadi.impl.MessagingMigratingRelocater"
+    >
+    <constructor-arg type="long" index="0"><value>2000</value></constructor-arg>
+    <constructor-arg type="long" index="1"><value>1000</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="Relocater"
+    class="org.codehaus.wadi.impl.ProxyingRelocater"
+    >
+    <constructor-arg type="long" index="0"><value>2000</value></constructor-arg>
+    <constructor-arg type="long" index="1"><value>2000</value></constructor-arg>
+  </bean>
+-->
+
+  <bean
+    id="Relocater"
+    class="org.codehaus.wadi.impl.HybridRelocater"
+    >
+    <constructor-arg type="long" index="0"><value>2000</value></constructor-arg>
+    <constructor-arg type="long" index="1"><value>2000</value></constructor-arg>
+<!--
+    <constructor-arg type="boolean"><value>false</value></constructor-arg>
+-->
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- the contextualiser stack -->
+
+  <bean
+    id="Streamer2"
+    class="org.codehaus.wadi.impl.SimpleStreamer"
+    >
+  </bean>
+
+<!--
+  <bean
+    id="Collapser"
+    class="org.codehaus.wadi.impl.DebugCollapser"
+    >
+  </bean>
+-->
+
+  <bean
+    id="Collapser"
+    class="org.codehaus.wadi.impl.HashingCollapser"
+    >
+    <constructor-arg type="int"><value>1024</value></constructor-arg>
+    <constructor-arg type="long"><value>10000</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="DummyContextualiser"
+    class="org.codehaus.wadi.impl.DummyContextualiser"
+    >
+  </bean>
+
+  <bean
+    id="DatabaseStore"
+    class="org.codehaus.wadi.impl.DatabaseStore"
+    >
+    <constructor-arg><ref bean="DatabaseURL"/></constructor-arg>
+    <constructor-arg><ref bean="DataSource"/></constructor-arg>
+    <constructor-arg><value>SESSIONS</value></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- reusingStore -->
+    <constructor-arg type="boolean"><value>true</value></constructor-arg><!-- build -->
+  </bean>
+
+  <bean
+    id="DatabaseContextualiser"
+    class="org.codehaus.wadi.impl.SharedStoreContextualiser"
+    >
+    <constructor-arg><ref bean="DummyContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg><ref bean="DatabaseStore"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="ClusterContextualiser"
+    class="org.codehaus.wadi.impl.ClusterContextualiser"
+    >
+    <constructor-arg><ref bean="DatabaseContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg><ref bean="Relocater"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="StatelessMethods"
+    class="java.util.regex.Pattern"
+    factory-method="compile"
+    >
+    <constructor-arg><value>GET|POST</value></constructor-arg>
+    <constructor-arg type="int"><value>2</value></constructor-arg><!--  Pattern.CASE_INSENSITIVE -->
+  </bean>
+
+  <bean
+    id="StatelessURIs"
+    class="java.util.regex.Pattern"
+    factory-method="compile"
+    >
+    <constructor-arg><value>.*\\.(JPG|JPEG|GIF|PNG|ICO|HTML|HTM)(|;jsessionid=.*)</value></constructor-arg>
+    <constructor-arg type="int"><value>2</value></constructor-arg><!--  Pattern.CASE_INSENSITIVE -->
+  </bean>
+
+  <bean
+    id="StatelessContextualiser"
+    class="org.codehaus.wadi.impl.StatelessContextualiser"
+    >
+    <constructor-arg><ref bean="ClusterContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="StatelessMethods"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg><ref bean="StatelessURIs"/></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="TmpDirectory"
+    class="java.io.File"
+    >
+    <constructor-arg><value>${java.io.tmpdir}</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="DiscDirectory"
+    class="java.io.File"
+    >
+    <constructor-arg><ref bean="TmpDirectory"/></constructor-arg>
+    <constructor-arg><value>sessions</value></constructor-arg>
+  </bean>
+
+<!--
+        dir.delete();
+        dir.mkdir();
+-->
+
+  <bean
+    id="DiscEvicter"
+    class="org.codehaus.wadi.impl.NeverEvicter"
+    >
+    <constructor-arg type="int"><value>20</value></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+  </bean> <!-- sessions never pass below this point, unless the node is shutdown -->
+
+  <bean
+    id="DiscMap"
+    class="EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap"
+    >
+  </bean>
+
+  <bean
+    id="DiscContextualiser"
+    class="org.codehaus.wadi.impl.ExclusiveStoreContextualiser"
+    >
+    <constructor-arg><ref bean="StatelessContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg><ref bean="DiscEvicter"/></constructor-arg>
+    <constructor-arg><ref bean="DiscMap"/></constructor-arg>
+    <constructor-arg><ref bean="Streamer"/></constructor-arg>
+    <constructor-arg><ref bean="DiscDirectory"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="SerialContextualiser"
+    class="org.codehaus.wadi.impl.SerialContextualiser"
+    >
+    <constructor-arg><ref bean="DiscContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="MemoryEvicter"
+    class="org.codehaus.wadi.impl.AbsoluteEvicter"
+    >
+    <constructor-arg type="int"><value>10</value></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg type="int"><value>10</value></constructor-arg>
+  </bean> <!-- if a session is inactive for 10 secs, it moves to disc -->
+
+  <bean
+    id="RequestPool"
+    class="org.codehaus.wadi.impl.DummyStatefulHttpServletRequestWrapperPool"
+    >
+  </bean>
+
+  <bean
+    id="MemoryContextualiser"
+    class="org.codehaus.wadi.impl.MemoryContextualiser"
+    >
+    <constructor-arg><ref bean="SerialContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryEvicter"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+    <constructor-arg><ref bean="Streamer2"/></constructor-arg>
+    <constructor-arg><ref bean="ContextPool"/></constructor-arg>
+    <constructor-arg><ref bean="RequestPool"/></constructor-arg>
+  </bean>
+
+
+  <!-- the Router (load-balancer integration) -->
+
+<!--
+  <bean
+    id="Router"
+    class="org.codehaus.wadi.impl.JkRouter"
+    >
+    <constructor-arg><value>${node.name}</value></constructor-arg>
+  </bean>
+-->
+
+  <bean
+    id="Router"
+    class="org.codehaus.wadi.impl.DummyRouter"
+    >
+  </bean>
+
+  <!-- other stuff... -->
+
+  <bean
+    id="HttpProxy"
+    class="org.codehaus.wadi.impl.StandardHttpProxy"
+    >
+    <constructor-arg><value>jsessionid</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="ReplicaterFactory"
+    class="org.codehaus.wadi.impl.DummyReplicaterFactory"
+    >
+  </bean>
+
+  <bean
+    id="LocalHost"
+    class="java.net.InetAddress"
+    factory-method="getLocalHost"
+    >
+  </bean>
+
+  <bean
+    id="HttpAddress"
+    class="java.net.InetSocketAddress"
+    >
+    <constructor-arg><ref bean="LocalHost"/></constructor-arg>
+    <constructor-arg type="int"><value>${http.port}</value></constructor-arg>
+  </bean>
+
+  <!-- and finally - the SessionManager itself -->
+
+  <bean
+    id="SessionManager"
+    class="org.codehaus.wadi.impl.ClusteredManager"
+    >
+    <constructor-arg><ref bean="SessionPool"/></constructor-arg>
+    <constructor-arg><ref bean="AttributesFactory"/></constructor-arg>
+    <constructor-arg><ref bean="ValuePool"/></constructor-arg>
+    <constructor-arg><ref bean="SessionWrapperFactory"/></constructor-arg>
+    <constructor-arg><ref bean="SessionIdFactory"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+    <constructor-arg><ref bean="Router"/></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- errorIfSessionNotAcquired -->
+    <constructor-arg><ref bean="Streamer"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg><ref bean="ReplicaterFactory"/></constructor-arg>
+    <constructor-arg><ref bean="HttpAddress"/></constructor-arg>
+    <constructor-arg><ref bean="HttpProxy"/></constructor-arg>
+    <constructor-arg index="14"><value>tcp://localhost:61616</value></constructor-arg>
+<!--
+    <constructor-arg index="14"><value>peer://org.codehaus.wadi</value></constructor-arg>
+ -->
+    <constructor-arg index="15"><value>CLUSTER0</value></constructor-arg>
+    <constructor-arg index="16"><value>${node.name}</value></constructor-arg>
+    <constructor-arg index="17"><value>72</value></constructor-arg>
+  </bean>
+
+
+<!-- JMX support -->
+
+  <!--
+  This allows introspection via e.g mc4j (http://mc4j.sourceforge.net) on a running WADI system.
+
+  If you are using Tomcat 5.0.28, you will need to remove bin/jmx.jar,
+  d/l mx4j-3.0.1 and place mx4j-tools.jar and mx4j-remote.jar into
+  server/lib/.
+
+  If you do not require JMX support, feel free to comment out this section.
+
+  For further information please view the Spring JMX integration documentation.
+  -->
+
+  <!--
+  This will create a new MBeanServer unless one already exists, in which case it will be reused.
+  -->
+  <bean id="mbeanServer" class="org.codehaus.wadi.impl.MBeanServerFactoryBean"/>
+
+  <!--
+  This will register the beans mentioned in its 'beans' map with the MBeanServer.
+  -->
+  <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
+    <property name="beans">
+      <map>
+        <entry key="WADI:name=SessionManager"> <ref bean="SessionManager"/> </entry>
+        <entry key="WADI:name=MemoryContextualiser"> <ref bean="MemoryContextualiser"/> </entry>
+        <entry key="WADI:name=DiscContextualiser"> <ref bean="DiscContextualiser"/> </entry>
+        <entry key="WADI:name=ClusterContextualiser"> <ref bean="ClusterContextualiser"/> </entry>
+        <entry key="WADI:name=Router"> <ref bean="Router"/> </entry>
+        <entry key="WADI:name=HttpProxy"> <ref bean="HttpProxy"/> </entry>
+        <entry key="WADI:name=HttpAddress"> <ref bean="HttpAddress"/> </entry>
+        <entry key="WADI:name=Relocater"> <ref bean="Relocater"/> </entry>
+        <entry key="WADI:name=SessionIdFactory"> <ref bean="SessionIdFactory"/> </entry>
+      </map>
+    </property>
+    <property name="server" ref="mbeanServer"/>
+  </bean>
+
+  <!--
+  if you are running your own jndi registry, you may comment this out
+  (untested)
+  -->
+  <bean id="registry" class="java.rmi.registry.LocateRegistry" factory-method="createRegistry">
+    <constructor-arg value="${jndi.port}"/>
+  </bean>
+
+  <!--
+  if you are running your own jmx remote connector, you may comment this out
+  you will also need to remove the reference to 'serverConnector' in the 'exporter' bean definition.
+  (untested)
+  -->
+  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
+    <property name="objectName" value="connector:name=rmi"/>
+    <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:${jndi.port}/wadi"/>
+    <property name="server"><ref local="mbeanServer"/></property>
+    <property name="threaded" value="true"/>
+    <property name="daemon" value="true"/>
+  </bean>
+
+</beans>

Added: incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.persistent.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.persistent.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.persistent.xml (added)
+++ incubator/wadi/trunk/modules/webapp/src/webapp/WEB-INF/wadi-web.persistent.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,324 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+<!--
+  Three Beans have already been created as part of the contract between WADI and Spring:
+
+    SessionFactory, SessionWrapperFactory
+
+<  This is so because these three types need to be parameterised according to within which
+  WebContainer we are running...
+-->
+
+  <bean
+    id="SessionPool"
+    class="org.codehaus.wadi.impl.SimpleSessionPool"
+    >
+    <constructor-arg><ref bean="SessionFactory"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="AttributesFactory"
+    class="org.codehaus.wadi.impl.DistributableAttributesFactory"
+    >
+  </bean>
+
+  <bean
+    id="ValueFactory"
+    class="org.codehaus.wadi.impl.DistributableValueFactory"
+    >
+  </bean>
+
+  <bean
+    id="ValuePool"
+    class="org.codehaus.wadi.impl.SimpleValuePool"
+    >
+    <constructor-arg><ref bean="ValueFactory"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="SessionIdFactory"
+    class="org.codehaus.wadi.impl.TomcatSessionIdFactory"
+    >
+  </bean>
+
+  <bean
+    id="SessionStreamer"
+    class="org.codehaus.wadi.impl.GZIPStreamer"
+    >
+  </bean>
+
+  <!-- the Contextualiser stack...(shorthand for now) -->
+
+  <bean
+    id="MemoryMap"
+    class="EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap"
+    >
+  </bean>
+
+<!--
+  <bean
+    id="DataSource"
+    class="org.axiondb.jdbc.AxionDataSource"
+    >
+    <constructor-arg><value>jdbc:axiondb:testdb</value></constructor-arg>
+  </bean>
+-->
+
+  <bean
+    id="ContextPool"
+    class="org.codehaus.wadi.impl.SessionToContextPoolAdapter"
+    >
+    <constructor-arg><ref bean="SessionPool"/></constructor-arg>
+  </bean>
+
+  <!-- the contextualiser stack -->
+
+  <bean
+    id="AttributeStreamer"
+    class="org.codehaus.wadi.impl.SimpleStreamer"
+    >
+  </bean>
+
+<!--
+  <bean
+    id="Collapser"
+    class="org.codehaus.wadi.impl.DebugCollapser"
+    >
+  </bean>
+-->
+
+  <bean
+    id="Collapser"
+    class="org.codehaus.wadi.impl.HashingCollapser"
+    >
+    <constructor-arg type="int"><value>1024</value></constructor-arg>
+    <constructor-arg type="long"><value>10000</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="DummyContextualiser"
+    class="org.codehaus.wadi.impl.DummyContextualiser"
+    >
+  </bean>
+
+  <bean
+    id="DatabaseEvicter"
+    class="org.codehaus.wadi.impl.NeverEvicter"
+    >
+    <constructor-arg type="int"><value>10</value></constructor-arg><!-- sweepInterval -->
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- strictOrdering -->
+  </bean>
+
+  <bean
+    id="DatabaseMap"
+    class="EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap"
+    >
+  </bean>
+
+  <bean
+    id="DatabaseContextualiser"
+    class="org.codehaus.wadi.impl.GiannisContextualiser"
+    >
+    <constructor-arg><ref bean="DummyContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- clean? -->
+    <constructor-arg><ref bean="DatabaseEvicter"/></constructor-arg>
+    <constructor-arg><ref bean="DatabaseMap"/></constructor-arg>
+    <constructor-arg><ref bean="DatabaseStore"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="StatelessMethods"
+    class="java.util.regex.Pattern"
+    factory-method="compile"
+    >
+    <constructor-arg><value>GET|POST</value></constructor-arg>
+    <constructor-arg type="int"><value>2</value></constructor-arg><!--  Pattern.CASE_INSENSITIVE -->
+  </bean>
+
+  <bean
+    id="StatelessURIs"
+    class="java.util.regex.Pattern"
+    factory-method="compile"
+    >
+    <constructor-arg><value>.*\\.(JPG|JPEG|GIF|PNG|ICO|HTML|HTM)(|;jsessionid=.*)</value></constructor-arg>
+    <constructor-arg type="int"><value>2</value></constructor-arg><!--  Pattern.CASE_INSENSITIVE -->
+  </bean>
+
+  <bean
+    id="StatelessContextualiser"
+    class="org.codehaus.wadi.impl.StatelessContextualiser"
+    >
+    <constructor-arg><ref bean="DatabaseContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="StatelessMethods"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+    <constructor-arg><ref bean="StatelessURIs"/></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg>
+  </bean>
+
+  <bean
+    id="SerialContextualiser"
+    class="org.codehaus.wadi.impl.SerialContextualiser"
+    >
+    <constructor-arg><ref bean="StatelessContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="Collapser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+  </bean>
+
+  <bean
+    id="MemoryEvicter"
+    class="org.codehaus.wadi.impl.AbsoluteEvicter"
+    >
+    <constructor-arg type="int"><value>10</value></constructor-arg><!-- sweepInterval -->
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- strictOrdering -->
+    <constructor-arg type="int"><value>10</value></constructor-arg><!-- inactivityInterval -->
+  </bean>
+
+  <bean
+    id="RequestPool"
+    class="org.codehaus.wadi.impl.DummyStatefulHttpServletRequestWrapperPool"
+    >
+  </bean>
+
+  <bean
+    id="MemoryContextualiser"
+    class="org.codehaus.wadi.impl.MemoryContextualiser"
+    >
+    <constructor-arg><ref bean="SerialContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryEvicter"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+    <constructor-arg><ref bean="SessionStreamer"/></constructor-arg>
+    <constructor-arg><ref bean="ContextPool"/></constructor-arg>
+    <constructor-arg><ref bean="RequestPool"/></constructor-arg>
+  </bean>
+
+
+  <!-- the Router (load-balancer integration) -->
+
+<!--
+  <bean
+    id="Router"
+    class="org.codehaus.wadi.impl.JkRouter"
+    >
+    <constructor-arg><value>${node.name}</value></constructor-arg>
+  </bean>
+-->
+
+  <bean
+    id="Router"
+    class="org.codehaus.wadi.impl.DummyRouter"
+    >
+  </bean>
+
+  <bean
+    id="DatabaseReplicaterFactory"
+    class="org.codehaus.wadi.impl.DatabaseReplicaterFactory"
+    >
+    <constructor-arg><ref bean="DatabaseStore"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg>
+  </bean>
+
+<!--
+  <bean
+    id="DatabaseReplicaterFactory"
+    class="org.codehaus.wadi.impl.DummyReplicaterFactory"
+    >
+  </bean>
+  <bean
+    id="DatabaseReplicaterFactory"
+    class="org.codehaus.wadi.impl.SleepingReplicaterFactory"
+    >
+    <constructor-arg type="long"><value>1000</value></constructor-arg>
+  </bean>
+-->
+
+  <!-- and finally - the SessionManager itself -->
+
+  <bean
+    id="SessionManager"
+    class="org.codehaus.wadi.impl.DistributableManager"
+    >
+    <constructor-arg><ref bean="SessionPool"/></constructor-arg>
+    <constructor-arg><ref bean="AttributesFactory"/></constructor-arg>
+    <constructor-arg><ref bean="ValuePool"/></constructor-arg>
+    <constructor-arg><ref bean="SessionWrapperFactory"/></constructor-arg>
+    <constructor-arg><ref bean="SessionIdFactory"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryContextualiser"/></constructor-arg>
+    <constructor-arg><ref bean="MemoryMap"/></constructor-arg>
+    <constructor-arg><ref bean="Router"/></constructor-arg>
+    <constructor-arg type="boolean"><value>false</value></constructor-arg><!-- errorIfSessionNotAcquired -->
+    <constructor-arg><ref bean="AttributeStreamer"/></constructor-arg>
+    <constructor-arg type="boolean"><value>true</value></constructor-arg><!-- accessOnLoad -->
+    <constructor-arg><ref bean="DatabaseReplicaterFactory"/></constructor-arg>
+  </bean>
+
+
+<!-- JMX support -->
+
+  <!--
+  This allows introspection via e.g mc4j (http://mc4j.sourceforge.net) on a running WADI system.
+
+  If you are using Tomcat 5.0.28, you will need to remove bin/jmx.jar,
+  d/l mx4j-3.0.1 and place mx4j-tools.jar and mx4j-remote.jar into
+  server/lib/.
+
+  If you do not require JMX support, feel free to comment out this section.
+
+  For further information please view the Spring JMX integration documentation.
+  -->
+
+  <!--
+  This will create a new MBeanServer unless one already exists, in which case it will be reused.
+  -->
+<!--
+  <bean id="mbeanServer" class="org.codehaus.wadi.impl.MBeanServerFactoryBean"/>
+-->
+
+  <!--
+  This will register the beans mentioned in its 'beans' map with the MBeanServer.
+  -->
+<!--
+  <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
+    <property name="beans">
+      <map>
+        <entry key="WADI:name=SessionManager"> <ref bean="SessionManager"/> </entry>
+        <entry key="WADI:name=MemoryContextualiser"> <ref bean="MemoryContextualiser"/> </entry>
+        <entry key="WADI:name=DiscContextualiser"> <ref bean="DiscContextualiser"/> </entry>
+        <entry key="WADI:name=Router"> <ref bean="Router"/> </entry>
+        <entry key="WADI:name=SessionIdFactory"> <ref bean="SessionIdFactory"/> </entry>
+      </map>
+    </property>
+    <property name="server" ref="mbeanServer"/>
+  </bean>
+-->
+
+  <!--
+  if you are running your own jndi registry, you may comment this out
+  (untested)
+  -->
+<!--
+  <bean id="registry" class="java.rmi.registry.LocateRegistry" factory-method="createRegistry">
+    <constructor-arg value="${jndi.port}"/>
+  </bean>
+-->
+
+  <!--
+  if you are running your own jmx remote connector, you may comment this out
+  you will also need to remove the reference to 'serverConnector' in the 'exporter' bean definition.
+  (untested)
+  -->
+<!--
+  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
+    <property name="objectName" value="connector:name=rmi"/>
+    <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:${jndi.port}/wadi"/>
+    <property name="server"><ref local="mbeanServer"/></property>
+    <property name="threaded" value="true"/>
+    <property name="daemon" value="true"/>
+  </bean>
+-->
+
+</beans>



Mime
View raw message