Update to 2.4.9

PR:		50350, 50388
Submitted by:	Thomas Vogt <thomas.vogt@bsdunix.ch>

4 files changed, 386 insertions, 366 deletions

diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index ee95f73871d1..e5dea4130579 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jetty
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.9
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://jetty.mortbay.com/pub/
diff --git a/www/jetty/distinfo b/www/jetty/distinfo
index 4c64bb4b7082..8093394123b8 100644
--- a/www/jetty/distinfo
+++ b/www/jetty/distinfo
@@ -1 +1 @@
-MD5 (Jetty-4.2.5.tgz) = 577b6393ad930b9329bf6a3143232921
+MD5 (Jetty-4.2.9.tgz) = 41b4375f15e8e42bdef169a2e58d5dcd
diff --git a/www/jetty/pkg-message b/www/jetty/pkg-message
index 6e1dd599afde..df048482f345 100644
--- a/www/jetty/pkg-message
+++ b/www/jetty/pkg-message
@@ -1,16 +1,24 @@
 
 - The environment variable JETTY_HOME should be set to the 
   installation directory. Typically :
-
+	
+	For shells like bash:
 	JETTY_HOME=%%PREFIX%%/share/java/jetty-%%PORTVERSION%%
         export JETTY_HOME
+	
+	For shells like	(t)csh:
+	setenv JETTY_HOME %%PREFIX%%/share/java/jetty-%%PORTVERSION%%
 
 - The environment variable JAVA_HOME should be set to the 
   Java installation directory. For instance :
 
+	For shells like bash:
 	JAVA_HOME=%%PREFIX%%/jdk1.3.1
         export JAVA_HOME
 
+	For shells like (t)csh:
+	setenv JAVA_HOME %%PREFIX%%/jdk1.3.1
+
 - Running the Demo :
 
 	$JETTY_HOME/bin/jetty.sh demo
diff --git a/www/jetty/pkg-plist b/www/jetty/pkg-plist
index d59f599301af..20985f4fb0e7 100644
--- a/www/jetty/pkg-plist
+++ b/www/jetty/pkg-plist
@@ -1,94 +1,98 @@
-share/java/jetty-%%JETTY_VERSION%%/bin/jetty.sh
-share/java/jetty-%%JETTY_VERSION%%/bin/release-jetty.sh
-share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jetty.bat
-share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jetty.sysvinit
-share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jettyw98.bat
+share/java/jetty-%%JETTY_VERSION%%/ext/jsse.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/ant.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jasper-compiler.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jasper-runtime.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/javax.xml.jaxp.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jcert.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jmxri.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jmxtools.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/jnet.jar
+share/java/jetty-%%JETTY_VERSION%%/ext/crimson.jar
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/images/powered.png
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/dick/.htaccess
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/dick/dick.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/tom/tom.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/harry/.htaccess
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/harry/harry.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/.htaccess
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/file.html
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/harry/.htaccess
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/harry/harry.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/README.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formCookie.html
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formGET.html
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formPOST.html
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formQueryPOST.html
-share/java/jetty-%%JETTY_VERSION%%/demo/docroot/images/powered.png
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/jsp/date.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/jsp/hello.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/docroot/jsp/snoop.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/README.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formGET.html
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formPOST.html
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formQueryPOST.html
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/formCookie.html
+share/java/jetty-%%JETTY_VERSION%%/demo/docroot/README.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/servlets/HelloWorldServlet.class
 share/java/jetty-%%JETTY_VERSION%%/demo/servlets/README.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/Entries.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ShowSource.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTag.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/LogTag.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ShowSource.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/LogTag.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTag.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error/Smart.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error/Smart.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/TableBean.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/Entries.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/Entry.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/TableBean.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/Entry.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/TableBean.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/CookieExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/HelloWorldExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/JndiServlet.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestInfoExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestParamExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SessionExample.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SnoopServlet.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/TroubleShooter.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/servletToJsp.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal/Entries.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error/Smart.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error/Smart.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTag.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTag.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/LogTag.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ShowSource.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/LogTag.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples/ShowSource.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/servletToJsp.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/TroubleShooter.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/servletToJsp.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SessionExample.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestParamExample.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestInfoExample.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/LocalStrings.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/JndiServlet.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/CookieExample.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/CookieExample.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/HelloWorldExample.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/JndiServlet.class
