Author: vgritsenko
Date: Thu Nov 6 09:33:13 2008
New Revision: 711919
URL: http://svn.apache.org/viewvc?rev=711919&view=rev
Log:
Update jetty to version 6.1.11.
Added:
xml/xindice/trunk/tools/jetty/conf/webdefault.xml
- copied unchanged from r711891,
xml/xindice/trunk/tools/jetty/conf/webdefaults.xml
xml/xindice/trunk/tools/jetty/lib/jetty-6.1.11.jar (with props)
xml/xindice/trunk/tools/jetty/lib/jetty-util-6.1.11.jar (with props)
xml/xindice/trunk/tools/jetty/start.jar (with props)
Removed:
xml/xindice/trunk/tools/jetty/conf/jetty.env
xml/xindice/trunk/tools/jetty/conf/webdefaults.xml
xml/xindice/trunk/tools/jetty/lib/jetty-4.2.8.jar
Modified:
xml/xindice/trunk/status.xml
xml/xindice/trunk/tools/jetty/conf/main.xml
xml/xindice/trunk/xindiced
xml/xindice/trunk/xindiced.bat
Modified: xml/xindice/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/status.xml?rev=711919&r1=711918&r2=711919&view=diff
==============================================================================
--- xml/xindice/trunk/status.xml (original)
+++ xml/xindice/trunk/status.xml Thu Nov 6 09:33:13 2008
@@ -114,6 +114,9 @@
<changes>
<release version="1.2-dev" date="unreleased">
+ <action dev="VG" type="update">
+ Update jetty to version 6.1.11.
+ </action>
<action dev="NS" type="update">
Update lucene-core library to version 2.4.0.
</action>
Modified: xml/xindice/trunk/tools/jetty/conf/main.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/tools/jetty/conf/main.xml?rev=711919&r1=711918&r2=711919&view=diff
==============================================================================
--- xml/xindice/trunk/tools/jetty/conf/main.xml (original)
+++ xml/xindice/trunk/tools/jetty/conf/main.xml Thu Nov 6 09:33:13 2008
@@ -18,68 +18,151 @@
- $Id$
-->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN"
- "http://jetty.mortbay.org/configure_1_2.dtd";>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
+ "http://jetty.mortbay.org/configure.dtd";>
-<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Configure the Jetty Server -->
-<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<Configure class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.mortbay.jetty.Server">
- <!-- =============================================================== -->
- <!-- Configure the Request Listeners -->
- <!-- =============================================================== -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Server Thread Pool -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="ThreadPool">
+ <New class="org.mortbay.thread.QueuedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">200</Set>
+ <Set name="lowThreads">20</Set>
+ <Set name="SpawnOrShrinkAt">2</Set>
+ </New>
+
+ <!-- Optional Java 5 bounded threadpool with job queue
+ <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <Set name="corePoolSize">50</Set>
+ <Set name="maximumPoolSize">50</Set>
+ </New>
+ -->
+ </Set>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add and configure a HTTP listener to port 8888 -->
- <!-- The default port can be changed using: java -Djetty.port=80 -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addListener">
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Set connectors -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
<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 class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="host"><SystemProperty name="jetty.host"/></Set>
+ <Set name="port"><SystemProperty name="jetty.port"
default="8888"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="statsOn">false</Set>
+ <Set name="confidentialPort">8443</Set>
+ <Set name="lowResourcesConnections">5000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
</New>
</Arg>
</Call>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add and configure "xindice" user realm -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addRealm">
+ <!-- Use this connector if NIO is not available.
+ <Call name="addConnector">
<Arg>
- <New class="org.mortbay.http.HashUserRealm">
- <Arg>xindice</Arg>
- <Arg><SystemProperty name="xindice.home"
default="."/>/tools/jetty/conf/realm.properties</Arg>
- <Set name="Name">xindice</Set>
- </New>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8081</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="lowResourceMaxIdleTime">1500</Set>
+ </New>
</Arg>
</Call>
+ -->
- <!-- =============================================================== -->
- <!-- Configure the Contexts -->
- <!-- =============================================================== -->
-
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add root context web applications. -->
+ <!-- To add a HTTPS SSL listener -->
+ <!-- see jetty-ssl.xml to add an ssl connector. use -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Set up global session ID manager -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!--
+ <Set name="sessionIdManager">
+ <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+ <Set name="workerName">node1</Set>
+ </New>
+ </Set>
+ -->
+
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Set handler Collection Structure -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="handler">
+ <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+ <Item>
+ <New id="Contexts"
class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ </Item>
+ <Item>
+ <New id="DefaultHandler"
class="org.mortbay.jetty.handler.DefaultHandler"/>
+ </Item>
+ <Item>
+ <New id="RequestLog"
class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Set>
+
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Configure Xindice Webapp -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Ref id="Contexts">
+ <Call name="addHandler">
+ <Arg>
+ <New id="WebApp" class="org.mortbay.jetty.webapp.WebAppContext">
+ <Set name="server"><Ref id="Server"/></Set>
+ <Set name="contextPath"><SystemProperty name="context"
default="/"/></Set>
+ <Set name="war"><SystemProperty name="webapp" default="."/></Set>
+ <Set name="logUrlOnStart">true</Set>
+ <Set name="parentLoaderPriority">false</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"
default="."/>/conf/webdefault.xml</Set>
+ </New>
+ </Arg>
+ </Call>
+ </Ref>
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- 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 -->
+ <!-- Configure Xindice Authentication Realm -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="UserRealms">
+ <Array type="org.mortbay.jetty.security.UserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">xindice</Set>
+ <Set name="config"><SystemProperty name="jetty.home"
default="."/>/conf/realm.properties</Set>
+ <Set name="refreshInterval">0</Set>
+ </New>
+ </Item>
+ </Array>
+ </Set>
- <Call name="addWebApplication">
- <Arg>xindice</Arg>
- <Arg><SystemProperty name="webapp" default="."/></Arg>
- <Set name="defaultsDescriptor">./tools/jetty/conf/webdefaults.xml</Set>
- </Call>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Options -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="stopAtShutdown">true</Set>
+ <Set name="sendServerVersion">true</Set>
+ <Set name="sendDateHeader">true</Set>
+ <Set name="gracefulShutdown">1000</Set>
</Configure>
Added: xml/xindice/trunk/tools/jetty/lib/jetty-6.1.11.jar
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/tools/jetty/lib/jetty-6.1.11.jar?rev=711919&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xml/xindice/trunk/tools/jetty/lib/jetty-6.1.11.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: xml/xindice/trunk/tools/jetty/lib/jetty-util-6.1.11.jar
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/tools/jetty/lib/jetty-util-6.1.11.jar?rev=711919&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xml/xindice/trunk/tools/jetty/lib/jetty-util-6.1.11.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: xml/xindice/trunk/tools/jetty/start.jar
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/tools/jetty/start.jar?rev=711919&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xml/xindice/trunk/tools/jetty/start.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: xml/xindice/trunk/xindiced
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/xindiced?rev=711919&r1=711918&r2=711919&view=diff
==============================================================================
--- xml/xindice/trunk/xindiced (original)
+++ xml/xindice/trunk/xindiced Thu Nov 6 09:33:13 2008
@@ -125,6 +125,7 @@
CP=`ls $XINDICE_HOME/lib/servlet*.jar`
for i in `ls $XINDICE_HOME/lib/endorsed/*.jar` ; do CP=$CP:$i ; done
+for i in `ls $XINDICE_HOME/tools/jetty/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/tools/jetty/lib/*.jar` ; do CP=$CP:$i ; done
@@ -143,6 +144,13 @@
XINDICE_CONFIG=`cygpath --path --windows "$XINDICE_CONFIG"`
fi
+JAVAARGS="-classpath $CP -Djava.endorsed.dirs=lib/endorsed \
+ -Dxindice.home=$XINDICE_HOME -Dxindice.db.home=$XINDICE_DB_HOME
-Dxindice.configuration=$XINDICE_CONFIG \
+ -Dorg.apache.commons.logging.Log=$LOGGER
-Dorg.apache.commons.logging.simplelog.defaultlog=$LOGLEVEL \
+ -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser \
+ -Djetty.home=$XINDICE_HOME/tools/jetty -Djetty.port=$JETTY_PORT
-Djetty.admin.port=$JETTY_ADMIN_PORT \
+ -Dwebapp=$JETTY_WEBAPP"
+
case "$ACTION" in
start)
if [ -f $XINDICE_PID ]
@@ -159,14 +167,18 @@
echo "Starting Xindice. Log files are under $XINDICE_HOME/logs"
echo
- nohup "$JAVACMD" $JAVA_OPTIONS -classpath "$CP"
-Djava.endorsed.dirs=lib/endorsed -Dxindice.home="$XINDICE_HOME"
-Dxindice.db.home="$XINDICE_DB_HOME" -Dxindice.configuration="$XINDICE_CONFIG"
-Dorg.apache.commons.logging.Log="$LOGGER"
-Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL"
-Dwebapp="$JETTY_WEBAPP"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server "$JETTY_CONFIG" >> $XINDICE_HOME/logs/xindice.out 2>&1
&
+ nohup "$JAVACMD" $JAVA_OPTIONS $JAVAARGS org.mortbay.start.Main
"$JETTY_CONFIG" >> $XINDICE_HOME/logs/xindice.out 2>&1 &
echo $! > $XINDICE_PID
echo "Xindice is running with PID `cat $XINDICE_PID`"
;;
+ run)
+ "$JAVACMD" $JAVA_OPTIONS $JAVAARGS org.mortbay.start.Main
"$JETTY_CONFIG"
+ ;;
+
debug)
- "$JAVACMD" $JAVA_OPTIONS -Xdebug
-Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
-classpath "$CP" -Djava.endorsed.dirs=lib/endorsed
-Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_DB_HOME"
-Dxindice.configuration="$XINDICE_CONFIG"
-Dorg.apache.commons.logging.Log="$LOGGER"
-Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL"
-Dwebapp="$JETTY_WEBAPP"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server "$JETTY_CONFIG"
"$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out
2>&1
+ "$JAVACMD" $JAVA_OPTIONS -Xdebug
-Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
$JAVAARGS org.mortbay.start.Main "$JETTY_CONFIG"
"$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out
2>&1
;;
stop)
Modified: xml/xindice/trunk/xindiced.bat
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/xindiced.bat?rev=711919&r1=711918&r2=711919&view=diff
==============================================================================
--- xml/xindice/trunk/xindiced.bat (original)
+++ xml/xindice/trunk/xindiced.bat Thu Nov 6 09:33:13 2008
@@ -75,6 +75,7 @@
set LOCALCLASSPATH=
for %%i in ("%_XINDICE_HOME%\lib\servlet*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
for %%i in ("%_XINDICE_HOME%\lib\endorsed\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
+for %%i in ("%_XINDICE_HOME%\tools\jetty\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
for %%i in ("%_XINDICE_HOME%\tools\jetty\lib\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
@@ -107,6 +108,7 @@
set _JAVA_DEBUG_PORT=8000
:gotDebugPort
+set _JAVA_ARGS=-classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed
-Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%"
-Dxindice.configuration="%_XINDICE_CONFIG%"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT%
-Dwebapp=%_JETTY_WEBAPP%
:: ----- Check action
----------------------------------------------------------
@@ -124,19 +126,19 @@
:: ----- Start Servlet
---------------------------------------------------------
:doStart
-%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%"
-Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%"
-Dwebapp=%_JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% %_JAVA_ARGS% org.mortbay.jetty.Server
tools\jetty\conf\main.xml
goto end
:: ----- Run Servlet
-----------------------------------------------------------
:doRun
-%_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%"
-Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%"
-Dwebapp=%_JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%_JAVACMD% %_JAVA_OPTIONS% %_JAVA_ARGS% org.mortbay.jetty.Server
tools\jetty\conf\main.xml
goto end
:: ----- Servlet Debug
---------------------------------------------------------
:doDebug
-%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n
-classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed
-Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%"
-Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT%
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG
org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n
%_JAVA_ARGS%
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG
org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
goto end
@@ -147,6 +149,7 @@
@endlocal
goto mainEnd
:win16
+set _JAVA_ARGS=
set _XINDICE_HOME=
set _XINDICE_DB_HOME=
set _XINDICE_CONFIG=
