You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2007/08/30 02:58:13 UTC

svn commit: r571005 - in /forrest/trunk/whiteboard/forrest2/forrest2-webapp: ./ src/docs/ src/main/ src/main/org/ src/main/org/apache/ src/main/org/apache/forrest/ src/main/org/apache/forrest/webapp/ src/webapp/ src/webapp/META-INF/ src/webapp/WEB-INF/

Author: rgardler
Date: Wed Aug 29 17:58:12 2007
New Revision: 571005

URL: http://svn.apache.org/viewvc?rev=571005&view=rev
Log:
make it work outside of Eclipse

Added:
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java   (with props)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF   (with props)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml   (with props)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml   (with props)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties   (with props)
Removed:
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml
Modified:
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/   (props changed)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.properties
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/docs/index.html

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 29 17:58:12 2007
@@ -0,0 +1,3 @@
+build
+dist
+lib

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.properties?rev=571005&r1=571004&r2=571005&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.properties (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.properties Wed Aug 29 17:58:12 2007
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-forrest.webapp=./build/
-forrest.maxmemory=128M
-forrest.jvmargs=
\ No newline at end of file
+content.object.dir=C:\\projects\\forrest\\whiteboard\\forrest2\\core\\src\\examples\\helloWorld
+
+serveltEngine.webapp.dir=C:\\Program Files\\Apache Software Foundation\\Tomcat 6.0\\webapps
+
+build.dir=build
+ivy.repository.dir=../core/tools/ivy
+ivy.distrib.dir = ${ivy.project.dir}/dist
\ No newline at end of file

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml?rev=571005&r1=571004&r2=571005&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml Wed Aug 29 17:58:12 2007
@@ -16,74 +16,24 @@
   limitations under the License.
 -->
 <project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="forrest2-webapp" default="run">
-  <property file="local.build.properties" />
-  <property name="project.name" value="forrest2" />
-  <property name="project.core.src.dir" location="src/core" />
-  <property name="project.core.test.src.dir" location="src/test" />
-  <property name="project.dist.dir" location="dist" />
-  <property name="project.build.classes.dir" location="build/classes" />
-  <property name="test.reports" location="build/reports" />
-  <property name="compile.debug" value="off" />
-  <property name="ivy.jar.dir" location="tools/ivy" />
-<!-- try to load ivy here from local tools/ivy dir, in case the user has not already dropped
-	      it into ant's lib dir (note that the latter copy will always take precedence).
-	      We will not fail as long as local lib dir exists (it may be empty) and
-	      ivy is in at least one of ant's lib dir or the local lib dir. -->
-  <path id="ivy.lib.path">
-    <fileset dir="${ivy.jar.dir}" includes="*.jar" />
-  </path>
-  <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
-  <target name="clean">
-    <delete dir="${project.build.classes.dir}" />
-    <delete dir="${project.dist.dir}" />
-  </target>
-  <target name="init" depends="clean">
-    <mkdir dir="${project.build.classes.dir}" />
-    <mkdir dir="${project.dist.dir}" />
-    <ivy:cachepath pathid="lib.path.id" conf="default" />
-  </target>
-  <target name="run" depends="init" description="* Run Jetty (instant live webapp)" >
-    <echo>
-	  Note: Use Ctrl-C to stop the Jetty server
-	    </echo>
-    <if>
-      <os family="dos" />
-      <then>
-        <echo>
-	         ... and reply 'n' and press [Enter] 
-	  	     when asked about aborting the batch!
-	      </echo>
-      </then>
-    </if>
-    <java classname="org.mortbay.jetty.Server" 
-			dir="${forrest.webapp}" 
-			fork="yes" 
-			maxmemory="${forrest.maxmemory}" 
-			failonerror="yes">
-      <classpath>
-        <path refid="lib.path.id" />
-      </classpath>
-      <jvmarg line="${forrest.jvmargs}" />
-      <arg value="${forrest.webapp}/jettyconf.xml" />
-    </java>
-  </target>
-<!-- ================================= 
-	          Ivy Targets           
-    ================================= -->
-  <target name="resolve">
-    <ivy:configure file="./ivyconf.xml" />
-    <ivy:resolve file="ivy.xml" conf="default" />
-  </target>
-  <target name="retrieve-default" depends="resolve">
-    <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
-  </target>
-  <target name="retrieve-test" depends="resolve">
-    <ivy:retrieve pattern="lib/test/[artifact]-[revision].[ext]" conf="test" />
-  </target>
-  <target name="retrieve-all" depends="resolve">
-    <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
-  </target>
-  <target name="deliver" depends="retrieve-all">
-    <ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]" pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
-  </target>
+     <property file="local.build.properties"/>
+     <property file="build.properties"/>
+           
+     <!-- try to load ivy here from local tools/ivy dir, in case the user has not already dropped
+   	      it into ant's lib dir (note that the latter copy will always take precedence).
+   	      We will not fail as long as local lib dir exists (it may be empty) and
+   	      ivy is in at least one of ant's lib dir or the local lib dir. -->
+     <path id="ivy.lib.path">
+       <fileset dir="${ivy.repository.dir}" includes="*.jar" />
+     </path>
+
+     <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
+       
+     <import file="${ivy.repository.dir}/build-scripts/common-webapp.xml"/>
+
+     <target name="post-deploy-webapp">
+        <copy todir="${serveltEngine.webapp.dir}/${ant.project.name}/WEB-INF/classes">
+            <fileset dir="${content.object.dir}/src" />
+        </copy>    
+     </target>
 </project>

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml?rev=571005&r1=571004&r2=571005&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml Wed Aug 29 17:58:12 2007
@@ -18,22 +18,14 @@
 <ivy-module version="1.0">
   <info 
         organisation="Apache"