@@ -98,29 +102,28 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/Request
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SessionExample.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SnoopServlet.class
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/TroubleShooter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/servletToJsp.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/web.xml
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/SnoopServlet.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/jsp/applet/Clock2.java
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/jsp/example-taglib.tld
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/web.xml
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/images/code.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/images/execute.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/images/return.gif
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/Entries.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/Entry.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/JspCalendar.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/TableBean.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal1.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal1.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal2.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal2.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/calendar.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/login.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/error.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/er.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/err.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/err.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/errorpge.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/mail/sendmail.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/mail/sendmail.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/mail/sendmail.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/index.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/source.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/checkbox/CheckTest.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/checkbox/check.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/checkbox/checkresult.jsp
@@ -134,21 +137,24 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/colors/colrs.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/dates/date.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/dates/date.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/dates/date.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/error.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/er.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/err.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/err.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error/errorpge.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward/forward.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward/forward.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward/fwd.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward/one.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward/two.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/foo.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/foo.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/inc.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/include.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/include.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/login.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/Entry.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/JspCalendar.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/TableBean.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal1.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal1.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal2.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/cal2.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/calendar.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal/Entries.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/jsptoserv/hello.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/jsptoserv/jts.html
@@ -170,68 +176,22 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/sessions/carts.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/sessions/carts.jsp
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/sessions/carts.txt
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/sessions/crt.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag/foo.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp/snoop.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml/xml.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/cookies.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/foo.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/foo.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/inc.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/include.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include/include.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/source.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/index.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/sessions.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/helloworld.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/index.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/jndi.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/reqheaders.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/reqinfo.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/reqparams.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/sessions.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyIndex.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyIndex_en.properties
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/DemoFilter.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/ExServlet.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage$Section.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage$Links.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyServlet.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/com/acme/CheckLoader.class
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/contribSource.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/web-jetty.xml
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/web.xml
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/JsseSSL.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/contributing.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/contributors.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoHandlers.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoJSP.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoServlets.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoWebApps.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demos.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/download.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error401.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error403.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error404.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/errorNullPointer.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/freesoftware.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/history.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/iX.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/index.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/jetty.css
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/mailingLists.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/resources.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/snoop.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/sponsors.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/support.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/admin/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logon.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logon.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logonError.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/snoop.jsp
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/noaccess/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/relax/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/ssl/file.txt
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/Balance.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets/cookies.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/virtualHosts.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/CalledJetty.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/ClientCert.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/CommercialPurposes.html
@@ -248,9 +208,9 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/JettyWithJikes.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/MimeTypes.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/PathInfo.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/PathMapping.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/User80.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/Phoenix.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/Security.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/User80.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/SslListener.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/SupportWARFiles.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/deployJSPs.html
@@ -262,8 +222,8 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/jdk14.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/jettyUML.png
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/modjk.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/reloadServlets.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/virtualHosts.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/contributors.gif
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc/Balance.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/trans.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/effbr.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/inetu.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/jboss.gif
@@ -272,8 +232,8 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/jicon.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/mbLogoBar.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/powered.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/sourceforge.gif
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/trans.gif
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/first0.gif
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images/contributors.gif
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/text.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/first1.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/img0.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/img1.gif
@@ -349,12 +309,12 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/pre
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/prev1.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/test.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/test2.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/text.gif
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone/first0.gif
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/JettyJBossOne.ppt.gz
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/JettyJBossOne.sxi.gz
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/index.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/optimizeIt.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/GettingStarted.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/overview.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/HttpServer.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/Server.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/XmlConfiguration.html
@@ -362,9 +322,53 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/index.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/logging.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/mortarboard.png
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/other.html
-share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/overview.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut/GettingStarted.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/noaccess/file.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/admin/file.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/relax/file.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/ssl/file.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logonError.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/snoop.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logon.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/logon.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/file.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyServlet.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyIndex_en.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/DemoFilter.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/ExServlet.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage$Section.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage$Links.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyPage.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty/JettyIndex.properties
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/com/acme/CheckLoader.class
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/contribSource.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/web-jetty.xml
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/web.xml
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoServlets.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoWebApps.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demos.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/download.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error401.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error403.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/error404.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/errorNullPointer.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/freesoftware.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/history.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/iX.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/index.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/jetty.css
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/mailingLists.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/resources.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/snoop.jsp
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/sponsors.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/support.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/LICENSE.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/versions.txt
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/JsseSSL.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/contributing.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/contributors.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoHandlers.html
+share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/demoJSP.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/WEB-INF/web.xml
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/index.html
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/configure_1_1.dtd
@@ -372,18 +376,17 @@ share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/web-app_2_2.dtd
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/configure_1_0.dtd
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/web-app_2_3.dtd
 share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/configure_1_2.dtd
