You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wadi-commits@incubator.apache.org by bd...@apache.org on 2005/12/14 23:36:16 UTC
svn commit: r356933 [25/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...
Added: incubator/wadi/trunk/modules/testapp/target/exported-pom.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/exported-pom.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/exported-pom.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/exported-pom.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,557 @@
+<project>
+ <parent>
+ <artifactId>wadi</artifactId>
+ <groupId>wadi</groupId>
+ <version>2.0M1</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-test-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>WADI :: Test WebApp</name>
+ <version>2.0M1</version>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/WADI</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@wadi.codehaus.org</subscribe>
+ <unsubscribe>dev-unsubscribe@wadi.codehaus.org</unsubscribe>
+ <post>dev@wadi.codehaus.org</post>
+ <archive>http://archive.wadi.codehaus.org/dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>user-subscribe@wadi.codehaus.org</subscribe>
+ <unsubscribe>user-unsubscribe@wadi.codehaus.org</unsubscribe>
+ <post>user@wadi.codehaus.org</post>
+ <archive>http://archive.wadi.codehaus.org/user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>scm-subscribe@wadi.codehaus.org</subscribe>
+ <unsubscribe>scm-unsubscribe@wadi.codehaus.org</unsubscribe>
+ <archive>http://archive.wadi.codehaus.org/scm/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>janb</id>
+ <name>Jan Bartel</name>
+ <email>janb@mortbay.com</email>
+ <organization>Mort Bay Consulting</organization>
+ <organizationUrl>http://www.mortbay.com</organizationUrl>
+ </developer>
+ <developer>
+ <id></id>
+ <name>Gianny Damour</name>
+ <email>gianny.damour@optusnet.com.au</email>
+ <organization></organization>
+ <organizationUrl></organizationUrl>
+ </developer>
+ <developer>
+ <id>bdudney</id>
+ <name>Bill Dudney</name>
+ <email>bdudney@codehaus.org</email>
+ <organization>Virtuas</organization>
+ <organizationUrl>http://www.virtuas.com</organizationUrl>
+ </developer>
+ <developer>
+ <id>jeff</id>
+ <name>Jeff Genender</name>
+ <email>jgenender@codehaus.org</email>
+ <organization>Virtuas</organization>
+ <organizationUrl>http://www.virtuas.com</organizationUrl>
+ </developer>
+ <developer>
+ <id>jgoodwill</id>
+ <name>James Goodwill</name>
+ <email>jgoodwill@codehaus.org</email>
+ <organization>Virtuas</organization>
+ <organizationUrl>http://www.virtuas.com</organizationUrl>
+ </developer>
+ <developer>
+ <id>jules</id>
+ <name>Jules Gosnell</name>
+ <email>jules@coredevelopers.net</email>
+ <organization>Core Developers Network</organization>
+ <organizationUrl>http://www.coredevelopers.net</organizationUrl>
+ </developer>
+ <developer>
+ <id>gianni</id>
+ <name>Gianni Scenini</name>
+ <email>gianni.scenini@gmail.com</email>
+ <organization>Quativa</organization>
+ </developer>
+ <developer>
+ <id>bruce</id>
+ <name>Bruce Snyder</name>
+ <email>bsnyder@codehaus.org</email>
+ <organization>LogicBlaze</organization>
+ <organizationUrl>http://www.logicblaze.com</organizationUrl>
+ </developer>
+ <developer>
+ <id>gregw</id>
+ <name>Greg Wilkins</name>
+ <email>gregw@mortbay.com</email>
+ <organization>Mort Bay Consulting</organization>
+ <organizationUrl>http://www.mortbay.com</organizationUrl>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Simone Bordet</name>
+ <email></email>
+ </contributor>
+ <contributor>
+ <name>Hiram Chirino</name>
+ <email></email>
+ <organization>LogicBlaze</organization>
+ <organizationUrl>http://www.logicblaze.com</organizationUrl>
+ </contributor>
+ <contributor>
+ <name>James Strachan</name>
+ <email></email>
+ <organization>LogicBlaze</organization>
+ <organizationUrl>http://www.logicblaze.com</organizationUrl>
+ </contributor>
+ </contributors>
+ <scm>
+ <connection>scm:cvs:pserver:anoncvs@cvs.wadi.codehaus.org:/home/projects/wadi/scm:wadi/modules/testapp</connection>
+ <developerConnection>scm:cvs:ext:${maven.username}@cvs.wadi.codehaus.org/home/projects/wadi/scm:wadi/modules/testapp</developerConnection>
+ <url>http://cvs.wadi.codehaus.org/viewrep/wadi/wadi/modules/testapp</url>
+ </scm>
+ <build>
+ <sourceDirectory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/test/java</testSourceDirectory>
+ <outputDirectory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/target/classes</outputDirectory>
+ <testOutputDirectory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/target/test-classes</testOutputDirectory>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-6-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ <resources>
+ <resource>
+ <directory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/target</directory>
+ <finalName>wadi-test-webapp-2.0M1</finalName>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>jspc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <warSourceDirectory>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/webapp</warSourceDirectory>
+ <inputWebXml>/Users/bdudney/Development/wadi.new/wadi/modules/testapp/src/webapp/WEB-INF/web.xml</inputWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>mortbay</id>
+ <name>Mortbay Repository on codehaus</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </repository>
+ <repository>
+ <id>central</id>
+ <name>Maven 2 Repository on ibibio</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
+ <id>maven1-ibiblio</id>
+ <name>Maven 1 Repository on ibibio</name>
+ <url>http://ibiblio.org/maven</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>codehaus</id>
+ <name>Codehaus Repo</name>
+ <url>http://dist.codehaus.org</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>jgenender</id>
+ <name>Jeff Genender's Repository on codehaus</name>
+ <url>http://codehaus.org/~jgenender/maven2</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>snapshots</id>
+ <name>Maven Central Development Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jgenender</id>
+ <name>Jeff Genender's Repository on codehaus</name>
+ <url>http://codehaus.org/~jgenender/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>Mortbay Repository on codehaus</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-core</artifactId>
+ <version>2.0M1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jsp</artifactId>
+ <version>2.0-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ <configuration>
+ <jdk>1.4</jdk>
+ <flushPolicy>threaded</flushPolicy>
+ <flushInterval>100</flushInterval>
+ <licenseFile>./clover.license</licenseFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-management</artifactId>
+ <version>1.0-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jms</artifactId>
+ <version>1.1-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>jcache</groupId>
+ <artifactId>jcache</artifactId>
+ <version>1.0-dev-2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ <version>1.0-M3-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jdbc</artifactId>
+ <groupId>jdbc</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>WADI-3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.0_01_pd</version>
+ </dependency>
+ <dependency>
+ <groupId>activecluster</groupId>
+ <artifactId>activecluster</artifactId>
+ <version>1.2-20051115174934</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jsp</artifactId>
+ <version>2.0-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>1.2.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-support</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-core</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-orm</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-hibernate</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-remoting</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-core</artifactId>
+ <version>2.0M1</version>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-tomcat50</artifactId>
+ <version>2.0M1</version>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-tomcat55</artifactId>
+ <version>2.0M1</version>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-jetty5</artifactId>
+ <version>2.0M1</version>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-jetty6</artifactId>
+ <version>2.0M1</version>
+ </dependency>
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-webapp</artifactId>
+ <version>2.0M1</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <repository>
+ <id>codehaus-repo</id>
+ <name>Codehaus Repository</name>
+ <url>scpexe://beaver.codehaus.org/dist</url>
+ </repository>
+ <snapshotRepository>
+ <id>codehaus-snapshots</id>
+ <name>Codehaus Snapshots</name>
+ <url>scpexe://beaver.codehaus.org/dist</url>
+ </snapshotRepository>
+ <site>
+ <id>wadi-website</id>
+ <name>WADI Website</name>
+ <url>scpexe://beaver.codehaus.org/home/projects/wadi/public_html/wadi-test-webapp</url>
+ </site>
+ </distributionManagement>
+</project>
\ No newline at end of file
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1.war
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1.war?rev=356933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty-web.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty-web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,51 @@
+<?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>
+ -->
+
+<!-- Set up the WADI Filter -->
+
+ <Call name="getWebApplicationHandler">
+
+ <Call name="defineFilter">
+ <Arg>WadiFilter</Arg>
+ <Arg>org.codehaus.wadi.impl.Filter</Arg>
+ </Call>
+
+ <Call name="addFilterPathMapping">
+ <Arg>/*</Arg>
+ <Arg>WadiFilter</Arg>
+ <Arg type="int">15</Arg> <!-- ALL dispatch types -->
+ </Call>
+
+ </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/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty6-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty6-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/jetty6-web.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/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/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/BigString.class
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/BigString.class?rev=356933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/BigString.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/CustomString.class
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/CustomString.class?rev=356933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/org/codehaus/wadi/webapp/CustomString.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.clustered.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.clustered.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.clustered.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/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/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.persistent.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.persistent.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/wadi-web.persistent.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/classes/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>
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/wadi-web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/wadi-web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/wadi-web.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/wadi-web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,453 @@
+<?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="AttributeStreamer"
+ 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>5000</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>5000</value></constructor-arg>
+ <constructor-arg type="long" index="1"><value>5000</value></constructor-arg>
+ </bean>
+-->
+
+ <bean
+ id="Relocater"
+ class="org.codehaus.wadi.impl.HybridRelocater"
+ >
+ <constructor-arg type="long" index="0"><value>5000</value></constructor-arg>
+ <constructor-arg type="long" index="1"><value>5000</value></constructor-arg>
+ <constructor-arg type="boolean" index="2"><value>true</value></constructor-arg><!-- relocate session, not request, if possible -->
+ </bean>
+
+ <!-- the contextualiser stack -->
+
+ <bean
+ id="SessionStreamer"
+ 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><!-- sweep interval (millis) -->
+ <constructor-arg type="boolean"><value>true</value></constructor-arg><!-- strict ordering -->
+ </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="SessionStreamer"/></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>10000</value></constructor-arg> <!-- sweep interval (millis) -->
+ <constructor-arg type="boolean"><value>true</value></constructor-arg> <!-- strict ordering -->
+ <constructor-arg type="int"><value>10</value></constructor-arg> <!-- inactivity interval (secs) -->
+ </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>
+
+ <!-- other stuff... -->
+
+ <bean
+ id="HttpProxy"
+ class="org.codehaus.wadi.impl.StandardHttpProxy"
+ >
+ <constructor-arg><value>jsessionid</value></constructor-arg>
+ </bean>
+
+ <bean
+ id="NumPartitions"
+ class="java.lang.Integer"
+ >
+ <constructor-arg><value>72</value></constructor-arg>
+ </bean>
+
+ <bean
+ id="ReplicaterFactory"
+ class="org.codehaus.wadi.impl.MemoryReplicaterFactory"
+ >
+ <constructor-arg><ref bean="NumPartitions"/></constructor-arg>
+ </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>
+
+ <bean
+ id="ProxiedLocation"
+ class="org.codehaus.wadi.http.HTTPProxiedLocation"
+ >
+ <constructor-arg><ref bean="HttpAddress"/></constructor-arg>
+ </bean>
+
+ <bean
+ id="PartitionManager"
+ class="org.codehaus.wadi.gridstate.impl.DummyPartitionManager"
+ >
+ <constructor-arg><ref bean="NumPartitions"/></constructor-arg>
+ </bean>
+
+ <bean
+ id="Dispatcher"
+ class="org.codehaus.wadi.gridstate.activecluster.ActiveClusterDispatcher"
+ >
+ <constructor-arg><value>${node.name}</value></constructor-arg>
+ <constructor-arg><value>CLUSTER0</value></constructor-arg>
+<!--
+ <constructor-arg><value>peer://org.codehaus.wadi</value></constructor-arg>
+ -->
+ <constructor-arg><value>tcp://localhost:61616</value></constructor-arg>
+ <constructor-arg type="long"><value>5000</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="AttributeStreamer"/></constructor-arg>
+ <constructor-arg type="boolean"><value>true</value></constructor-arg>
+ <constructor-arg><ref bean="ReplicaterFactory"/></constructor-arg>
+ <constructor-arg><ref bean="ProxiedLocation"/></constructor-arg>
+ <constructor-arg><ref bean="HttpProxy"/></constructor-arg>
+ <constructor-arg><ref bean="Dispatcher"/></constructor-arg>
+ <constructor-arg><ref bean="PartitionManager"/></constructor-arg>
+ <constructor-arg><ref bean="Collapser"/></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=ProxiedLocation"> <ref bean="ProxiedLocation"/> </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"/>
+ <property name="registrationBehavior"><value>2</value></property> <!-- REGISTRATION_REPLACE_EXISTING -->
+ </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/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/web.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/web.xml (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/WEB-INF/web.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>Simple WADI Test Web Application</display-name>
+ <distributable/>
+ <welcome-file-list>
+ <welcome-file>/index.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
+
+
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/check.jsp
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/check.jsp?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/check.jsp (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/check.jsp Wed Dec 14 15:32:56 2005
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html" session="true" %>
+<%
+String sessId = session.getId();
+String color=System.getProperty("node.name");
+%>
+<html>
+ <head>
+ <title>WADI Set Page</title>
+ </head>
+ <body bgcolor="<%= color %>">
+ <p>The session id is = <%= sessId %></p>
+ <p>value = <%= session.getAttribute("foo") %></p>
+ </body>
+</html>
\ No newline at end of file
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/index.jsp?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/index.jsp (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/index.jsp Wed Dec 14 15:32:56 2005
@@ -0,0 +1,13 @@
+<%@ page language="java" contentType="text/html" session="true" %>
+<%
+ String color=System.getProperty("node.name");
+%>
+<html>
+ <head>
+ <title>WADI Test Page</title>
+ </head>
+ <body bgcolor="<%= color %>">
+ <p>The index for the wadi test app.</p>
+ <p>The value of foo = <%= session.getAttribute("foo") %></p>
+ </body>
+</html>
\ No newline at end of file
Added: incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/set.jsp
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/set.jsp?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/set.jsp (added)
+++ incubator/wadi/trunk/modules/testapp/target/wadi-test-webapp-2.0M1/set.jsp Wed Dec 14 15:32:56 2005
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html" session="true" %>
+<%
+String sessId = session.getId();
+String color=System.getProperty("node.name");
+session.setAttribute("foo", "bar");
+%>
+<html>
+ <head>
+ <title>WADI Set Page</title>
+ </head>
+ <body bgcolor="<%= color %>">
+ <p>The session id is = <%= sessId %></p>
+ <p>The value of foo was set to = <%= session.getAttribute("foo") %></p>
+ </body>
+</html>
\ No newline at end of file
Added: incubator/wadi/trunk/modules/tomcat50/.classpath
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/.classpath?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/.classpath (added)
+++ incubator/wadi/trunk/modules/tomcat50/.classpath Wed Dec 14 15:32:56 2005
@@ -0,0 +1,26 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <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/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/axion/axion/1.0-M3-dev/axion-1.0-M3-dev.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/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/tomcat/catalina/5.0.18/catalina-5.0.18.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/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-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/tomcat50/.cvsignore
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/.cvsignore?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/.cvsignore (added)
+++ incubator/wadi/trunk/modules/tomcat50/.cvsignore Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+.wtpmodules
+target
Added: incubator/wadi/trunk/modules/tomcat50/.project
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/.project?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/.project (added)
+++ incubator/wadi/trunk/modules/tomcat50/.project Wed Dec 14 15:32:56 2005
@@ -0,0 +1,30 @@
+<projectDescription>
+ <name>wadi-tomcat50</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/tomcat50/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/.settings/org.eclipse.jdt.core.prefs?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/.settings/org.eclipse.jdt.core.prefs (added)
+++ incubator/wadi/trunk/modules/tomcat50/.settings/org.eclipse.jdt.core.prefs Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+#Mon Dec 12 06:17:57 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/tomcat50/.wtpmodules
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/.wtpmodules?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/.wtpmodules (added)
+++ incubator/wadi/trunk/modules/tomcat50/.wtpmodules Wed Dec 14 15:32:56 2005
@@ -0,0 +1,8 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="wadi-tomcat50">
+ <module-type module-type-id="jst.utility">
+ <property name="java-output-path" value="/target/classes"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: incubator/wadi/trunk/modules/tomcat50/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/pom.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/pom.xml (added)
+++ incubator/wadi/trunk/modules/tomcat50/pom.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,90 @@
+<project>
+ <parent>
+ <groupId>wadi</groupId>
+ <artifactId>wadi</artifactId>
+ <version>2.0M1</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wadi-tomcat50</artifactId>
+ <packaging>jar</packaging>
+ <name>WADI :: Tomcat50</name>
+ <scm>
+ <connection>scm:cvs:pserver:anoncvs@cvs.wadi.codehaus.org:/home/projects/wadi/scm:wadi/modules/tomcat50</connection>
+ <developerConnection>scm:cvs:ext:${maven.username}@cvs.wadi.codehaus.org/home/projects/wadi/scm:wadi/modules/tomcat50</developerConnection>
+ <url>http://cvs.wadi.codehaus.org/viewrep/wadi/wadi/modules/tomcat50</url>
+ </scm>
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>wadi</groupId>
+ <artifactId>wadi-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>5.0.18</version>
+ <!-- <version>5.0.28</version> --> <!-- broken -->
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <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/tomcat50/src/main/java/org/apache/catalina/core/FilterConfigHelper.java
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/tomcat50/src/main/java/org/apache/catalina/core/FilterConfigHelper.java?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/tomcat50/src/main/java/org/apache/catalina/core/FilterConfigHelper.java (added)
+++ incubator/wadi/trunk/modules/tomcat50/src/main/java/org/apache/catalina/core/FilterConfigHelper.java Wed Dec 14 15:32:56 2005
@@ -0,0 +1,44 @@
+/**
+ *
+ * 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.apache.catalina.core;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Has it really come to this...
+ *
+ * @author <a href="mailto:jules@coredevelopers.net">Jules Gosnell</a>
+ * @version $Revision: 1.3 $
+ */
+
+public class FilterConfigHelper {
+ protected static final Log _log=LogFactory.getLog(FilterConfigHelper.class);
+
+ public static Filter getFilter(FilterConfig config) {
+ Filter filter=null;
+ try {
+ filter=((ApplicationFilterConfig)config).getFilter();
+ } catch (Exception e) {
+ _log.error(e);
+ }
+ return filter;
+ }
+}