-        module="forrest2"
+        module="forrest2-webapp"
         status="integration"></info>
   <configurations>
     <conf name="default"/>
     <conf name="test" extends="default"/>
   </configurations>
   <dependencies>
-    <dependency org="apache" name="commons-httpclient" rev="latest.milestone" />
-    <dependency org="apache" name="commons-codec" rev="1.3" />
-    <dependency org="apache" name="commons-logging" rev="latest.release"/>
-    <dependency org="apache" name="regexp" rev="latest.milestone" />
-    <dependency org="apache" name="xerces" rev="latest.release"/>
-    <dependency org="jtidy" name="jtidy" rev="4aug2000r7-dev"/>
-    <dependency org="junit" name="junit" rev="4.1"/>
-    <dependency org="springframework" name="springframework" rev="latest.release">
-      <conf name="core"/>
-    </dependency>
+    <dependency org="apache" name="forrest2" rev="latest.integration"/>
+    <dependency org="javax.servlet" name="servlet-api" rev="2.5" />
   </dependencies>
 </ivy-module>

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/docs/index.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/docs/index.html?rev=571005&r1=571004&r2=571005&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/docs/index.html (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/docs/index.html Wed Aug 29 17:58:12 2007
@@ -26,6 +26,8 @@
     
     <h2>Compile and Deploy Forrest2 Webapp</h2>
     <p>cd $FORREST2_HOME/forrest2-webapp</p>
+    <p>cp build.properties local.build.properties</p>
+    <p>edit local.build.properties for your local setup</p>
     <p>ant deploy-webapp</p>
     
     <p>NOTEL: There is currently a bug in the system that means you need to copy the 

Added: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java?rev=571005&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java (added)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java Wed Aug 29 17:58:12 2007
@@ -0,0 +1,136 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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.forrest.webapp;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.forrest.core.Controller;
+import org.apache.forrest.core.document.AbstractOutputDocument;
+import org.apache.forrest.core.exception.ProcessingException;
+import org.xml.sax.SAXException;
+
+public class ForrestController extends HttpServlet {
+	
+	static Controller controller;
+
+	/**
+	 * Constructor of the object.
+	 */
+	public ForrestController() {
+		super();
+		try {
+			controller = new Controller();
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Destruction of the servlet. <br>
+	 */
+	public void destroy() {
+		super.destroy();
+	}
+
+	/**
+	 * The doGet method of the servlet. <br>
+	 *
+	 * This method is called when a form has its tag value method equals to get.
+	 * 
+	 * @param request the request send by the client to the server
+	 * @param response the response send by the server to the client
+	 * @throws ServletException if an error occurred
+	 * @throws IOException if an error occurred
+	 */
+	public void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+
+		response.setContentType("text/html");
+		PrintWriter out = response.getWriter();
+		URI requestURI;
+		try {
+            String path = request.getServletPath();
+			requestURI = new URI(path);
+            AbstractOutputDocument doc;
+			try {
+				doc = controller.getOutputDocument(requestURI);
+			} catch (ProcessingException e) {
+				throw new ServletException(e);
+			}
+			out.println(doc.getContentAsString());
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		out.flush();
+		out.close();
+	}
+
+	/**
+	 * The doPost method of the servlet. <br>
+	 *
+	 * This method is called when a form has its tag value method equals to post.
+	 * 
+	 * @param request the request send by the client to the server
+	 * @param response the response send by the server to the client
+	 * @throws ServletException if an error occurred
+	 * @throws IOException if an error occurred
+	 */
+	public void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+
+		response.setContentType("text/html");
+		PrintWriter out = response.getWriter();
+		out
+				.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
+		out.println("<HTML>");
+		out.println("  <HEAD><TITLE>A Servlet</TITLE></HEAD>");
+		out.println("  <BODY>");
+		out.print("    This is ");
+		out.print(this.getClass());
+		out.println(", using the POST method");
+		out.println("  </BODY>");
+		out.println("</HTML>");
+		out.flush();
+		out.close();
+	}
+
+	/**
+	 * Initialization of the servlet. <br>
+	 *
+	 * @throws ServletException if an error occure
+	 */
+	public void init() throws ServletException {
+		// Put your code here
+	}
+
+}

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/main/org/apache/forrest/webapp/ForrestController.java
------------------------------------------------------------------------------
    svn:executable = *

Added: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF?rev=571005&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF (added)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF Wed Aug 29 17:58:12 2007
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:executable = *

Added: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml?rev=571005&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml (added)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml Wed Aug 29 17:58:12 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<web-app version="2.4" 
+	xmlns="http://java.sun.com/xml/ns/j2ee" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+  <servlet>
+    <description>
+      Provides a webapp interface to the Forrest publishing engine
+    </description>
+    <display-name>Forrest Webapp</display-name>
+    <servlet-name>ForrestController</servlet-name>
+    <servlet-class>org.apache.forrest.webapp.ForrestController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ForrestController</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml?rev=571005&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml (added)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml Wed Aug 29 17:58:12 2007
@@ -0,0 +1,106 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!-- =============================================================== -->
+<Configure class="org.mortbay.jetty.Server">
+<!-- =============================================================== -->
+<!-- Configure the Request Listeners                                 -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add and configure a HTTP listener to port 8888                  -->
+<!-- The default port can also be changed using:                     -->
+<!--     forrest run -Dforrest.jvmargs="-Djetty.port=80"             -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <Call name="addListener">
+    <Arg>
+      <New class="org.mortbay.http.SocketListener">
+        <Set name="Port">
+          <SystemProperty name="jetty.port" default="8888"/>
+        </Set>
+        <Set name="MinThreads">5</Set>
+        <Set name="MaxThreads">100</Set>
+        <Set name="MaxIdleTimeMs">30000</Set>
+        <Set name="LowResourcePersistTimeMs">5000</Set>
+      </New>
+    </Arg>
+  </Call>
+<!-- =============================================================== -->
+<!-- Configure the Contexts                                          -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add root context web applications.                              -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add a all web application within the webapps directory.         -->
+<!-- + No virtual host specified                                     -->
+<!-- + Look in the webapps directory relative to jetty.home or .     -->
+<!-- + Use the webdefault.xml resource for the defaults descriptor   -->
+<!-- + Upack the war file                                            -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <Call name="addWebApplication">
+    <Arg>/</Arg>
+    <Arg>
+<!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
+  </Call>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Build a context manually.                                  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- 
+  <Call name="addContext">
+    <Arg>/forrest/*</Arg>
+
+    <Call name="addHandler">
+      <Arg><New class="org.mortbay.http.handler.ProxyHandler"></New></Arg>
+    </Call>
+
+    <Call name="addHandler">
+      <Arg><New class="org.mortbay.http.handler.ContentEncodingHandler">
+           <Call name="addPathSpec"><Arg>/images/*</Arg></Call>
+           <Set name="minimumLength">512</Set>
+      </New></Arg> 
+    </Call>
+
+    <Call name="addHandler">
+      <Arg><New class="org.mortbay.http.handler.HTAccessHandler">
+	    <Set name="AccessFile">.htaccess</Set>
+      </New></Arg>
+    </Call>
+
+    <Call name="addServlet">
+      <Arg>Invoker</Arg>
+      <Arg>/*</Arg>
+      <Arg>org.mortbay.jetty.servlet.Invoker</Arg>
+      <Put name="InitParam">Value</Put>      
+    </Call>
+
+    <Set name="ResourceBase"><SystemProperty name="jetty.home" default="."/>/demo/docroot/</Set>
+    
+    <Call name="addHandler">
+      <Arg><New class="org.mortbay.http.handler.ResourceHandler"/></Arg>
+    </Call>
+
+    <Call name="addHandler">
+      <Arg><New class="org.mortbay.http.handler.DumpHandler"/></Arg>
+    </Call>
+
+    <Set name="ClassPath"><SystemProperty name="jetty.home" default="."/>/demo/servlets/</Set>
+  </Call>
+  -->
+</Configure>

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/webapp/jettyconf.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties?rev=571005&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties (added)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties Wed Aug 29 17:58:12 2007
@@ -0,0 +1 @@
+version=1
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/version.properties
------------------------------------------------------------------------------
    svn:eol-style = native