-share/java/jetty-%%JETTY_VERSION%%/LICENSE.html
-share/java/jetty-%%JETTY_VERSION%%/README.TXT
-share/java/jetty-%%JETTY_VERSION%%/VERSION.TXT
-share/java/jetty-%%JETTY_VERSION%%/build.xml
+share/java/jetty-%%JETTY_VERSION%%/demo/README.txt
 share/java/jetty-%%JETTY_VERSION%%/cgi-bin/redirect.sh
 share/java/jetty-%%JETTY_VERSION%%/cgi-bin/env.sh
+share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jetty.bat
+share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jetty.sysvinit
+share/java/jetty-%%JETTY_VERSION%%/contrib/bin/jettyw98.bat
 share/java/jetty-%%JETTY_VERSION%%/etc/dtd/configure_1_0.dtd
 share/java/jetty-%%JETTY_VERSION%%/etc/dtd/configure_1_2.dtd
 share/java/jetty-%%JETTY_VERSION%%/etc/dtd/web-app_2_2.dtd
 share/java/jetty-%%JETTY_VERSION%%/etc/dtd/configure_1_1.dtd
 share/java/jetty-%%JETTY_VERSION%%/etc/dtd/web-app_2_3.dtd
-share/java/jetty-%%JETTY_VERSION%%/etc/LICENSE.javax.servlet.txt
 share/java/jetty-%%JETTY_VERSION%%/etc/LICENSE.javax.xml.html
 share/java/jetty-%%JETTY_VERSION%%/etc/LICENSE.jmx.txt
 share/java/jetty-%%JETTY_VERSION%%/etc/LICENSE.jsse.txt
@@ -400,33 +403,21 @@ share/java/jetty-%%JETTY_VERSION%%/etc/jdbcRealm.properties
 share/java/jetty-%%JETTY_VERSION%%/etc/jetty.policy
 share/java/jetty-%%JETTY_VERSION%%/etc/jetty.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/jettydemo.p12
-share/java/jetty-%%JETTY_VERSION%%/etc/proxy.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/nio.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/package-list
+share/java/jetty-%%JETTY_VERSION%%/etc/proxy.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/stresstest.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/stresstestRealm.properties
 share/java/jetty-%%JETTY_VERSION%%/etc/watchdog.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/webdefault.xml
 share/java/jetty-%%JETTY_VERSION%%/etc/demo.mlet
