svn commit: rev 35611 - in avalon/trunk/planet/facilities/http: blocks blocks/simple blocks/simple/src blocks/simple/src/etc impl/src/main/org/apache/avalon/http/impl

Author: niclas
Date: Mon Aug  2 19:31:49 2004
New Revision: 35611

Added:
   avalon/trunk/planet/facilities/http/blocks/simple/
   avalon/trunk/planet/facilities/http/blocks/simple/src/
   avalon/trunk/planet/facilities/http/blocks/simple/src/etc/
   avalon/trunk/planet/facilities/http/blocks/simple/src/etc/static-server.block   (contents, props changed)
Modified:
   avalon/trunk/planet/facilities/http/blocks/index.xml
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ResourceHandler.java
Log:
The most simple Jetty server.

Modified: avalon/trunk/planet/facilities/http/blocks/index.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/index.xml	(original)
+++ avalon/trunk/planet/facilities/http/blocks/index.xml	Mon Aug  2 19:31:49 2004
@@ -41,6 +41,9 @@
     </info>
     <dependencies>
       <include key="avalon-framework-api" runtime="false"/>
+      <include key="avalon-http-api" />
+      <include key="avalon-http-impl" />
+      <include key="servletapi" />
     </dependencies>
   </project>
 

Added: avalon/trunk/planet/facilities/http/blocks/simple/src/etc/static-server.block
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/blocks/simple/src/etc/static-server.block	Mon Aug  2 19:31:49 2004
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<container name="static-server">
+
+  <classloader>
+    <classpath>
+      <artifact>jar:avalon/http/avalon-http-api#SNAPSHOT</artifact>
+      <artifact>jar:jetty/org.mortbay.jetty#SNAPSHOT</artifact>
+      <artifact>jar:avalon/http/avalon-http-impl#SNAPSHOT</artifact>
+      <artifact>jar:avalon/http/avalon-http-spi#SNAPSHOT</artifact>
+      <artifact>jar:avalon/http/avalon-http-util#SNAPSHOT</artifact>
+      <artifact>jar:avalon/util/avalon-util-configuration#1.0.0</artifact>
+      <artifact>jar:avalon/framework/avalon-framework-api#SNAPSHOT</artifact>
+      <artifact>jar:avalon/framework/avalon-framework-impl#SNAPSHOT</artifact>
+      <artifact>jar:avalon/framework/avalon-framework-legacy#SNAPSHOT</artifact>
+      <artifact>jar:avalon/logkit/avalon-logkit#SNAPSHOT</artifact>
+      <artifact>jar:jetty/org.mortbay.jaas#5.0.RC0</artifact>
+      <artifact>jar:commons-logging/commons-logging#1.0</artifact>
+      <artifact>jar:servletapi/servletapi#2.3</artifact>
+      <artifact>jar:avalon/http/avalon-http-context#SNAPSHOT</artifact>
+    </classpath>
+  </classloader>
+
+  <component name="socketlistener" class="org.apache.avalon.http.impl.SocketListener" />
+    <!-- Defaults 
+    <parameters>
+      <parameter name="port" value="8080" />
+      <parameter name="hostname" value="0.0.0.0" />
+    </parameters>
+    -->
+  </component>
+
+  <component name="httpserver" class="org.apache.avalon.http.impl.HttpServerImpl"/>
+  
+  <component name="context" class="org.apache.avalon.http.impl.HttpContextImpl">
+    <parameters>
+      <parameter name="context-path" value="/static" />
+      <parameter name="resource-base" value="htdocs/" />
+    </parameters>
+  </context>
+
+  <component name="resource-handler" class="org.apache.avalon.http.impl.ResourceHandler">
+    <parameters>
+      <parameter name="allow-directory" value="true"/>
+      <parameter name="allow-methods" value="GET"/>
+    </parameters>
+  </component>
+
+  <component name="notfound-handler" class="org.apache.avalon.http.impl.NotFoundHandler"/>
+
+  <component name="request-log" class="org.apache.avalon.http.impl.NcsaRequestLog">
+    <parameters>
+      <parameter name="filename" value="logs/request.log"/>
+      <parameter name="append" value="true"/>
+      <parameter name="extended" value="true"/>
+    </parameters>
+  </component>
+
+</container>

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ResourceHandler.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ResourceHandler.java	(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ResourceHandler.java	Mon Aug  2 19:31:49 2004
@@ -102,7 +102,7 @@
         setDirAllowed( dirAllowed );
 
         boolean redirectWelcome = params.getParameterAsBoolean( "redirect-welcome", false );
-        setDirAllowed( redirectWelcome );
+        setRedirectWelcome( redirectWelcome );
 
         int minGzip = params.getParameterAsInteger( "min-gzip-length", -1 );        
         if( minGzip > 0 )