Author: niclas
Date: Tue Aug 3 00:45:57 2004
New Revision: 35624
Added:
avalon/trunk/planet/facilities/http/blocks/static/
avalon/trunk/planet/facilities/http/blocks/static/build.properties (contents,
props changed)
avalon/trunk/planet/facilities/http/blocks/static/build.xml (contents, props
changed)
avalon/trunk/planet/facilities/http/blocks/static/etc/
avalon/trunk/planet/facilities/http/blocks/static/etc/config.xml (contents, props
changed)
Modified:
avalon/trunk/planet/facilities/http/blocks/demo/README.TXT
avalon/trunk/planet/facilities/http/blocks/demo/build.xml
avalon/trunk/planet/facilities/http/blocks/demo/etc/config.xml
avalon/trunk/planet/facilities/http/blocks/index.xml
Log:
Adding more variants.
Modified: avalon/trunk/planet/facilities/http/blocks/demo/README.TXT
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/demo/README.TXT (original)
+++ avalon/trunk/planet/facilities/http/blocks/demo/README.TXT Tue Aug 3 00:45:57
2004
@@ -2,10 +2,10 @@
To test the server:
$ ant
-$ merlin target\deliverables\blocks\avalon-http-demo-SNAPSHOT.block
+$ merlin target\deliverables\blocks\avalon-http-demo-SNAPSHOT.block -config
etc\config.xml
or
-$ merlin artifact:block:avalon/http/avalon-http-demo#SNAPSHOT
+$ merlin artifact:block:avalon/http/avalon-http-demo#SNAPSHOT -config etc\config.xml
Modified: avalon/trunk/planet/facilities/http/blocks/demo/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/demo/build.xml (original)
+++ avalon/trunk/planet/facilities/http/blocks/demo/build.xml Tue Aug 3 00:45:57
2004
@@ -9,21 +9,7 @@
<target name="build" depends="standard.build">
<x:block name="demo">
<x:include name="server"
artifact="block:avalon/http/avalon-http-server#SNAPSHOT"/>
- <x:component name="context"
class="org.apache.avalon.http.impl.HttpContextImpl"/>
- <x:component name="resource-handler"
class="org.apache.avalon.http.impl.ResourceHandler">
- <x:parameters>
- <x:parameter name="allow-directory" value="true"/>
- <x:parameter name="allow-methods" value="GET"/>
- </x:parameters>
- </x:component>
- <x:component name="notfound-handler"
class="org.apache.avalon.http.impl.NotFoundHandler"/>
- <x:component name="request-log"
class="org.apache.avalon.http.impl.NcsaRequestLog">
- <x:parameters>
- <x:parameter name="filename" value="request.log"/>
- <x:parameter name="append" value="true"/>
- <x:parameter name="extended" value="true"/>
- </x:parameters>
- </x:component>
+ <x:include name="static-context"
artifact="block:avalon/http/avalon-http-static#SNAPSHOT"/>
</x:block>
</target>
Modified: avalon/trunk/planet/facilities/http/blocks/demo/etc/config.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/demo/etc/config.xml (original)
+++ avalon/trunk/planet/facilities/http/blocks/demo/etc/config.xml Tue Aug 3
00:45:57 2004
@@ -2,10 +2,10 @@
<targets>
- <target path="/demo/context">
+ <target path="/demo/static-context/context">
<configuration>
<context-path>/static</context-path>
- <resource-base>/abc</resource-base>
+ <resource-base>.</resource-base>
</configuration>
</target>
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 Tue Aug 3 00:45:57
2004
@@ -123,5 +123,19 @@
</dependencies>
</project>
+ <project basedir="static">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-static</name>
+ <type>block</type>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-http-impl" />
+ <include key="servletapi" />
+ </dependencies>
+ </project>
+
</index>
Added: avalon/trunk/planet/facilities/http/blocks/static/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/blocks/static/build.properties Tue Aug 3
00:45:57 2004
@@ -0,0 +1,2 @@
+project.system = ../../../../../central/system
+project.home = ..
Added: avalon/trunk/planet/facilities/http/blocks/static/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/blocks/static/build.xml Tue Aug 3 00:45:57
2004
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-static" default="install" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+ <target name="build" depends="standard.build">
+ <x:block name="static">
+ <x:component name="context"
class="org.apache.avalon.http.impl.HttpContextImpl"/>
+ <x:component name="security-handler"
class="org.apache.avalon.http.impl.SecurityHandler"/>
+ <x:component name="resource-handler"
class="org.apache.avalon.http.impl.ResourceHandler">
+ <x:parameters>
+ <x:parameter name="allow-directory" value="true"/>
+ <x:parameter name="allow-methods" value="GET"/>
+ </x:parameters>
+ </x:component>
+ <x:component name="notfound-handler"
class="org.apache.avalon.http.impl.NotFoundHandler"/>
+ <x:component name="request-log"
class="org.apache.avalon.http.impl.NcsaRequestLog">
+ <x:parameters>
+ <x:parameter name="filename" value="static_request.log"/>
+ <x:parameter name="append" value="true"/>
+ <x:parameter name="extended" value="true"/>
+ </x:parameters>
+ </x:component>
+ </x:block>
+ </target>
+
+</project>
Added: avalon/trunk/planet/facilities/http/blocks/static/etc/config.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/blocks/static/etc/config.xml Tue Aug 3
00:45:57 2004
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<targets>
+
+ <target path="/demo/context">
+ <configuration>
+ <context-path>/static</context-path>
+ <resource-base>.</resource-base>
+ </configuration>
+ </target>
+
+</targets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