-share/java/jetty-%%JETTY_VERSION%%/ext/ant.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/com.sun.net.ssl.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/crimson.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/jasper-compiler.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/jasper-runtime.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/javax.xml.jaxp.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/jmxri.jar
-share/java/jetty-%%JETTY_VERSION%%/ext/jmxtools.jar
+share/java/jetty-%%JETTY_VERSION%%/etc/LICENSE.javax.servlet.txt
 share/java/jetty-%%JETTY_VERSION%%/lib/javax.servlet.jar
 share/java/jetty-%%JETTY_VERSION%%/lib/org.mortbay.jetty-jdk1.2.jar
 share/java/jetty-%%JETTY_VERSION%%/lib/org.mortbay.jetty.jar
 share/java/jetty-%%JETTY_VERSION%%/lib/org.mortbay.jmx.jar
-share/java/jetty-%%JETTY_VERSION%%/test/build.xml
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.html.Tests.txt
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.http.Tests.txt
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.http.handler.Tests.txt
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.jetty.Tests.txt
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.util.Tests.txt
-share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.xml.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/bin/jetty.sh
+share/java/jetty-%%JETTY_VERSION%%/bin/release-jetty.sh
 share/java/jetty-%%JETTY_VERSION%%/webapps/root/WEB-INF/web.xml
 share/java/jetty-%%JETTY_VERSION%%/webapps/root/index.html
 share/java/jetty-%%JETTY_VERSION%%/webapps/root/jetty_banner.gif
@@ -440,48 +431,12 @@ share/java/jetty-%%JETTY_VERSION%%/win32/service/registry.c
 share/java/jetty-%%JETTY_VERSION%%/win32/service/registry.h
 share/java/jetty-%%JETTY_VERSION%%/win32/service/service.c
 share/java/jetty-%%JETTY_VERSION%%/win32/service/service.h
-share/java/jetty-%%JETTY_VERSION%%/win32/jettyenv.bat
 share/java/jetty-%%JETTY_VERSION%%/win32/readme.txt
