You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2005/11/19 07:42:10 UTC
svn commit: r345639 - in /lenya/trunk: ./ src/targets/ tools/jetty/conf/
tools/jetty/ext/ tools/jetty/extra/ tools/jetty/extra/ext/
tools/jetty/extra/lib/ tools/jetty/extra/resources/ tools/jetty/lib/
tools/loader/
Author: chestnut
Date: Fri Nov 18 22:41:12 2005
New Revision: 345639
URL: http://svn.apache.org/viewcvs?rev=345639&view=rev
Log:
Update Jetty to version 5.1.4
Thanks to a patch by Felix Röthenbacher
Added:
lenya/trunk/tools/jetty/conf/jaas.policy
lenya/trunk/tools/jetty/ext/
lenya/trunk/tools/jetty/ext/commons-logging.jar (with props)
lenya/trunk/tools/jetty/extra/
lenya/trunk/tools/jetty/extra/ext/
lenya/trunk/tools/jetty/extra/ext/activation.jar (with props)
lenya/trunk/tools/jetty/extra/ext/carol.jar (with props)
lenya/trunk/tools/jetty/extra/ext/commons-cli-1.0.jar (with props)
lenya/trunk/tools/jetty/extra/ext/connector-1_5.jar (with props)
lenya/trunk/tools/jetty/extra/ext/howl.jar (with props)
lenya/trunk/tools/jetty/extra/ext/javax77.jar (with props)
lenya/trunk/tools/jetty/extra/ext/jotm.jar (with props)
lenya/trunk/tools/jetty/extra/ext/jotm_iiop_stubs.jar (with props)
lenya/trunk/tools/jetty/extra/ext/jotm_jrmp_stubs.jar (with props)
lenya/trunk/tools/jetty/extra/ext/jta-spec1_0_1.jar (with props)
lenya/trunk/tools/jetty/extra/ext/jts1_0.jar (with props)
lenya/trunk/tools/jetty/extra/ext/log4j.jar (with props)
lenya/trunk/tools/jetty/extra/ext/mail.jar (with props)
lenya/trunk/tools/jetty/extra/ext/xapool.jar (with props)
lenya/trunk/tools/jetty/extra/lib/
lenya/trunk/tools/jetty/extra/lib/org.mortbay.jaas-5.1.4.jar (with props)
lenya/trunk/tools/jetty/extra/lib/org.mortbay.jetty.plus-5.1.4.jar (with props)
lenya/trunk/tools/jetty/extra/resources/
lenya/trunk/tools/jetty/extra/resources/carol.properties (with props)
lenya/trunk/tools/jetty/extra/resources/jndi.properties (with props)
lenya/trunk/tools/jetty/extra/resources/log4j.properties (with props)
Removed:
lenya/trunk/tools/jetty/lib/jetty-4.2.23.jar
lenya/trunk/tools/jetty/lib/servlet-2.3.jar
Modified:
lenya/trunk/lenya.bat
lenya/trunk/lenya.sh
lenya/trunk/src/targets/docs-build.xml
lenya/trunk/src/targets/export-build.xml
lenya/trunk/src/targets/properties-build.xml
lenya/trunk/src/targets/test-build.xml
lenya/trunk/tools/jetty/conf/main.xml
lenya/trunk/tools/loader/Loader$RepositoryClassLoader.class
lenya/trunk/tools/loader/Loader.class
Modified: lenya/trunk/lenya.bat
URL: http://svn.apache.org/viewcvs/lenya/trunk/lenya.bat?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/lenya.bat (original)
+++ lenya/trunk/lenya.bat Fri Nov 18 22:41:12 2005
@@ -132,25 +132,25 @@
:: ----- Servlet ---------------------------------------------------------------
:doServlet
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%LENYA_HOME% -Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib,%LENYA_LIB%\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%LENYA_HOME% "-Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib;%LENYA_HOME%\tools\jetty\extra\lib;%LENYA_HOME%\tools\jetty\extra\ext;%LENYA_HOME%\tools\jetty\ext;%LENYA_HOME%\tools\jetty\extra\resources;%LENYA_LIB%\endorsed" -Dloader.main.class=org.mortbay.jetty.plus.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
goto end
:: ----- Servlet with Administration Web Interface -----------------------------
:doAdmin
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%LENYA_HOME% -Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib,%LENYA_LIB%\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml %LENYA_HOME%\tools\jetty\conf\admin.xml
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%LENYA_HOME% "-Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib;%LENYA_HOME%\tools\jetty\extra\lib;%LENYA_HOME%\tools\jetty\extra\ext;%LENYA_HOME%\tools\jetty\ext;%LENYA_HOME%\tools\jetty\extra\resources;%LENYA_LIB%\endorsed" -Dloader.main.class=org.mortbay.jetty.plus.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml %LENYA_HOME%\tools\jetty\conf\admin.xml
goto end
:: ----- Servlet Debug ---------------------------------------------------------
:doDebug
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%LENYA_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib,%LENYA_LIB%\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%LENYA_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib;%LENYA_HOME%\tools\jetty\extra\lib;%LENYA_HOME%\tools\jetty\extra\ext;%LENYA_HOME%\tools\jetty\ext;%LENYA_HOME%\tools\jetty\extra\resources;%LENYA_LIB%\endorsed" -Dloader.main.class=org.mortbay.jetty.plus.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
goto end
:: ----- Servlet Profile ---------------------------------------------------------
:doProfile
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xrunhprof:heap=all,cpu=samples,thread=y,depth=3 -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%LENYA_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib,%LENYA_LIB%\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xrunhprof:heap=all,cpu=samples,thread=y,depth=3 -classpath %CP% -Djava.endorsed.dirs=%LENYA_LIB%\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%LENYA_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%LENYA_HOME%\tools\jetty\lib;%LENYA_HOME%\tools\jetty\extra\lib;%LENYA_HOME%\tools\jetty\extra\ext;%LENYA_HOME%\tools\jetty\ext;%LENYA_HOME%\tools\jetty\extra\resources;%LENYA_LIB%\endorsed" -Dloader.main.class=org.mortbay.jetty.plus.Server Loader %LENYA_HOME%\tools\jetty\conf\main.xml
:: ----- End -------------------------------------------------------------------
Modified: lenya/trunk/lenya.sh
URL: http://svn.apache.org/viewcvs/lenya/trunk/lenya.sh?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/lenya.sh (original)
+++ lenya/trunk/lenya.sh Fri Nov 18 22:41:12 2005
@@ -136,7 +136,7 @@
CLI=-Dloader.main.class=org.apache.lenya.Main
CLI_LIBRARIES="-Dloader.jar.repositories=$LENYA_LIB"
-JETTY=-Dloader.main.class=org.mortbay.jetty.Server
+JETTY=-Dloader.main.class=org.mortbay.jetty.plus.Server
JETTY_CONF="$LENYA_HOME/tools/jetty/conf"
JETTY_MAIN="$JETTY_CONF/main.xml"
JETTY_ADMIN="$JETTY_CONF/admin.xml"
@@ -144,7 +144,7 @@
JETTY_HOME="-Dhome=$LENYA_HOME"
JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT"
JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
-JETTY_LIBRARIES="-Dloader.jar.repositories=$LENYA_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}"
+JETTY_LIBRARIES="-Dloader.jar.repositories=$LENYA_HOME/tools/jetty/lib${PATHSEP}$LENYA_HOME/tools/jetty/extra/lib${PATHSEP}$LENYA_HOME/tools/jetty/extra/ext${PATHSEP}$LENYA_HOME/tools/jetty/ext${PATHSEP}$LENYA_HOME/tools/jetty/extra/resources${PATHSEP}${ENDORSED_LIBS}"
# ----- Do the action ----------------------------------------------------------
Modified: lenya/trunk/src/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/docs-build.xml?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/src/targets/docs-build.xml (original)
+++ lenya/trunk/src/targets/docs-build.xml Fri Nov 18 22:41:12 2005
@@ -69,7 +69,7 @@
<include name="*.jar"/>
</fileset>
<fileset dir="tools/jetty/lib">
- <include name="servlet-2.3.jar"/>
+ <include name="servlet-*.jar"/>
</fileset>
<fileset dir="tools/lib">
<include name="*.jar"/>
@@ -77,4 +77,4 @@
</classpath>
</javadoc>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: lenya/trunk/src/targets/export-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/export-build.xml?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/src/targets/export-build.xml (original)
+++ lenya/trunk/src/targets/export-build.xml Fri Nov 18 22:41:12 2005
@@ -47,7 +47,7 @@
<pathelement location="${build.webapp}/WEB-INF/classes"/>
<fileset dir="${build.webapp}/WEB-INF/lib" includes="*.jar"/>
<fileset dir="tools/jetty/lib">
- <include name="servlet-2.3.jar"/>
+ <include name="servlet-*.jar"/>
</fileset>
</classpath>
@@ -67,4 +67,4 @@
</java>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Fri Nov 18 22:41:12 2005
@@ -121,7 +121,7 @@
<include name="*.jar"/>
</fileset>
<fileset dir="tools/jetty/lib">
- <include name="servlet-2.3.jar"/>
+ <include name="servlet-*.jar"/>
</fileset>
</path>
Modified: lenya/trunk/src/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/test-build.xml?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/src/targets/test-build.xml (original)
+++ lenya/trunk/src/targets/test-build.xml Fri Nov 18 22:41:12 2005
@@ -242,9 +242,9 @@
<include name="*.jar"/>
</fileset>
<fileset dir="tools/jetty/lib">
- <include name="servlet-2.3.jar"/>
+ <include name="servlet-*.jar"/>
</fileset>
</classpath>
</java>
</target>
-</project>
\ No newline at end of file
+</project>
Added: lenya/trunk/tools/jetty/conf/jaas.policy
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/conf/jaas.policy?rev=345639&view=auto
==============================================================================
--- lenya/trunk/tools/jetty/conf/jaas.policy (added)
+++ lenya/trunk/tools/jetty/conf/jaas.policy Fri Nov 18 22:41:12 2005
@@ -0,0 +1,83 @@
+// Example permissions for JAAS demo
+//
+// For JSPs, you may need to set:
+// + read,write,delete FilePermission for the scratchDir setting for JASPER
+//
+// If you have set the "javax.servlet.context.tempdir" attribute of the webapp
+// context, you will need to add read,write,delete FilePermissions for this directory.
+//
+// To run the JAAS demo, cd $jetty.home/extra/plus and type ant run.jaas.demo
+
+
+grant
+{
+ permission java.util.PropertyPermission "*", "read";
+ permission java.io.FilePermission "${install.dir}/../..", "read";
+ permission java.io.FilePermission "${install.dir}/../../etc", "read";
+ permission java.io.FilePermission "${install.dir}/../../etc/-", "read";
+ permission java.io.FilePermission "${install.dir}/../../lib/-", "read";
+ permission java.io.FilePermission "${install.dir}/../../ext/-", "read";
+ permission java.io.FilePermission "${install.dir}/../../ext", "read";
+ permission java.io.FilePermission "${install.dir}/../../-", "read";
+ permission java.io.FilePermission "/usr/share/java/-", "read";
+ permission java.io.FilePermission "${jdk.home}${/}lib${/}-", "read";
+ permission java.io.FilePermission "${jdk.home}${/}jre${/}lib${/}-", "read";
+ permission java.io.FilePermission "${java.io.tmpdir}", "read,write,delete";
+ permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";
+ permission java.io.FilePermission "${jetty.home}/logs/log4j.log", "write";
+ permission java.io.FilePermission "${jetty.home}${/}work${/}*", "read,write,execute";
+ permission java.security.SecurityPermission "getPolicy";
+ permission javax.security.auth.AuthPermission "doAsPrivileged";
+};
+
+
+grant codeBase "file:${jetty.home}/lib/-"
+{
+ permission java.net.SocketPermission "localhost:1-65536", "connect,accept,listen,resolve";
+ permission java.net.SocketPermission "0.0.0.0:1-65536", "connect,accept,listen,resolve";
+ permission java.net.SocketPermission "127.0.0.1:1-65536", "connect,accept,resolve";
+ permission java.util.PropertyPermission "*", "read, write";
+ permission java.io.FilePermission "${jetty.home}${/}-", "read";
+ permission java.io.FilePermission "${jetty.home}${/}logs${/}*", "read,write,delete";
+ permission java.io.FilePermission "${jetty.home}${/}cgi-bin${/}-", "read,execute";
+ permission java.io.FilePermission "${java.io.tmpdir}/-", "read,write,delete";
+ permission java.security.SecurityPermission "putProviderProperty.SunJSSE";
+ permission java.security.SecurityPermission "insertProvider.SunJSSE";
+ permission javax.security.auth.AuthPermission "createLoginContext.jdbc";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.lang.RuntimePermission "accessDeclaredMembers";
+ permission java.lang.RuntimePermission "shutdownHooks";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.*";
+ permission java.lang.RuntimePermission "setIO";
+};
+
+grant codeBase "file:${jetty.home}/ext/-"
+{
+ permission java.lang.RuntimePermission "setIO";
+ permission java.io.FilePermission "/tmp/*", "read,write,delete";
+ permission java.io.FilePermission "/tmp/-", "read,write,delete";
+};
+
+grant codeBase "file:${jetty.home}/extra/lib/org.mortbay.jaas.jar"
+{
+ permission javax.security.auth.AuthPermission "createLoginContext.jdbc";
+ permission javax.security.auth.AuthPermission "modifyPrincipals";
+ permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
+};
+
+
+// Permissions specific to a particular web application
+grant codeBase "file:${install.dir}/demo/webapps/jaas$/WEB-INF/classes/-"
+{
+ permission java.io.FilePermission "${install.dir}${/}demo${/}webapps${/}jaas${/}-", "read";
+ permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";
+ permission java.security.SecurityPermission "getPolicy";
+};
+
+// for test
+grant Principal org.mortbay.jaas.JAASPrincipal "me" {
+ permission java.security.SecurityPermission "mySecurityPermission";
+};
+
Modified: lenya/trunk/tools/jetty/conf/main.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/conf/main.xml?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
--- lenya/trunk/tools/jetty/conf/main.xml (original)
+++ lenya/trunk/tools/jetty/conf/main.xml Fri Nov 18 22:41:12 2005
@@ -1,25 +1,73 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
+
+
<!-- =============================================================== -->
-<!-- Configure the Jetty Server -->
+<!-- Configure the JettyPlus Server -->
<!-- =============================================================== -->
+<Configure class="org.mortbay.jetty.plus.Server">
+
+ <!-- =============================================================== -->
+ <!-- Configure Logging -->
+ <!-- =============================================================== -->
+
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Configure Jetty Logging. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Uncomment if using jetty logging.
+ <Call class="org.apache.commons.logging.LogFactory" name="getFactory">
+ <Call name="getInstance">
+ <Arg/>
+ <Call name="reset"/>
+ <Call name="add">
+ <Arg>
+ <New class="org.mortbay.log.OutputStreamLogSink">
+ <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.jetty.log</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="logLabels">true</Set>
+ <Set name="logStackSize">true</Set>
+ <Set name="logStackTrace">false</Set>
+ <Set name="logOneLine">false</Set>
+ <Set name="suppressStack">false</Set>
+ <Set name="logTimeZone">GMT</Set>
+ </New>
+ </Arg>
+ </Call>
+ </Call>
+ </Call>
+ -->
-<Configure class="org.mortbay.jetty.Server">
+ <!-- =============================================================== -->
+ <!-- Configure context specific log4j logging -->
+ <!-- =============================================================== -->
+ <!-- Uncomment to enable per-context logging. You will also need to -->
+ <!-- create and register a ServletContextListener that will clean -->
+ <!-- the repository when the context is stopped, by calling this line-->
+ <!-- in the contextDestroyed() method: -->
+ <!-- org.mortbay.log4j.CRS.remove(Thread.currentThread().getContextClassLoader()) -->
+ <!--
+ <Call class="org.apache.log4j.LogManager" name="setRepositorySelector">
+ <Arg><New class="org.mortbay.log4j.CRS"/></Arg>
+ <Arg><New class="java.lang.Object"/></Arg>
+ </Call>
+ -->
<!-- =============================================================== -->
<!-- Configure the Request Listeners -->
<!-- =============================================================== -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add and configure a HTTP listener to port 8888 -->
+ <!-- Add and configure a HTTP listener to port 8888 -->
<!-- The default port can be changed using: java -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="MinThreads">10</Set>
<Set name="MaxThreads">100</Set>
<Set name="MaxIdleTimeMs">30000</Set>
<Set name="LowResourcePersistTimeMs">5000</Set>
@@ -27,26 +75,93 @@
</Arg>
</Call>
+
+ <!-- =============================================================== -->
+ <!-- Set the default web application configuration mechanisms: -->
+ <!-- XMLConfiguration - handles WEB-INF/web.xml -->
+ <!-- JettyWebConfiguration - handles WEB-INF/jetty-web.xml -->
+ <!-- jsr77.Configuration - Adds jsr77 statistics to servlets -->
+ <!-- -->
+ <!-- Order of these classes is significant. The defaults set here -->
+ <!-- can be overridden by calling setConfigurationClassNames() on -->
+ <!-- the webapp context. -->
+ <!-- The TagLibconfiguration scans any tld files found for -->
+ <!-- additional j2ee listener classes - needed for JSF -->
+ <!-- The jsr77 configuration requires additional jars on the -->
+ <!-- on the classpath and it needs jmx enabled. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="WebApplicationConfigurationClassNames">
+ <Array type="java.lang.String">
+ <Item>org.mortbay.jetty.servlet.XMLConfiguration</Item>
+ <Item>org.mortbay.jetty.servlet.JettyWebConfiguration</Item>
+ <Item>org.mortbay.jetty.servlet.TagLibConfiguration</Item>
+ <!--
+ <Item>org.mortbay.jetty.servlet.jsr77.Configuration</Item>
+ -->
+ </Array>
+ </Set>
+
+
<!-- =============================================================== -->
<!-- Configure the Contexts -->
<!-- =============================================================== -->
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add root context web applications. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
+ <!-- Uncomment to configure a list of configurations to be applied -->
+ <!-- to each webapp context. -->
+ <!-- Note that order is significant. This can be changed per webapp -->
+ <!-- by calling setConfigurationClassNames() on the webapp context. -->
+ <!-- -->
+ <!-- The jsr77 configuration is optional - if specified, jsr77 -->
+ <!-- statistics will be enabled. You will also need to build the -->
+ <!-- extra/jsr77 package, include the jsr77 jars and start Jetty with -->
+ <!-- jmx enabled. To make this easier, the JettyPlus start config -->
+ <!-- file sets up the classpath correctly, so make sure you use -->
+ <!-- -DSTART=extra/etc/start-plus.config and see the JettyPlus -->
+ <!-- README.TXT file for instructions on how to run with JMX enabled. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!--
+ <Set name="WebApplicationConfigurationClassNames">
+ <Array type="java.lang.String">
+ <Item>org.mortbay.jetty.plus.PlusWebAppContext$Configuration</Item>
+ <Item>org.mortbay.jetty.servlet.JettyWebConfiguration</Item>
+ <Item>org.mortbay.jetty.servlet.jsr77.Configuration</Item>
+ </Array>
+ </Set>
+ -->
+
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- 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 -->
+ <!-- Add and configure a specific web application -->
+ <!-- + Set Unpack WAR files -->
+ <!-- + Set Default Descriptor. Resource, file or URL -->
+ <!-- + Set Virtual Hosts. A Null host or empty array means all hosts -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
<Call name="addWebApplication">
<Arg>/</Arg>
<Arg><SystemProperty name="webapp" default="."/></Arg>
<Set name="defaultsDescriptor"><SystemProperty name="home" default="."/>/tools/jetty/conf/webdefaults.xml</Set>
</Call>
+
+ <!-- =============================================================== -->
+ <!-- Configure the Request Log -->
+ <!-- =============================================================== -->
+ <Set name="RequestLog">
+ <New class="org.mortbay.http.NCSARequestLog">
+ <Arg><SystemProperty name="webapp" default="."/>/WEB-INF/logs/yyyy_mm_dd.request.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>
+
+ <!-- =============================================================== -->
+ <!-- Configure the Other Server Options -->
+ <!-- =============================================================== -->
+ <Set name="requestsPerGC">2000</Set>
+ <Set name="statsOn">false</Set>
</Configure>
Added: lenya/trunk/tools/jetty/ext/commons-logging.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/ext/commons-logging.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/ext/commons-logging.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/activation.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/activation.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/activation.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/carol.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/carol.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/carol.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/commons-cli-1.0.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/commons-cli-1.0.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/commons-cli-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/connector-1_5.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/connector-1_5.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/connector-1_5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/howl.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/howl.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/howl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/javax77.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/javax77.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/javax77.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/jotm.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/jotm.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/jotm.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/jotm_iiop_stubs.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/jotm_iiop_stubs.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/jotm_iiop_stubs.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/jotm_jrmp_stubs.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/jotm_jrmp_stubs.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/jotm_jrmp_stubs.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/jta-spec1_0_1.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/jta-spec1_0_1.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/jta-spec1_0_1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/jts1_0.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/jts1_0.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/jts1_0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/log4j.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/log4j.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/log4j.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/mail.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/mail.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/mail.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/ext/xapool.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/ext/xapool.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/ext/xapool.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/lib/org.mortbay.jaas-5.1.4.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/lib/org.mortbay.jaas-5.1.4.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/lib/org.mortbay.jaas-5.1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/lib/org.mortbay.jetty.plus-5.1.4.jar
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/lib/org.mortbay.jetty.plus-5.1.4.jar?rev=345639&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/jetty/extra/lib/org.mortbay.jetty.plus-5.1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/jetty/extra/resources/carol.properties
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/resources/carol.properties?rev=345639&view=auto
==============================================================================
--- lenya/trunk/tools/jetty/extra/resources/carol.properties (added)
+++ lenya/trunk/tools/jetty/extra/resources/carol.properties Fri Nov 18 22:41:12 2005
@@ -0,0 +1,98 @@
+# Copyright (C) 2002 - INRIA (www.inria.fr)
+# Copyright (C) 2002 - INRIA (www.inria.fr)
+#
+# CAROL: Common Architecture for RMI ObjectWeb Layer
+#
+# This library is developed inside the ObjectWeb Consortium,
+# http://www.objectweb.org
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+#
+# author Guillaume Riviere (Guillaume.Riviere@inrialpes.fr)
+#
+# $Id: carol.properties,v 1.5 2005/03/21 14:46:07 janb Exp $
+#
+#carol.rmi.activated=lmi
+
+carol.protocols=lmi
+#carol.protocols=jrmp
+carol.start.ns=false
+carol.start.jndi=false
+carol.start.rmi=false
+
+# Interceptors for Transactions configuration
+# for iiop
+#carol.jvm.org.omg.PortableInterceptor.ORBInitializerClass.org.objectweb.jotm.ots.OTSORBInitializer
+
+# for jrmp
+#carol.jvm.org.objectweb.PortableInterceptor.JRMPInitializerClass.org.objectweb.jotm.jta.rmi.JTAInterceptorInitializer
+
+# configuration for rmi iiop jndi
+# java.naming.provider.url property
+#carol.jndi.iiop.java.naming.provider.url=iiop://localhost:19751
+
+#carol.jndi.java.naming.factory.url.pkgs=org.objectweb.carol.naming
+#carol.jndi.java.naming.factory.url.pkgs=org.objectweb.carol.naming:org.objectweb.carol.jndi.enc
+#carol.jndi.java.naming.factory.url.pkgs=org.mortbay.jndi
+#
+# CAROL: Common Architecture for RMI ObjectWeb Layer
+#
+# This library is developed inside the ObjectWeb Consortium,
+# http://www.objectweb.org
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+#
+# author Guillaume Riviere (Guillaume.Riviere@inrialpes.fr)
+#
+# $Id: carol.properties,v 1.5 2005/03/21 14:46:07 janb Exp $
+#
+#carol.rmi.activated=lmi
+
+carol.protocols=lmi
+#carol.protocols=jrmp
+carol.start.ns=false
+carol.start.jndi=false
+carol.start.rmi=false
+
+# Interceptors for Transactions configuration
+# for iiop
+#carol.jvm.org.omg.PortableInterceptor.ORBInitializerClass.org.objectweb.jotm.ots.OTSORBInitializer
+
+# for jrmp
+#carol.jvm.org.objectweb.PortableInterceptor.JRMPInitializerClass.org.objectweb.jotm.jta.rmi.JTAInterceptorInitializer
+
+# configuration for rmi iiop jndi
+# java.naming.provider.url property
+#carol.jndi.iiop.java.naming.provider.url=iiop://localhost:19751
+
+#carol.jndi.java.naming.factory.url.pkgs=org.objectweb.carol.naming
+#carol.jndi.java.naming.factory.url.pkgs=org.objectweb.carol.naming:org.objectweb.carol.jndi.enc
+#carol.jndi.java.naming.factory.url.pkgs=org.mortbay.jndi
Propchange: lenya/trunk/tools/jetty/extra/resources/carol.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/trunk/tools/jetty/extra/resources/jndi.properties
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/resources/jndi.properties?rev=345639&view=auto
==============================================================================
--- lenya/trunk/tools/jetty/extra/resources/jndi.properties (added)
+++ lenya/trunk/tools/jetty/extra/resources/jndi.properties Fri Nov 18 22:41:12 2005
@@ -0,0 +1,4 @@
+java.naming.factory.url.pkgs=org.mortbay.jndi
+java.naming.factory.url.pkgs=org.mortbay.jndi
+java.naming.factory.initial=org.mortbay.jndi.InitialContextFactory
+java.naming.factory.initial=org.mortbay.jndi.InitialContextFactory
Propchange: lenya/trunk/tools/jetty/extra/resources/jndi.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/trunk/tools/jetty/extra/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/jetty/extra/resources/log4j.properties?rev=345639&view=auto
==============================================================================
--- lenya/trunk/tools/jetty/extra/resources/log4j.properties (added)
+++ lenya/trunk/tools/jetty/extra/resources/log4j.properties Fri Nov 18 22:41:12 2005
@@ -0,0 +1,28 @@
+
+
+log4j.rootLogger=INFO, stdout, file
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=${webapp}/WEB-INF/logs/jetty-log4j.log
+log4j.appender.file.MaxFileSize=100KB
+log4j.appender.file.MaxBackupIndex=0
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%p %t %c - %m%n
+
+log4j.rootLogger=INFO, stdout, file
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=${webapp}/WEB-INF/logs/jetty-log4j.log
+log4j.appender.file.MaxFileSize=100KB
+log4j.appender.file.MaxBackupIndex=0
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%p %t %c - %m%n
+
Propchange: lenya/trunk/tools/jetty/extra/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/trunk/tools/loader/Loader$RepositoryClassLoader.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/loader/Loader%24RepositoryClassLoader.class?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/loader/Loader.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/loader/Loader.class?rev=345639&r1=345638&r2=345639&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org