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 [2/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/co...

Added: incubator/wadi/trunk/modules/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/pom.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/pom.xml (added)
+++ incubator/wadi/trunk/modules/assembly/pom.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,187 @@
+<project>
+    <parent>
+        <groupId>wadi</groupId>
+        <artifactId>wadi</artifactId>
+        <version>2.0M1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wadi-assembly</artifactId>
+    <packaging>pom</packaging>
+    <name>WADI :: Assembly</name>
+    <scm>
+        <connection>scm:cvs:pserver:anoncvs@cvs.wadi.codehaus.org:/home/projects/wadi/scm:wadi/modules/assembly</connection>
+        <developerConnection>scm:cvs:ext:${maven.username}@cvs.wadi.codehaus.org/home/projects/wadi/scm:wadi/modules/assembly</developerConnection>
+        <url>http://cvs.wadi.codehaus.org/viewrep/wadi/wadi/modules/assembly</url>
+    </scm>
+    <dependencies>
+
+        <dependency>
+            <groupId>activecluster</groupId>
+            <artifactId>activecluster</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>axion</groupId>
+            <artifactId>axion</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-primitives</groupId>
+            <artifactId>commons-primitives</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-management</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-servlet</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>catalina</artifactId>
+            <version>5.5.12</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-tomcat50</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-tomcat55</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-jetty5</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-jetty6</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-webapp</artifactId>
+            <type>war</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${basedir}/target"/>
+                                <echo file="${basedir}/target/VERSION.txt">${project.version}</echo>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <finalName>wadi-${project.version}</finalName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>

Added: incubator/wadi/trunk/modules/assembly/src/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/LICENSE.txt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/LICENSE.txt (added)
+++ incubator/wadi/trunk/modules/assembly/src/LICENSE.txt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,14 @@
+
+Copyright 2003-2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Added: incubator/wadi/trunk/modules/assembly/src/README.txt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/README.txt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/README.txt (added)
+++ incubator/wadi/trunk/modules/assembly/src/README.txt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,12 @@
+
+All documentation is online at http://wadi.codehaus.org - specifically
+our FAQ and WIKI.
+
+We hope to bundle more doc with the next release.
+
+The result of the wadi build is WEB-INF/lib/wadi-0.9.jar.
+
+
+
+Jules
+

Added: incubator/wadi/trunk/modules/assembly/src/bin/bouncy-node.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/bouncy-node.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/bouncy-node.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/bouncy-node.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+## start a node, maintain it for a period of time, stop it
+
+period=$1
+shift
+
+while true
+do
+    echo "starting node..."
+    ./node.sh $@ & pid=$!
+    echo "node started (" $pid ")"
+    sleep $period
+    echo "stopping node (" $pid ")"
+    kill -1 $pid
+    wait $pid
+    echo "node stopped"
+    sleep 2
+done

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/bouncy-node.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/cluster.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/cluster.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/cluster.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/cluster.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+cd $WADI_HOME
+
+$JAVA_HOME/bin/java \
+-ea \
+-cp \
+WEB-INF/classes:\
+WEB-INF/lib/activecluster-1.0-SNAPSHOT.jar:\
+WEB-INF/lib/activemq-1.0-SNAPSHOT.jar:\
+WEB-INF/lib/concurrent-1.3.2.jar:\
+WEB-INF/lib/geronimo-spec-j2ee-management-1.0-M1.jar:\
+WEB-INF/lib/geronimo-spec-jms-1.0-M1.jar:\
+lib/commons-logging-1.0.3.jar:\
+ \
+-Dpid=$$ \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.activecluster=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.activemq=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi=debug \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi.cluster=info \
+-Dorg.apache.commons.logging.simplelog.showShortLogname=true \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+\
+org.codehaus.wadi.test.ClusterDemo \
+$@
+

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/cluster.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/coord-node.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/coord-node.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/coord-node.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/coord-node.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+if [ "$1" = xterm ]
+then
+    XTERM="xterm -geometry 165x12 -bg \$instance -e"
+    shift
+else
+    XTERM=
+fi
+
+container=$1
+shift
+instance=$1
+shift
+
+XTERM=`eval "echo $XTERM"`
+
+JAVA_OPTS="-Xmx512m -enablesystemassertions $JAVA_OPTS"
+
+WADI_HOME=`pwd`/..
+JAVA=$JAVA_HOME/bin/java
+
+echo "JAVA_HOME=$JAVA_HOME"
+echo "WADI_HOME=$WADI_HOME"
+echo "JETTY_HOME=$JETTY_HOME"
+echo "CATALINA_HOME=$CATALINA_HOME"
+$JAVA -fullversion
+
+properties=`sed -e '/#.*/d' -e 's/${wadi.home}/$WADI_HOME/g' -e 's/\(.*\)/-D\1/g' $WADI_HOME/conf/node.$instance.properties | tr '\n' ' '`
+properties=`eval "echo $properties"`
+
+
+properties="\
+$properties \
+-Dwadi.home=$WADI_HOME \
+-Dactivemq.persistenceAdapter=org.codehaus.activemq.store.vm.VMPersistenceAdapter \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl \
+-Dorg.apache.commons.logging.simplelog.log.org=info \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.activecluster=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.activemq=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.springframework=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi=warn \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi.dindex=trace \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi.impl.HybridRelocater=trace \
+-Dorg.apache.commons.logging.simplelog.showShortLogname=true \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+"
+
+if [ jettyold = "$container" ]
+then
+    cd $JETTY_HOME
+    $XTERM $JAVA $properties -cp $WADI_HOME/WEB-INF/classes $JAVA_OPTS -jar start.jar $WADI_HOME/conf/jetty.xml
+fi
+
+if [ jetty = "$container" ]
+then
+    cd $JETTY_HOME
+    classpath=`find lib ext $WADI_HOME/WEB-INF/lib -name "*.jar" | tr '\n' ':'`./start.jar:$JAVA_HOME/lib/tools.jar:$WADI_HOME/WEB-INF/classes
+    $XTERM $JAVA $properties -cp $classpath $JAVA_OPTS org.mortbay.jetty.Server $WADI_HOME/conf/jetty.xml
+fi
+
+if [ tomcat = "$container" ]
+then
+    cd $CATALINA_HOME/bin
+    properties="-Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed -Dcatalina.base=$CATALINA_HOME -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_HOME/temp $properties"
+    classpath=`find $CATALINA_HOME/. $WADI_HOME/lib $WADI_HOME/WEB-INF/lib $JETTY_HOME/lib/org.mortbay.jetty.jar $JAVA_HOME/lib/tools.jar -name "*.jar" | tr '\n' ':'`:$WADI_HOME/WEB-INF/classes
+    $XTERM $JAVA $properties -cp $classpath $JAVA_OPTS org.apache.catalina.startup.Bootstrap -config $WADI_HOME/conf/tomcat.xml start
+fi

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/coord-node.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/coord.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/coord.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/coord.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/coord.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+cd ..
+
+exec time java\
+ \
+-Xmx64m \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl \
+-Dorg.apache.commons.logging.simplelog.log.org=info \
+-Dorg.apache.commons.logging.simplelog.showShortLogname=true \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+-classpath \
+WEB-INF/classes:\
+WEB-INF-classes:\
+WEB-INF/classes.test:\
+WEB-INF/lib/concurrent-1.3.4.jar:\
+WEB-INF/lib/activecluster-1.1-SNAPSHOT.jar:\
+WEB-INF/lib/activemq-3.1-SNAPSHOT.jar:\
+WEB-INF/lib/geronimo-spec-jms-1.1-rc2.jar:\
+WEB-INF/lib/geronimo-spec-j2ee-management-1.0-rc2.jar:\
+lib/commons-logging-1.0.4.jar:\
+ \
+org.codehaus.wadi.sandbox.dindex.DIndexNode $1 $2

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/coord.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/cycle-all.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/cycle-all.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/cycle-all.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/cycle-all.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/bin/ps -C java -o pid,command | /bin/grep cycle.me | sed -e 's/ *\([0-9]*\) .*/\1/g' | xargs kill -2

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/cycle-all.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/cycle-randomth.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/cycle-randomth.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/cycle-randomth.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/cycle-randomth.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# bounce a node every $1 seconds
+# nodes must each be run in loop (use looped-node.sh)
+# nodes must mention http.port in their command line
+# nodes will be bounced in random order
+
+## return nth element in list, where n is random
+randomth() { n=`expr $RANDOM \% $# + 1`; eval echo \$"$n"; }
+
+interval=$1
+while true
+do
+    nodes=`/bin/ps -C java -o pid,command | /bin/grep cycle.me | sed -e 's/ *\([0-9]*\) .*/\1/g'`
+    node=`randomth $nodes`
+    echo "killing node now"
+    kill -2 $node
+    sleep $interval
+done

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/cycle-randomth.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/cycle.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/cycle.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/cycle.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/cycle.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# bounce a node every $1 seconds
+# nodes must each be run in loop (use looped-node.sh)
+# nodes must mention http.port in their command line
+# nodes will be bounced in random order
+
+## return nth element in list, where n is random
+randomth() { n=`expr $RANDOM \% $# + 1`; eval echo \$"$n"; }
+
+interval=$1
+while true
+do
+    nodes=`/bin/ps -C java -o pid,command | /bin/grep cycle.me | sed -e 's/ *\([0-9]*\) .*/\1/g'`
+    node=`randomth $nodes`
+    echo "killing node now"
+    kill -2 $node
+    sleep $interval
+done

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/cycle.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/dindex.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/dindex.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/dindex.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/dindex.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+cd ..
+
+exec time java\
+ \
+-Xmx64m \
+-Dcycle.me=true \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl \
+-Dorg.apache.commons.logging.simplelog.log.org=info \
+-Dorg.apache.commons.logging.simplelog.showShortLogname=true \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+-Dorg.apache.commons.logging.simplelog.log.org.activecluster=info \
+-Dorg.apache.commons.logging.simplelog.log.org.activemq=info \
+-classpath \
+WEB-INF/classes:\
+WEB-INF-classes:\
+WEB-INF/classes.test:\
+WEB-INF/lib/concurrent-1.3.4.jar:\
+WEB-INF/lib/activecluster-1.1-SNAPSHOT.jar:\
+WEB-INF/lib/activemq-3.1-SNAPSHOT.jar:\
+WEB-INF/lib/geronimo-spec-jms-1.1-rc2.jar:\
+WEB-INF/lib/geronimo-spec-j2ee-management-1.0-rc2.jar:\
+lib/commons-logging-1.0.4.jar:\
+ \
+org.codehaus.wadi.sandbox.dindex.DIndexNode $1 $2

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/dindex.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/jlb.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/jlb.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/jlb.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/jlb.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+## This script runs Jetty Balancer - a load balancer that comes as
+## part of JettyExtra (jetty.mortbay.org). This is written in Java
+## using NIO.
+
+## This lb does per-connection stickiness.
+
+## Fail-Over does not seem to work at the moment.
+
+exec $JAVA_HOME/bin/java \
+-cp \
+$JETTY_HOME/extra/lib/org.mortbay.loadbalancer.jar:\
+$JETTY_HOME/lib/org.mortbay.jetty.jar:\
+$JETTY_HOME/ext/commons-logging.jar \
+org.mortbay.loadbalancer.Balancer \
+8081 \
+- \
+8090 \
+8091 \
+8092 \
+8093

Added: incubator/wadi/trunk/modules/assembly/src/bin/looped-dindex.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/looped-dindex.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/looped-dindex.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/looped-dindex.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true
+do
+    echo "starting dindex..."
+    ./dindex.sh $@
+    echo "...dindex stopped"
+done

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/looped-dindex.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/looped-node.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/looped-node.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/looped-node.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/looped-node.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true
+do
+    echo "starting node..."
+    ./node.sh $@
+    echo "...node stopped"
+done

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/looped-node.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/modjk1.txt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/modjk1.txt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/modjk1.txt (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/modjk1.txt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,3 @@
+
+Mod_Jk[1] is an Apache httpd module. See ../conf/workers.properties.
+

Added: incubator/wadi/trunk/modules/assembly/src/bin/modjk2.txt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/modjk2.txt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/modjk2.txt (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/modjk2.txt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,4 @@
+
+I must get round to doing this :-)
+
+

Added: incubator/wadi/trunk/modules/assembly/src/bin/node.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/node.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/node.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/node.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,177 @@
+#!/bin/sh +x
+
+if [ "$1" = xterm ]
+then
+    XTERM="xterm -geometry 165x12 -bg \$instance -e"
+    shift
+else
+    XTERM=
+fi
+
+container=$1
+shift
+instance=$1
+shift
+
+if [ "$1" = "jpda" ] ; then
+  if [ -z "$JPDA_TRANSPORT" ]; then
+    JPDA_TRANSPORT="dt_socket"
+  fi
+  if [ -z "$JPDA_ADDRESS" ]; then
+    JPDA_ADDRESS="8000"
+  fi
+  if [ -z "$JPDA_OPTS" ]; then
+    JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
+  fi
+  shift
+fi
+
+XTERM=`eval "echo $XTERM"`
+
+JAVA_OPTS="-Xmx512m -ea $JAVA_OPTS"
+#JPDA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
+
+WADI_HOME=`pwd`/..
+WADI_VERSION=`cat $WADI_HOME/VERSION.txt`
+JAVA=$JAVA_HOME/bin/java
+
+
+echo "JAVA_HOME=$JAVA_HOME"
+echo "WADI_HOME=$WADI_HOME"
+echo "WADI_VERSION=$WADI_VERSION"
+echo "JETTY5_HOME=$JETTY5_HOME"
+echo "JETTY6_HOME=$JETTY6_HOME"
+echo "TOMCAT50_HOME=$TOMCAT50_HOME"
+echo "TOMCAT55_HOME=$TOMCAT55_HOME"
+$JAVA -fullversion
+
+properties=`sed -e '/#.*/d' -e 's/${wadi.home}/$WADI_HOME/g' -e 's/\(.*\)/-D\1/g' $WADI_HOME/conf/node.$instance.properties | tr '\n' ' '`
+properties=`eval "echo $properties"`
+
+INSTANCE=$WADI_HOME/tmp/$instance
+rm -fr $INSTANCE
+mkdir -p $INSTANCE/logs
+mkdir -p $INSTANCE/sessions
+
+properties="\
+-Dcycle.me=true \
+$properties \
+-Dwadi.home=$WADI_HOME \
+-Dwadi.version=$WADI_VERSION \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi=debug \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi.impl.AbsoluteEvicter=info \
+-Dorg.apache.commons.logging.simplelog.log.org.codehaus.wadi.impl.NeverEvicter=info \
+-Djava.io.tmpdir=$INSTANCE \
+"
+
+classpath=$WADI_HOME/target/classes:`find $WADI_HOME/lib -name "*.jar" | tr '\n' ':'`$JAVA_HOME/lib/tools.jar
+
+case "$container" in
+
+	jetty5)
+
+	if [ -z "JETTY5_HOME" ]
+	then
+	    echo "Please set JETTY5_HOME"
+	    exit 1
+	fi
+
+	JETTY_BASE=$INSTANCE
+	cd $JETTY5_HOME
+
+	properties="\
+	$properties\
+	-Djetty.home=$JETTY_BASE\
+	"
+
+	classpath=`find ./start.jar lib ext -name "*.jar" | tr '\n' ':'`$classpath
+	$XTERM $JAVA $properties -cp $classpath $JAVA_OPTS $JPDA_OPTS org.mortbay.jetty.Server $WADI_HOME/conf/jetty5.xml
+	;;
+
+	jetty6)
+
+	if [ -z "JETTY6_HOME" ]
+	then
+	    echo "Please set JETTY6_HOME"
+	    exit 1
+	fi
+
+	JETTY_BASE=$INSTANCE
+	cd $JETTY6_HOME
+
+	properties="\
+	$properties\
+	-Djetty.home=$JETTY_BASE\
+	"
+
+	classpath=`find ./start.jar lib ext -name "*.jar" | tr '\n' ':'`$classpath
+	$XTERM $JAVA $properties -cp $classpath $JAVA_OPTS $JPDA_OPTS org.mortbay.xml.XmlConfiguration $WADI_HOME/conf/jetty6.xml
+	;;
+
+	tomcat50)
+	if [ -z "TOMCAT50_HOME" ]
+	then
+	    echo "Please set TOMCAT50_HOME"
+	    exit 1
+	fi
+
+	CATALINA_HOME=$TOMCAT50_HOME
+	CATALINA_BASE=$INSTANCE
+	cd $CATALINA_HOME/bin
+
+	mkdir -p $CATALINA_BASE/webapps
+	mkdir -p $CATALINA_BASE/work
+	cp -r $CATALINA_HOME/conf $CATALINA_BASE/
+	rm -fr $CATALINA_BASE/conf/Catalina/localhost
+	mkdir -p $CATALINA_BASE/conf/Catalina/localhost
+
+
+	properties="\
+	$properties\
+	-Dcatalina.home=$CATALINA_HOME\
+	-Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed\
+	-Dcatalina.base=$CATALINA_BASE\
+	"
+
+	classpath=`find $CATALINA_HOME/. -name "*.jar" | tr '\n' ':'`$classpath
+	$XTERM $JAVA $properties -cp $classpath $JAVA_OPTS $JPDA_OPTS org.apache.catalina.startup.Bootstrap -config $WADI_HOME/conf/tomcat50.xml start
+	;;
+
+	tomcat55)
+	if [ -z "TOMCAT55_HOME" ]
+	then
+	    echo "Please set TOMCAT55_HOME"
+	    exit 1
+	fi
+	CATALINA_HOME=$TOMCAT55_HOME
+	CATALINA_BASE=$INSTANCE
+	cd $CATALINA_HOME/bin
+
+	mkdir -p $CATALINA_BASE/webapps
+	mkdir -p $CATALINA_BASE/work
+	cp -r $CATALINA_HOME/conf $CATALINA_BASE/
+	rm -fr $CATALINA_BASE/conf/Catalina/localhost
+	mkdir -p $CATALINA_BASE/conf/Catalina/localhost
+
+
+	properties="\
+	$properties\
+	-Dcatalina.home=$CATALINA_HOME\
+	-Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed\
+	-Dcatalina.base=$CATALINA_BASE\
+	"
+
+	classpath=`find $CATALINA_HOME/. -name "*.jar" | tr '\n' ':'`$classpath
+	$XTERM $JAVA $properties -cp $classpath $JAVA_OPTS $JPDA_OPTS org.apache.catalina.startup.Bootstrap -config $WADI_HOME/conf/tomcat55.xml start
+	;;
+
+
+	*)
+	echo "bad container name: $container"
+	;;
+
+esac
+

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/node.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/nodes.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/nodes.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/nodes.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/nodes.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+./node.sh xterm jetty5 red&
+./node.sh xterm jetty6 green&
+./node.sh xterm tomcat50 blue&
+./node.sh xterm tomcat55 yellow&
+./node.sh xterm jetty5 pink&
+./node.sh xterm jetty6 orange&
+./node.sh xterm tomcat50 purple&
+./node.sh xterm tomcat55 brown&

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/nodes.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/pen.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/pen.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/pen.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/pen.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+## this script runs Pen, a 'C' load-balancer available at :http://siag.nu/pen/
+
+## I can't find a way to turn off stickiness, but fail-over works
+## nicely...
+
+exec pen -f 8080 localhost:8090 localhost:8091 localhost:8092 localhost:8093

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/pen.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/bin/pound.txt
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/pound.txt?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/pound.txt (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/pound.txt Wed Dec 14 15:32:56 2005
@@ -0,0 +1,8 @@
+
+Pound (http://www.apsis.ch/pound/) is another load balancer. It seems
+to need to run as root, so a script is not currently provided, see
+../conf/pound.cfg
+
+e.g.
+
+killall -9 pound; /usr/local/sbin/pound -f conf/pound.cfg

Added: incubator/wadi/trunk/modules/assembly/src/bin/soak.sh
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/bin/soak.sh?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/bin/soak.sh (added)
+++ incubator/wadi/trunk/modules/assembly/src/bin/soak.sh Wed Dec 14 15:32:56 2005
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+cd ..
+
+exec time java\
+ \
+-Xmx1024m \
+-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog \
+-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl \
+-Dorg.apache.commons.logging.simplelog.log.org=info \
+-Dorg.apache.commons.logging.simplelog.showShortLogname=true \
+-Dorg.apache.commons.logging.simplelog.showdatetime=true \
+-classpath \
+WEB-INF/classes:\
+WEB-INF/classes.test:\
+WEB-INF/lib/concurrent-1.3.4.jar:\
+lib/commons-logging-1.0.4.jar:\
+/usr/local/java/commons-httpclient-3.0-rc2/commons-httpclient-3.0-rc2.jar\
+ \
+org.codehaus.wadi.test.SoakTestClient 1000 10 100 1
+
+#WEB-INF/lib/commons-httpclient-2.0.2.jar\

Propchange: incubator/wadi/trunk/modules/assembly/src/bin/soak.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/wadi/trunk/modules/assembly/src/conf/create.jmx
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/create.jmx?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/create.jmx (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/create.jmx Wed Dec 14 15:32:56 2005
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<testelement class="org.apache.jmeter.config.Arguments" name="TestPlan.user_defined_variables">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection class="java.util.ArrayList" propType="org.apache.jmeter.testelement.property.CollectionProperty" name="Arguments.arguments"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">User Defined Variables</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+</testelement>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestPlan.serialize_threadgroups">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">Test Plan</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestPlan.functional_mode">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestPlan.comments"/>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.LongProperty" name="ThreadGroup.start_time">1097162399000</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="ThreadGroup.delay"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="ThreadGroup.duration"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="ThreadGroup.num_threads">100</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="ThreadGroup.scheduler">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+<testelement class="org.apache.jmeter.control.LoopController" name="ThreadGroup.main_controller">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="LoopController.loops">300</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">Loop Controller</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="LoopController.continue_forever">false</property>
+</testelement>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">Thread Group</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.LongProperty" name="ThreadGroup.end_time">1097162399000</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="ThreadGroup.on_sample_error">continue</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="ThreadGroup.ramp_time">0</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.control.CookieManager">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.CookiePanel</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.protocol.http.control.CookieManager</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">cookies</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="CookieManager.clearEachIteration">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<collection class="java.util.ArrayList" propType="org.apache.jmeter.testelement.property.CollectionProperty" name="CookieManager.cookies"/>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.path">/wadi/jsp/create.jsp</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.method">GET</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.use_keepalive">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.protocol">http</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.image_parser">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.follow_redirects">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.port">80</property>
+<testelement class="org.apache.jmeter.config.Arguments" name="HTTPsampler.Arguments">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection class="java.util.LinkedList" propType="org.apache.jmeter.testelement.property.CollectionProperty" name="Arguments.arguments"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">User Defined Variables</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+</testelement>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.mimetype"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.FILE_FIELD"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">create session</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.monitor">false</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.domain">smilodon</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.FILE_NAME"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.auto_redirects">false</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.name">Graph Results</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="TestElement.enabled">true</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="filename"/>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="ResultCollector.error_logging">false</property>
+</testelement>
+</node>
+</node>
+</node>
+</node>

Added: incubator/wadi/trunk/modules/assembly/src/conf/httpd.conf
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/httpd.conf?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/httpd.conf (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/httpd.conf Wed Dec 14 15:32:56 2005
@@ -0,0 +1,1049 @@
+#
+# Based upon the NCSA server configuration files originally by Rob McCool.
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about
+# the directives.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+# with ServerRoot set to "/etc/httpd" will be interpreted by the
+# server as "/etc/httpd/logs/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# Don't give away too much information about all the subcomponents
+# we are running.  Comment out this line if you don't mind remote sites
+# finding out what major optional modules you are running
+ServerTokens OS
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation
+# (available at <URL:http://httpd.apache.org/docs-2.0/mod/core.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+ServerRoot "/etc/httpd"
+
+#
+# ScoreBoardFile: File used to store internal server process information.
+# If unspecified (the default), the scoreboard will be stored in an
+# anonymous shared memory segment, and will be unavailable to third-party
+# applications.
+# If specified, ensure that no two invocations of Apache share the same
+# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
+#
+#ScoreBoardFile run/httpd.scoreboard
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+#
+PidFile run/httpd.pid
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive Off
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule prefork.c>
+StartServers       8
+MinSpareServers    5
+MaxSpareServers   20
+MaxClients       150
+MaxRequestsPerChild  1000
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule worker.c>
+StartServers         2
+MaxClients         150
+MinSpareThreads     25
+MaxSpareThreads     75 
+ThreadsPerChild     25
+MaxRequestsPerChild  0
+</IfModule>
+
+# perchild MPM
+# NumServers: constant number of server processes
+# StartThreads: initial number of worker threads in each server process
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# MaxThreadsPerChild: maximum number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of connections per server process
+<IfModule perchild.c>
+NumServers           5
+StartThreads         5
+MinSpareThreads      5
+MaxSpareThreads     10
+MaxThreadsPerChild  20
+MaxRequestsPerChild  0
+</IfModule>
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, in addition to the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Load config files from the config directory "/etc/httpd/conf.d".
+#
+Include conf.d/*.conf
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule access_module modules/mod_access.so
+LoadModule auth_module modules/mod_auth.so
+LoadModule auth_anon_module modules/mod_auth_anon.so
+LoadModule auth_dbm_module modules/mod_auth_dbm.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule include_module modules/mod_include.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule cern_meta_module modules/mod_cern_meta.so
+LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule usertrack_module modules/mod_usertrack.so
+LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule asis_module modules/mod_asis.so
+LoadModule info_module modules/mod_info.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule imap_module modules/mod_imap.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule speling_module modules/mod_speling.so
+LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_connect_module modules/mod_proxy_connect.so
+
+<IfModule prefork.c>
+LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+
+<IfModule worker.c>
+LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+
+#
+# ExtendedStatus controls whether Apache will generate "full" status
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+#ExtendedStatus On
+
+### Section 2: 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
+#  . On HPUX you may not be able to use shared memory as nobody, and the
+#    suggested workaround is to create a user www and use that user.
+#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
+#  when the value of (unsigned)Group is above 60000; 
+#  don't use Group #-1 on these systems!
+#
+User apache
+Group apache
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin root@localhost
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If this is not set to valid DNS name for your host, server-generated
+# redirections will not work.  See also the UseCanonicalName directive.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+# You will have to access it by its address anyway, and this will make 
+# redirections work in a sensible way.
+#
+#ServerName new.host.name:80
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/www/html"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/var/www/html">
+
+#
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
+#
+# Note that "MultiViews" must be named *explicitly* --- "Options All"
+# doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs-2.0/mod/core.html#options
+# for more information.
+#
+    Options Indexes FollowSymLinks
+
+#
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit
+#
+    AllowOverride None
+
+#
+# Controls who can get stuff from this server.
+#
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+# 
+# Disable autoindex for the root directory, and present a
+# default Welcome page if no other index page is present.
+#
+<LocationMatch "^/$>
+    Options -Indexes
+    ErrorDocument 403 /error/noindex.html
+</LocationMatch>
+
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received.
+#
+# The path to the end user account 'public_html' directory must be
+# accessible to the webserver userid.  This usually means that ~userid
+# must have permissions of 711, ~userid/public_html must have permissions
+# of 755, and documents contained therein must be world-readable.
+# Otherwise, the client will only receive a "403 Forbidden" message.
+#
+# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden
+#
+<IfModule mod_userdir.c>
+    #
+    # UserDir is disabled by default since it can confirm the presence
+    # of a username on the system (depending on home directory
+    # permissions).
+    #
+    UserDir disable
+
+    #
+    # To enable requests to /~user/ to serve the user's public_html
+    # directory, remove the "UserDir disable" line above, and uncomment
+    # the following line instead:
+    # 
+    #UserDir public_html
+
+</IfModule>
+
+#
+# Control access to UserDir directories.  The following is an example
+# for a site where these directories are restricted to read-only.
+#
+#<Directory /home/*/public_html>
+#    AllowOverride FileInfo AuthConfig Limit
+#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+#    <Limit GET POST OPTIONS>
+#        Order allow,deny
+#        Allow from all
+#    </Limit>
+#    <LimitExcept GET POST OPTIONS>
+#        Order deny,allow
+#        Deny from all
+#    </LimitExcept>
+#</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+# The index.html.var file (a type-map) is used to deliver content-
+# negotiated documents.  The MultiViews Option can be used for the 
+# same purpose, but it is much slower.
+#
+DirectoryIndex index.html index.html.var
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for access control information.  See also the AllowOverride directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+</Files>
+
+#
+# TypesConfig describes where the mime.types file (or equivalent) is
+# to be found.
+#
+TypesConfig /etc/mime.types
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mod_mime_magic.c>
+#   MIMEMagicFile /usr/share/magic.mime
+    MIMEMagicFile conf/magic
+</IfModule>
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog logs/error_log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+#
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+#
+# The location and format of the access logfile (Common Logfile Format).
+# If you do not define any access logfiles within a <VirtualHost>
+# container, they will be logged here.  Contrariwise, if you *do*
+# define per-<VirtualHost> access logfiles, transactions will be
+# logged therein and *not* in this file.
+#
+# CustomLog logs/access_log common
+CustomLog logs/access_log combined
+
+#
+# If you would like to have agent and referer logfiles, uncomment the
+# following directives.
+#
+#CustomLog logs/referer_log referer
+#CustomLog logs/agent_log agent
+
+#
+# If you prefer a single logfile with access, agent, and referer information
+# (Combined Logfile Format) you can use the following directive.
+#
+#CustomLog logs/access_log combined
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (error documents, FTP directory listings,
+# mod_status and mod_info output etc., but not CGI generated documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Alias fakename realname
+#
+# Note that if you include a trailing / on fakename then the server will
+# require it to be present in the URL.  So "/icons" isn't aliased in this
+# example, only "/icons/".  If the fakename is slash-terminated, then the 
+# realname must also be slash terminated, and if the fakename omits the 
+# trailing slash, the realname must also omit it.
+#
+# We include the /icons/ alias for FancyIndexed directory listings.  If you
+# do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "/var/www/icons/"
+
+<Directory "/var/www/icons">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# This should be changed to the ServerRoot/manual/.  The alias provides
+# the manual, even if you choose to move your DocumentRoot.  You may comment
+# this out if you do not care for the documentation.
+#
+Alias /manual "/var/www/manual"
+
+<Directory "/var/www/manual">
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+<IfModule mod_dav_fs.c>
+    # Location of the WebDAV lock database.
+    DAVLockDB /var/lib/dav/lockdb
+</IfModule>
+
+#
+# ScriptAlias: This controls which directories contain server scripts.
+# ScriptAliases are essentially the same as Aliases, except that
+# documents in the realname directory are treated as applications and
+# run by the server when requested rather than as documents sent to the client.
+# The same rules about trailing "/" apply to ScriptAlias directives as to
+# Alias.
+#
+ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+<IfModule mod_cgid.c>
+#
+# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+# for setting UNIX socket for communicating with cgid.
+#
+Scriptsock            run/httpd.cgid
+</IfModule>
+
+#
+# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/www/cgi-bin">
+    AllowOverride None
+    Options None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# Redirect allows you to tell clients about documents which used to exist in
+# your server's namespace, but do not anymore. This allows you to tell the
+# clients where to look for the relocated document.
+# Example:
+# Redirect permanent /foo http://www.example.com/bar
+
+#
+# Directives controlling the display of server-generated directory listings.
+#
+
+#
+# FancyIndexing is whether you want fancy directory indexing or standard.
+# VersionSort is whether files containing version numbers should be 
+# compared in the natural way, so that `apache-1.3.9.tar' is placed before
+# `apache-1.3.12.tar'.
+#
+IndexOptions FancyIndexing VersionSort NameWidth=*
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+
+#
+# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
+# information on the fly. Note: Not all browsers support this.
+# Despite the name similarity, the following Add* directives have nothing
+# to do with the FancyIndexing customization directives above.
+#
+AddEncoding x-compress Z
+AddEncoding x-gzip gz tgz
+
+#
+# DefaultLanguage and AddLanguage allows you to specify the language of 
+# a document. You can then use content negotiation to give a browser a 
+# file in a language the user can understand.
+#
+# Specify a default language. This means that all data
+# going out without a specific language tag (see below) will 
+# be marked with this one. You probably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a page as 
+# * being a certain language than marking it with the wrong
+# * language!
+#
+# DefaultLanguage nl
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in some cases 
+# the two character 'Language' abbreviation is not identical to 
+# the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. There is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
+# French (fr) - German (de) - Greek-Modern (el)
+# Italian (it) - Norwegian (no) - Norwegian Nynorsk (nn) - Korean (kr) 
+# Portugese (pt) - Luxembourgeois* (ltz)
+# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
+# Russian (ru) - Croatian (hr)
+#
+AddLanguage da .dk
+AddLanguage nl .nl
+AddLanguage en .en
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage de .de
+AddLanguage he .he
+AddLanguage el .el
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage pl .po
+AddLanguage kr .kr
+AddLanguage pt .pt
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pt-br .pt-br
+AddLanguage ltz .ltz
+AddLanguage ca .ca
+AddLanguage es .es
+AddLanguage sv .se
+AddLanguage cz .cz
+AddLanguage ru .ru
+AddLanguage tw .tw
+AddLanguage zh-tw .tw
+AddLanguage hr .hr
+
+#
+# LanguagePriority allows you to give precedence to some languages
+# in case of a tie during content negotiation.
+#
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
+
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
+#
+# Specify a default charset for all pages sent out. This is
+# always a good idea and opens the door for future internationalisation
+# of your web site, should you ever want it. Specifying it as
+# a default does little harm; as the standard dictates that a page
+# is in iso-8859-1 (latin1) unless specified otherwise i.e. you
+# are merely stating the obvious. There are also some security
+# reasons in browsers, related to javascript and URL parsing
+# which encourage you to always set a default char set.
+#
+AddDefaultCharset ISO-8859-1
+
+#
+# Commonly used filename extensions to character sets. You probably
+# want to avoid clashes with the language extensions, unless you
+# are good at carefully testing your setup after each change.
+# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets for
+# the official list of charset names and their respective RFCs
+#
+AddCharset ISO-8859-1  .iso8859-1  .latin1
+AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen
+AddCharset ISO-8859-3  .iso8859-3  .latin3
+AddCharset ISO-8859-4  .iso8859-4  .latin4
+AddCharset ISO-8859-5  .iso8859-5  .latin5 .cyr .iso-ru
+AddCharset ISO-8859-6  .iso8859-6  .latin6 .arb
+AddCharset ISO-8859-7  .iso8859-7  .latin7 .grk
+AddCharset ISO-8859-8  .iso8859-8  .latin8 .heb
+AddCharset ISO-8859-9  .iso8859-9  .latin9 .trk
+AddCharset ISO-2022-JP .iso2022-jp .jis
+AddCharset ISO-2022-KR .iso2022-kr .kis
+AddCharset ISO-2022-CN .iso2022-cn .cis
+AddCharset Big5        .Big5       .big5
+# For russian, more than one charset is used (depends on client, mostly):
+AddCharset WINDOWS-1251 .cp-1251   .win-1251
+AddCharset CP866       .cp866
+AddCharset KOI8-r      .koi8-r .koi8-ru
+AddCharset KOI8-ru     .koi8-uk .ua
+AddCharset ISO-10646-UCS-2 .ucs2
+AddCharset ISO-10646-UCS-4 .ucs4
+AddCharset UTF-8       .utf8
+
+# The set below does not map to a specific (iso) standard
+# but works on a fairly wide range of browsers. Note that
+# capitalization actually matters (it should not, but it
+# does for some browsers).
+#
+# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets
+# for a list of sorts. But browsers support few.
+#
+AddCharset GB2312      .gb2312 .gb 
+AddCharset utf-7       .utf7
+AddCharset utf-8       .utf8
+AddCharset big5        .big5 .b5
+AddCharset EUC-TW      .euc-tw
+AddCharset EUC-JP      .euc-jp
+AddCharset EUC-KR      .euc-kr
+AddCharset shift_jis   .sjis
+
+#
+# AddType allows you to add to or override the MIME configuration
+# file mime.types for specific file types.
+#
+AddType application/x-tar .tgz
+
+#
+# AddHandler allows you to map certain file extensions to "handlers":
+# actions unrelated to filetype. These can be either built into the server
+# or added with the Action directive (see below)
+#
+# To use CGI scripts outside of ScriptAliased directories:
+# (You will also need to add "ExecCGI" to the "Options" directive.)
+#
+#AddHandler cgi-script .cgi
+
+#
+# For files that include their own HTTP headers:
+#
+#AddHandler send-as-is asis
+
+#
+# For server-parsed imagemap files:
+#
+AddHandler imap-file map
+
+#
+# For type maps (negotiated resources):
+# (This is enabled by default to allow the Apache "It Worked" page
+#  to be distributed in multiple languages.)
+#
+AddHandler type-map var
+
+# Filters allow you to process content before it is sent to the client.
+#
+# To parse .shtml files for server-side includes (SSI):
+# (You will also need to add "Includes" to the "Options" directive.)
+#
+AddOutputFilter INCLUDES .shtml
+
+#
+# Action lets you define media types that will execute a script whenever
+# a matching file is called. This eliminates the need for repeated URL
+# pathnames for oft-used CGI file processors.
+# Format: Action media/type /cgi-script/location
+# Format: Action handler-name /cgi-script/location
+#
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can Internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line;
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /var/www/error/include/ files and
+# copying them to /your/include/path/, even on a per-VirtualHost basis.
+#
+
+Alias /error/ "/var/www/error/"
+
+<IfModule mod_negotiation.c>
+<IfModule mod_include.c>
+    <Directory "/var/www/error">
+        AllowOverride None
+        Options IncludesNoExec
+        AddOutputFilter Includes html
+        AddHandler type-map var
+        Order allow,deny
+        Allow from all
+        LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
+    </Directory>
+
+    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+    ErrorDocument 410 /error/HTTP_GONE.html.var
+    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+    ErrorDocument 415 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+</IfModule>
+</IfModule>
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+
+#
+# Allow server status reports, with the URL of http://servername/server-status
+# Change the ".your-domain.com" to match your domain to enable.
+#
+#<Location /server-status>
+#    SetHandler server-status
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your-domain.com
+#</Location>
+
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".your-domain.com" to match your domain to enable.
+#
+#<Location /server-info>
+#    SetHandler server-info
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your-domain.com
+#</Location>
+
+#
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your-domain.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable the cache as well, edit and uncomment the following lines:
+# (no cacheing without CacheRoot)
+#
+#CacheRoot "/etc/httpd/proxy"
+#CacheSize 5
+#CacheGcInterval 4
+#CacheMaxExpire 24
+#CacheLastModifiedFactor 0.1
+#CacheDefaultExpire 1
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
+
+#</IfModule>
+# End of proxy directives.
+
+### Section 3: Virtual Hosts
+#
+# VirtualHost: If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at 
+# <URL:http://httpd.apache.org/docs-2.0/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+#NameVirtualHost *
+
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for requests without a known
+# server name.
+#
+#<VirtualHost *>
+#    ServerAdmin webmaster@dummy-host.example.com
+#    DocumentRoot /www/docs/dummy-host.example.com
+#    ServerName dummy-host.example.com
+#    ErrorLog logs/dummy-host.example.com-error_log
+#    CustomLog logs/dummy-host.example.com-access_log common
+#</VirtualHost>
+
+LoadModule jk_module  modules/mod_jk.so
+JkWorkersFile /etc/httpd/conf/workers.properties
+JkLogFile     /etc/httpd/logs/mod_jk.log
+JkLogLevel    info
+JkMount	      /*      cluster
+
+#LoadModule jk2_module modules/mod_jk2.so
+

Added: incubator/wadi/trunk/modules/assembly/src/conf/jetty.mlet
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/jetty.mlet?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/jetty.mlet (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/jetty.mlet Wed Dec 14 15:32:56 2005
@@ -0,0 +1,31 @@
+
+<MLET
+ NAME="org.mortbay:adaptor=http"
+ CODE="org.mortbay.util.jmx.MX4JHttpAdaptor"
+ ARCHIVE="mx4j-tools.jar" >
+ <ARG type="int" value="8082">
+</MLET>
+
+<MLET
+ NAME="org.mortbay:jetty=admin"
+ CODE="org.mortbay.jetty.jmx.ServerMBean"
+ ARCHIVE="org.mortbay.jetty.jar" >
+ <ARG type="java.lang.String" value="etc/admin.xml">
+</MLET>
+
+<!--
+<MLET
+ NAME="org.mortbay:jetty=demo"
+ CODE="org.mortbay.jetty.jmx.ServerMBean"
+ ARCHIVE="org.mortbay.jetty.jmx.jar" >
+ <ARG type="java.lang.String" value="etc/demo.xml">
+</MLET>
+-->
+
+<!-- what can we do about the need for an absolute path here ? -->
+<MLET
+ NAME="org.mortbay:jetty=demo"
+ CODE="org.mortbay.jetty.jmx.ServerMBean"
+ ARCHIVE="org.mortbay.jetty.jmx.jar" >
+ <ARG type="java.lang.String" value="/home/jules/wadi/conf/jetty.xml">
+</MLET>

Added: incubator/wadi/trunk/modules/assembly/src/conf/jetty5.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/jetty5.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/jetty5.xml (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/jetty5.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+
+<Configure class="org.mortbay.jetty.Server">
+
+  <Call name="addListener">
+    <Arg>
+      <New class="org.mortbay.http.SocketListener">
+        <Set name="Port"><SystemProperty name="http.port" default="8080"/></Set>
+        <Set name="MinThreads">1</Set>
+        <Set name="MaxThreads">1000</Set>
+        <Set name="MaxIdleTimeMs">30000</Set>
+        <Set name="LowResourcePersistTimeMs">5000</Set>
+        <Set name="ConfidentialPort">8443</Set>
+        <Set name="IntegralPort">8443</Set>
+      </New>
+    </Arg>
+  </Call>
+
+  <Call name="addListener">
+    <Arg>
+      <New class="org.mortbay.http.ajp.AJP13Listener">
+        <Set name="Port"><SystemProperty name="ajp.port" default="8009"/></Set>
+        <Set name="MinThreads">200</Set>
+        <Set name="MaxThreads">2000</Set>
+        <Set name="MaxIdleTimeMs">0</Set>
+        <Set name="confidentialPort">443</Set>
+      </New>
+    </Arg>
+  </Call>
+
+  <Call name="addWebApplication">
+    <Arg>/wadi</Arg>
+    <Arg><SystemProperty name="wadi.home"/>/webapps/wadi-webapp-<SystemProperty name="wadi.version"/>.war</Arg>
+  </Call>
+
+<!--
+  <Call name="addWebApplication">
+    <Arg>/jsp-tests</Arg>
+    <Arg><SystemProperty name="wadi.home"/>/watchdog/jsp-tests</Arg>
+  </Call>
+
+  <Call name="addWebApplication">
+    <Arg>/servlet-tests</Arg>
+    <Arg><SystemProperty name="wadi.home"/>/watchdog/servlet-tests</Arg>
+  </Call>
+
+  <Call name="addWebApplication">
+    <Arg>/servlet-compat</Arg>
+    <Arg><SystemProperty name="wadi.home"/>/watchdog/servlet-compat</Arg>
+  </Call>
+-->
+
+<!--
+  <Set name="rootWebApp">root</Set>
+  <Call name="addWebApplications">
+    <Arg></Arg>
+    <Arg><SystemProperty name="wadi.home" default="."/>/webapps/</Arg>
+    <Arg><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Arg>
+    <Arg type="boolean">true</Arg>
+  </Call>
+-->
+
+  <Set name="RequestLog">
+    <New class="org.mortbay.http.NCSARequestLog">
+      <Arg><SystemProperty name="java.io.tmpdir" default="."/>/logs/yyyy_mm_dd.request.0.log</Arg>
+      <Set name="retainDays">90</Set>
+      <Set name="append">true</Set>
+      <Set name="extended">false</Set>
+      <Set name="buffered">false</Set>
+      <Set name="LogTimeZone">GMT</Set>
+    </New>
+  </Set>
+
+  <!-- When shutting down a Context, wait for the number of outstanding requests to drop to 0 -->
+  <Set name="StopGracefully">true</Set>
+
+</Configure>

Added: incubator/wadi/trunk/modules/assembly/src/conf/jetty6.xml
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/jetty6.xml?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/jetty6.xml (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/jetty6.xml Wed Dec 14 15:32:56 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+  <Set name="connectors">
+    <Array type="org.mortbay.jetty.Connector">
+
+      <!-- Use this connector for many frequently idle connections -->
+      <Item>
+	<New class="org.mortbay.jetty.nio.SelectChannelConnector">
+	  <Set name="port"><SystemProperty name="http.port" default="8080"/></Set>
+	  <Set name="maxIdleTime">15000</Set>
+	</New>
+      </Item>
+
+    </Array>
+  </Set>
+
+  <!-- =========================================================== -->
+  <!-- Set handlers                                                -->
+  <!-- =========================================================== -->
+  <Set name="handlers">
+    <Array type="org.mortbay.jetty.Handler">
+
+      <Item>
+	<New id="wadi" class="org.mortbay.jetty.webapp.WebAppContext">
+	  <Set name="contextPath">/wadi</Set>
+	  <Set name="war"><SystemProperty name="wadi.home"/>/webapps/wadi-webapp-<SystemProperty name="wadi.version"/>.war</Set>
+	  <Get name="SessionHandler">
+	    <Set name="SessionManager"><New class="org.codehaus.wadi.jetty6.JettyManager"/></Set>
+	  </Get>
+	</New>
+      </Item>
+
+      <Item>
+	<New  class="org.mortbay.jetty.handler.NotFoundHandler"/>
+      </Item>
+
+    </Array>
+  </Set>
+
+  <!-- ensure that shutdown hook is called on ctl C -->
+  <Set name="stopAtShutdown">true</Set>
+
+  <Call name="start"/>
+
+</Configure>

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.blue.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.blue.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.blue.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.blue.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8082
+ajp.port=8011
+jndi.port=1101
+STOP.PORT=8142
+node.name=blue

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.brown.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.brown.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.brown.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.brown.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8087
+ajp.port=8016
+jndi.port=1106
+STOP.PORT=8147
+node.name=brown

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.green.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.green.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.green.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.green.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8081
+ajp.port=8010
+jndi.port=1100
+STOP.PORT=8041
+node.name=green

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.orange.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.orange.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.orange.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.orange.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8085
+ajp.port=8014
+jndi.port=1104
+STOP.PORT=8145
+node.name=orange

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.pink.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.pink.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.pink.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.pink.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8084
+ajp.port=8013
+jndi.port=1103
+STOP.PORT=8144
+node.name=pink

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.purple.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.purple.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.purple.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.purple.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8086
+ajp.port=8015
+jndi.port=1105
+STOP.PORT=8146
+node.name=purple

Added: incubator/wadi/trunk/modules/assembly/src/conf/node.red.properties
URL: http://svn.apache.org/viewcvs/incubator/wadi/trunk/modules/assembly/src/conf/node.red.properties?rev=356933&view=auto
==============================================================================
--- incubator/wadi/trunk/modules/assembly/src/conf/node.red.properties (added)
+++ incubator/wadi/trunk/modules/assembly/src/conf/node.red.properties Wed Dec 14 15:32:56 2005
@@ -0,0 +1,5 @@
+http.port=8080
+ajp.port=8009
+jndi.port=1099
+STOP.PORT=8040
+node.name=red