-share/java/jetty-%%JETTY_VERSION%%/javadoc/constant-values.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/index-all.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/deprecated-list.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/allclasses-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/allclasses-noframe.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/index.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/packages.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletRequest.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletResponse.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSession.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionActivationListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionAttributeListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionBindingListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionContext.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/Cookie.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServlet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletRequestWrapper.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletResponseWrapper.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionBindingEvent.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionEvent.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpUtils.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/doc-files/VariableInfo-1.gif
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/BodyTag.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/IterationTag.html
@@ -497,9 +452,12 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/TagInfo.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/TagLibraryInfo.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/TagLibraryValidator.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/TagSupport.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/TagVariableInfo.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/ValidationMessage.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/VariableInfo.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/HttpJspPage.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspPage.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspEngineInfo.html
@@ -507,7 +465,27 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspFactory.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspWriter.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/PageContext.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/JspTagException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpUtils.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletRequest.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletResponse.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSession.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionActivationListener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionAttributeListener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionBindingListener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionContext.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionListener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/Cookie.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServlet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletRequestWrapper.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpServletResponseWrapper.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionBindingEvent.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/HttpSessionEvent.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/Filter.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/FilterChain.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/FilterConfig.html
@@ -521,66 +499,34 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletRequest.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletResponse.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/SingleThreadModel.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/GenericServlet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletContextAttributeEvent.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletContextEvent.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletContextAttributeEvent.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletInputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletRequestWrapper.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletResponseWrapper.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/ServletException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/UnavailableException.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/CompositeFactory.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Applet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Block.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Break.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Comment.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Composite.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/DefList.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Element.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Font.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Form.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/FrameSet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Heading.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Image.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Include.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Input.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Link.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/List.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Page.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Script.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Select.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Style.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/StyleLink.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Table.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/TableForm.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Tag.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Target.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Text.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/TextArea.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/AJP13ListenerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Connection.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13InputStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Listener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13OutputStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Packet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/SessionDump.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/AdminServlet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/CGI.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Debug.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Dump.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Forward.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/MultiPartRequest.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/MultiPartResponse.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/NotFoundServlet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/RequestDispatchTest.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/SendRedirect.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/jmx/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/jmx/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/jmx/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/jmx/ResourceHandlerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/AbstractHttpHandler.html
@@ -595,7 +541,9 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/ProxyHandler
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/ResourceHandler.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/RootNotFoundHandler.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/SecurityHandler.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/SetResponseHeadersHandler.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/SunJsseListenerMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/HttpContextMBean.html
@@ -606,24 +554,32 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/JsseListenerMBea
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/NCSARequestLogMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/SocketChannelListenerMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/SocketListenerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/SunJsseListenerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/BufferedOutputStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ChunkingInputStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ChunkingOutputStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/EOFException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx/AJP13ListenerMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Connection.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13InputStream.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Listener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13OutputStream.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/AJP13Packet.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpHandler.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpInputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpListener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpMessage.HeaderWriter.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpServer.ComponentEventListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpTunnel.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/NullableOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/RequestLog.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SecurityConstraint.Authenticator.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/UserPrincipal.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/UserRealm.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/BasicAuthenticator.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/BufferedOutputStream.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpFields.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ChunkingInputStream.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ChunkingOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ClientCertAuthenticator.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ContextLoader.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/DigestAuthenticator.html
@@ -631,44 +587,49 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HashUserRealm.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpConnection.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpContext.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpContext.ResourceMetaData.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpFields.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpFields.Entry.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpInputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpMessage.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpRequest.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpResponse.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpServer.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpServer.ComponentEvent.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpTunnel.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/IbmJsseListener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/InclusiveByteRange.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/JDBCUserRealm.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/JsseListener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/MultiPartResponse.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/NCSARequestLog.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/NullableOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/PathMap.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SecurityConstraint.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SecurityConstraint.Nobody.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SocketChannelListener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SocketChannelListener.Connection.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SocketListener.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SunJsseListener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/Version.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/SunJsseListener.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/EOFException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/HttpException.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/ServerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/WebApplicationHandlerMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/AbstractSessionManagerMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/FilterHolderMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/HolderMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/ServletHandlerMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/ServletHolderMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/ServletHttpContextMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/SessionManagerMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/WebApplicationContextMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/WebApplicationHandlerMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/SessionManager.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/SessionManager.Session.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/AbstractSessionManager.html
@@ -680,52 +641,76 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/FormAuthent
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/HashSessionManager.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/Holder.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/Invoker.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/NamingWebAppContext.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletSSL.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletHandler.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletHolder.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletHttpContext.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletHttpRequest.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletHttpResponse.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/ServletSSL.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/SessionContext.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/WebApplicationContext.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/WebApplicationHandler.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/win32/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/win32/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/win32/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/win32/Service.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx/ServerMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/Server.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Server.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Balancer.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Connection.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Listener.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Policy.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/Server.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/AdminServlet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/CGI.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Debug.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Dump.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/Forward.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/MultiPartRequest.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/MultiPartResponse.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/NotFoundServlet.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/RequestDispatchTest.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/SendRedirect.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet/SessionDump.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/TextArea.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-tree.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/CompositeFactory.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Applet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Block.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Break.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Comment.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Composite.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/DefList.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Element.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Font.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Form.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/FrameSet.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Heading.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Image.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Include.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Input.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Link.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/List.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Page.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Script.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Select.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Style.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/StyleLink.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Table.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/TableForm.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Tag.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Target.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/Text.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/Classpath.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/Main.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start/Version.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-frame.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-summary.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/ThreadPoolMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/CodeMBean.html
@@ -736,9 +721,13 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/Main.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/ModelMBeanImpl.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/OutputStreamLogSinkMBean.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/ThreadedServerMBean.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/ThreadPoolMBean.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-tree.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/LifeCycle.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/LogSink.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/OutputObserver.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Pool.PondLife.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/B64Code.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/BlockingQueue.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ByteArrayISO8859Writer.html
@@ -748,15 +737,15 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ByteBufferOutputStre
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ByteBufferPool.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/CachedResource.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ChannelStream.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ChannelStream.OutputChannelStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Code.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/IO.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/ChannelStream.OutputChannelStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Code.LogMsg.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Credential.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Credential.Crypt.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Credential.MD5.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/DateCache.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/InetAddrPort.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/IO.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/JarResource.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/KeyPairTool.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/LazyList.html
@@ -771,12 +760,10 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/LogWriter.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/MultiMap.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/NonBlockingQueue.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Observed.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/OutputObserver.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/OutputStreamLogSink.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Password.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/PKCS12Import.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Pool.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Pool.PondLife.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Primitive.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/QuotedStringTokenizer.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/Resource.html
@@ -797,61 +784,81 @@ share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/UrlEncoded.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/URLResource.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/WriterOutputStream.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/CodeException.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/MultiException.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/package-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/XmlConfiguration.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/package-summary.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/package-tree.html
-share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/XmlConfiguration.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/package-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/XmlParser.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/XmlParser.Attribute.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/xml/XmlParser.Node.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/index-all.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/deprecated-list.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/allclasses-frame.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/allclasses-noframe.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/index.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/packages.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-summary.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-frame.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/serialized-form.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/package-list
 share/java/jetty-%%JETTY_VERSION%%/javadoc/help-doc.html
