You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/08/02 22:19:47 UTC
svn commit: r227076 - in /cocoon/branches/BRANCH_2_1_X: status.xml
tools/jetty/conf/main.xml
Author: bdelacretaz
Date: Tue Aug 2 13:19:39 2005
New Revision: 227076
URL: http://svn.apache.org/viewcvs?rev=227076&view=rev
Log:
make Jetty webapp context configurable via system property, see http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=111815204530692&w=2
Modified:
cocoon/branches/BRANCH_2_1_X/status.xml
cocoon/branches/BRANCH_2_1_X/tools/jetty/conf/main.xml
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=227076&r1=227075&r2=227076&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Aug 2 13:19:39 2005
@@ -196,6 +196,11 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="BD" type="update">
+ Webapp context is now configurable when starting with the included Jetty webserver. Setting
+ JAVA_OPTIONS=-Dcontext=blah/, for example will make the Cocoon webapp available at
+ /blah/ instead of / which stays the default.
+ </action>
<action dev="SW" type="update">
Update Rhino+continuations so that JavaScriptException has the same API as the official 1.6 version. This
is allows to access location and nested exceptions for Cocoon stacktraces.
Modified: cocoon/branches/BRANCH_2_1_X/tools/jetty/conf/main.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/jetty/conf/main.xml?rev=227076&r1=227075&r2=227076&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/jetty/conf/main.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/jetty/conf/main.xml Tue Aug 2 13:19:39 2005
@@ -44,7 +44,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Call name="addWebApplication">
- <Arg>/</Arg>
+ <Arg><SystemProperty name="context" default="/"/></Arg>
<Arg><SystemProperty name="webapp" default="."/></Arg>
<Set name="defaultsDescriptor"><SystemProperty name="home" default="."/>/tools/jetty/conf/webdefaults.xml</Set>
</Call>