+share/java/jetty-%%JETTY_VERSION%%/javadoc/constant-values.html
 share/java/jetty-%%JETTY_VERSION%%/javadoc/stylesheet.css
-share/java/jetty-%%JETTY_VERSION%%/logs/2003_01_14.request.log
-share/java/jetty-%%JETTY_VERSION%%/start.jar
+share/java/jetty-%%JETTY_VERSION%%/javadoc/overview-tree.html
+share/java/jetty-%%JETTY_VERSION%%/logs/2003_03_21.request.log
 share/java/jetty-%%JETTY_VERSION%%/testdocs/alphabet0.txt
 share/java/jetty-%%JETTY_VERSION%%/testdocs/alphabet1.txt
-@dirrm share/java/jetty-%%JETTY_VERSION%%/bin
-@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib/bin
-@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib/src
-@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.html.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.http.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.http.handler.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.jetty.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.util.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/results/TEST-org.mortbay.xml.Tests.txt
+share/java/jetty-%%JETTY_VERSION%%/test/build.xml
+share/java/jetty-%%JETTY_VERSION%%/start.jar
+share/java/jetty-%%JETTY_VERSION%%/build.xml
+share/java/jetty-%%JETTY_VERSION%%/VERSION.TXT
+share/java/jetty-%%JETTY_VERSION%%/README.TXT
+share/java/jetty-%%JETTY_VERSION%%/LICENSE.html
+@dirrm share/java/jetty-%%JETTY_VERSION%%/ext
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/images
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/dick
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/tom
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files/harry
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/files
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/images
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot/jsp
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/docroot
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/servlets
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/demo/src >/dev/null 2>&1 || true
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/num
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/checkbox
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/cal
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/colors
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/compressionFilters
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/dates
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/error
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/examples
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/filters
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/listeners
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/sessions
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/util
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes/validators
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/classes
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/jsp/applet
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF/jsp
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/WEB-INF
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/images
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/mail
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/checkbox
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/colors
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/dates
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/error
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/forward
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/cal
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/jsptoserv
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/num
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/plugin/applet
@@ -859,12 +866,20 @@ share/java/jetty-%%JETTY_VERSION%%/testdocs/alphabet1.txt
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/security/protected
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/security
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/sessions
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/simpletag
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/snp
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/xml
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp/include
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/jsp
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples/servlets
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/examples
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/noaccess
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/admin
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/relax
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/ssl
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps/jetty
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay/webapps
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/org/mortbay
@@ -873,59 +888,40 @@ share/java/jetty-%%JETTY_VERSION%%/testdocs/alphabet1.txt
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes/com
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF/classes
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/WEB-INF
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/admin
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/noaccess
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/relax
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth/ssl
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/auth
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/doc
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/images
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations/jbossone
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/presentations
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty/tut
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/jetty
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root/WEB-INF
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps/root
 @dirrm share/java/jetty-%%JETTY_VERSION%%/demo/webapps
-@dirrm share/java/jetty-%%JETTY_VERSION%%/demo
 @dirrm share/java/jetty-%%JETTY_VERSION%%/cgi-bin
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/contrib/src 2>/dev/null || true
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/contrib 2>/dev/null || true
+@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib/bin
 @dirrm share/java/jetty-%%JETTY_VERSION%%/etc/dtd
 @dirrm share/java/jetty-%%JETTY_VERSION%%/etc
-@dirrm share/java/jetty-%%JETTY_VERSION%%/ext
-@dirrm share/java/jetty-%%JETTY_VERSION%%/lib
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/src 2>/dev/null || true
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/src1.4 2>/dev/null || true
-@unexec rmdir %D/share/java/jetty-%%JETTY_VERSION%%/test/src 2>/dev/null || true
-@dirrm share/java/jetty-%%JETTY_VERSION%%/test/results
-@dirrm share/java/jetty-%%JETTY_VERSION%%/test
 @dirrm share/java/jetty-%%JETTY_VERSION%%/webapps/root/WEB-INF
 @dirrm share/java/jetty-%%JETTY_VERSION%%/webapps/root
 @dirrm share/java/jetty-%%JETTY_VERSION%%/webapps
 @dirrm share/java/jetty-%%JETTY_VERSION%%/win32/service/mingw32
 @dirrm share/java/jetty-%%JETTY_VERSION%%/win32/service
 @dirrm share/java/jetty-%%JETTY_VERSION%%/win32
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext/doc-files
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp/tagext
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/jsp
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet/http
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax/servlet
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/javax
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler/jmx
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/handler
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/jmx
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp/jmx
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http/ajp
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/http
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet/jmx
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/servlet
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/win32
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty/jmx
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/jetty
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/loadbalancer
-@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/servlet
+@dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/html
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/start
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util/jmx
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org/mortbay/util
@@ -934,5 +930,21 @@ share/java/jetty-%%JETTY_VERSION%%/testdocs/alphabet1.txt
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc/org
 @dirrm share/java/jetty-%%JETTY_VERSION%%/javadoc
 @dirrm share/java/jetty-%%JETTY_VERSION%%/logs
-@dirrm share/java/jetty-%%JETTY_VERSION%%/testdocs
+@dirrm share/java/jetty-%%JETTY_VERSION%%/lib
+@dirrm share/java/jetty-%%JETTY_VERSION%%/bin
+@exec mkdir -p %D/share/java/jetty-%%JETTY_VERSION%%/src
+@exec mkdir -p %D/share/java/jetty-%%JETTY_VERSION%%/src1.4 
+@exec mkdir -p %D/share/java/jetty-%%JETTY_VERSION%%/demo/src 
+@exec mkdir -p %D/share/java/jetty-%%JETTY_VERSION%%/contrib/src 
+@exec mkdir -p %D/share/java/jetty-%%JETTY_VERSION%%/test/src 
+@dirrm share/java/jetty-%%JETTY_VERSION%%/src
+@dirrm share/java/jetty-%%JETTY_VERSION%%/src1.4
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo/src
+@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib/src
+@dirrm share/java/jetty-%%JETTY_VERSION%%/test/src
+@dirrm share/java/jetty-%%JETTY_VERSION%%/demo
+@dirrm share/java/jetty-%%JETTY_VERSION%%/contrib
+@dirrm share/java/jetty-%%JETTY_VERSION%%/testdocs            
+@dirrm share/java/jetty-%%JETTY_VERSION%%/test/results
+@dirrm share/java/jetty-%%JETTY_VERSION%%/test
 @dirrm share/java/jetty-%%JETTY_VERSION%%/