. Update to 2.1.14.

PR:		68604
Submitted by:	Jean-Baptiste Quenot <jb.quenot@caraldi.com> (maintainer)

4 files changed, 121 insertions, 119 deletions

diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index 4dfb53b9fb58..321e550762d1 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	resin
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.14
 CATEGORIES=	www java
 MASTER_SITES=	http://www.caucho.com/download/
 
@@ -122,7 +122,10 @@ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	    in the Apache configuration file, where you should also \
 	    add a line to specify the location of the Resin configuration \
 	    file, for example: | fmt -w 80 >> ${PKGMESSAGE}
-	@${ECHO_CMD} CauchoConfigFile ${PREFIX}/etc/${APP_NAME}.xml >> ${PKGMESSAGE}
+	@${ECHO_CMD} >> ${PKGMESSAGE}
+	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
+	@${ECHO_CMD} "    CauchoConfigFile ${PREFIX}/etc/${APP_NAME}.xml" >> ${PKGMESSAGE}
+	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
 	@${MV} ${WRKDIR}/wrapper.pl.in ${WRKSRC}/bin/wrapper.pl.in
 
diff --git a/www/resin2/distinfo b/www/resin2/distinfo
index be999a73c836..3a824baf5d0b 100644
--- a/www/resin2/distinfo
+++ b/www/resin2/distinfo
@@ -1,2 +1,2 @@
-MD5 (resin-2.1.12.tar.gz) = d435aae4b9a7154d643bba19a6d06098
-SIZE (resin-2.1.12.tar.gz) = 3301331
+MD5 (resin-2.1.14.tar.gz) = 03d1ce8746ba3a5082298fd617929620
+SIZE (resin-2.1.14.tar.gz) = 3305648
diff --git a/www/resin2/files/resin.sh.in b/www/resin2/files/resin.sh.in
index 3c44d001684c..8e023ee9b97d 100644
--- a/www/resin2/files/resin.sh.in
+++ b/www/resin2/files/resin.sh.in
@@ -22,6 +22,7 @@ ARGS="-conf $PREFIX/etc/%%APP_NAME%%.xml \
 -pid %%PID_FILE%%"
 PATH=/usr/sbin:/usr/bin:/bin
 
+unset CLASSPATH
 export JAVA_HOME=%%JAVA_HOME%%
 export RESIN_HOME=$PREFIX/%%APP_NAME%%
 
diff --git a/www/resin2/pkg-plist b/www/resin2/pkg-plist
index 5d8a8b488a57..331d9f7e8917 100644
--- a/www/resin2/pkg-plist
+++ b/www/resin2/pkg-plist
@@ -1,14 +1,21 @@
 %%APP_NAME%%/doc/beta.xtp
 %%APP_NAME%%/doc/changes-1.xtp
 %%APP_NAME%%/doc/changes.xtp
+%%APP_NAME%%/doc/css/default.css
 %%APP_NAME%%/doc/errata.xtp
-%%APP_NAME%%/doc/features.xtp
-%%APP_NAME%%/doc/future.xtp
-%%APP_NAME%%/doc/index.xtp
-%%APP_NAME%%/doc/toc.xml
 %%APP_NAME%%/doc/examples/basic/WEB-INF/classes/Env.java
 %%APP_NAME%%/doc/examples/basic/WEB-INF/classes/HelloServlet.java
+%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/1.html
+%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/2.html
+%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/3.html
+%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/4.html
+%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/5.html
 %%APP_NAME%%/doc/examples/basic/counter.jsp
+%%APP_NAME%%/doc/examples/basic/data/fortune/1.html
+%%APP_NAME%%/doc/examples/basic/data/fortune/2.html
+%%APP_NAME%%/doc/examples/basic/data/fortune/3.html
+%%APP_NAME%%/doc/examples/basic/data/fortune/4.html
+%%APP_NAME%%/doc/examples/basic/data/fortune/5.html
 %%APP_NAME%%/doc/examples/basic/dir.jsp
 %%APP_NAME%%/doc/examples/basic/dummy.jsp
 %%APP_NAME%%/doc/examples/basic/env.jsp
@@ -20,19 +27,7 @@
 %%APP_NAME%%/doc/examples/basic/quote_error.jsp
 %%APP_NAME%%/doc/examples/basic/session.jsp
 %%APP_NAME%%/doc/examples/basic/stats.jsp
-%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/1.html
-%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/2.html
-%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/3.html
-%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/4.html
-%%APP_NAME%%/doc/examples/basic/com/caucho/fortune/5.html
-%%APP_NAME%%/doc/examples/basic/data/fortune/1.html
-%%APP_NAME%%/doc/examples/basic/data/fortune/2.html
-%%APP_NAME%%/doc/examples/basic/data/fortune/3.html
-%%APP_NAME%%/doc/examples/basic/data/fortune/4.html
-%%APP_NAME%%/doc/examples/basic/data/fortune/5.html
 %%APP_NAME%%/doc/examples/index.xtp
-%%APP_NAME%%/doc/examples/toc.xml
-%%APP_NAME%%/doc/examples/view_source.jsp
 %%APP_NAME%%/doc/examples/login/WEB-INF/classes/test/TestAuthenticator.java
 %%APP_NAME%%/doc/examples/login/WEB-INF/web.xml
 %%APP_NAME%%/doc/examples/login/error.html
@@ -50,9 +45,6 @@
 %%APP_NAME%%/doc/examples/navigation/conclusion.jsp
 %%APP_NAME%%/doc/examples/navigation/navigation.jsp
 %%APP_NAME%%/doc/examples/navigation/toc.xml
-%%APP_NAME%%/doc/examples/templates/admin.jsp
-%%APP_NAME%%/doc/examples/templates/add.jsp
-%%APP_NAME%%/doc/examples/templates/add.xtp
 %%APP_NAME%%/doc/examples/templates/WEB-INF/classes/jsp/Guest.java
 %%APP_NAME%%/doc/examples/templates/WEB-INF/classes/jsp/GuestBook.java
 %%APP_NAME%%/doc/examples/templates/WEB-INF/classes/jsp/GuestJsp.java
@@ -66,6 +58,9 @@
 %%APP_NAME%%/doc/examples/templates/WEB-INF/xsl/guestbook.xsl
 %%APP_NAME%%/doc/examples/templates/WEB-INF/xsl/header.xsl
 %%APP_NAME%%/doc/examples/templates/WEB-INF/xsl/rss.xsl
+%%APP_NAME%%/doc/examples/templates/add.jsp
+%%APP_NAME%%/doc/examples/templates/add.xtp
+%%APP_NAME%%/doc/examples/templates/admin.jsp
 %%APP_NAME%%/doc/examples/templates/admin.xtp
 %%APP_NAME%%/doc/examples/templates/guestbook.jsp
 %%APP_NAME%%/doc/examples/templates/guestbook.xtp
@@ -80,11 +75,13 @@
 %%APP_NAME%%/doc/examples/tictactoe/WEB-INF/scripts/score.js
 %%APP_NAME%%/doc/examples/tictactoe/error.jsp
 %%APP_NAME%%/doc/examples/tictactoe/tictactoe.jsp
+%%APP_NAME%%/doc/examples/toc.xml
 %%APP_NAME%%/doc/examples/tutorial/WEB-INF/classes/servlet/trivial/HelloServlet.java
 %%APP_NAME%%/doc/examples/tutorial/WEB-INF/web.xml
+%%APP_NAME%%/doc/examples/view_source.jsp
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/classes/xsl/Dispatch.java
-%%APP_NAME%%/doc/examples/xsl/WEB-INF/web.xml
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/scripts/Navigation.js
+%%APP_NAME%%/doc/examples/xsl/WEB-INF/web.xml
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/xsl/basic.xsl
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/xsl/content.xsl
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/xsl/copy.xsl
@@ -95,6 +92,11 @@
 %%APP_NAME%%/doc/examples/xsl/WEB-INF/xsl/verify.xsl
 %%APP_NAME%%/doc/examples/xsl/basic.xtp
 %%APP_NAME%%/doc/examples/xsl/counter.xtp
+%%APP_NAME%%/doc/examples/xsl/data/fortune/1.html
+%%APP_NAME%%/doc/examples/xsl/data/fortune/2.html
+%%APP_NAME%%/doc/examples/xsl/data/fortune/3.html
+%%APP_NAME%%/doc/examples/xsl/data/fortune/4.html
+%%APP_NAME%%/doc/examples/xsl/data/fortune/5.html
 %%APP_NAME%%/doc/examples/xsl/good-doc.xtp
 %%APP_NAME%%/doc/examples/xsl/index.xml
 %%APP_NAME%%/doc/examples/xsl/navigation.xtp
@@ -103,11 +105,17 @@
 %%APP_NAME%%/doc/examples/xsl/vary.xtp
 %%APP_NAME%%/doc/examples/xsl/verify-bad.xtp
 %%APP_NAME%%/doc/examples/xsl/verify-ok.xtp
-%%APP_NAME%%/doc/examples/xsl/data/fortune/1.html
-%%APP_NAME%%/doc/examples/xsl/data/fortune/2.html
-%%APP_NAME%%/doc/examples/xsl/data/fortune/3.html
-%%APP_NAME%%/doc/examples/xsl/data/fortune/4.html
-%%APP_NAME%%/doc/examples/xsl/data/fortune/5.html
+%%APP_NAME%%/doc/faq/classloader.xtp
+%%APP_NAME%%/doc/faq/config.xtp
+%%APP_NAME%%/doc/faq/debug.xtp
+%%APP_NAME%%/doc/faq/index.xtp
+%%APP_NAME%%/doc/faq/install.xtp
+%%APP_NAME%%/doc/faq/misc.xtp
+%%APP_NAME%%/doc/faq/servlet.xtp
+%%APP_NAME%%/doc/faq/ssl.xtp
+%%APP_NAME%%/doc/faq/toc.xml
+%%APP_NAME%%/doc/features.xtp
+%%APP_NAME%%/doc/future.xtp
 %%APP_NAME%%/doc/images/apache_srun.gif
 %%APP_NAME%%/doc/images/appserver.gif
 %%APP_NAME%%/doc/images/background.gif
@@ -115,6 +123,7 @@
 %%APP_NAME%%/doc/images/ball8.gif
 %%APP_NAME%%/doc/images/bean.gif
 %%APP_NAME%%/doc/images/bean1.gif
+%%APP_NAME%%/doc/images/caucho-blue.gif
 %%APP_NAME%%/doc/images/caucho.gif
 %%APP_NAME%%/doc/images/compiler.gif
 %%APP_NAME%%/doc/images/file.gif
@@ -124,6 +133,7 @@
 %%APP_NAME%%/doc/images/iis_srun.gif
 %%APP_NAME%%/doc/images/jndi_tree.gif
 %%APP_NAME%%/doc/images/jsp.gif
+%%APP_NAME%%/doc/images/left_background.gif
 %%APP_NAME%%/doc/images/logo.gif
 %%APP_NAME%%/doc/images/pixel.gif
 %%APP_NAME%%/doc/images/resin_powered.gif
@@ -134,16 +144,15 @@
 %%APP_NAME%%/doc/images/style.gif
 %%APP_NAME%%/doc/images/webserver.gif
 %%APP_NAME%%/doc/images/website_srun.gif
-%%APP_NAME%%/doc/images/caucho-blue.gif
-%%APP_NAME%%/doc/images/left_background.gif
+%%APP_NAME%%/doc/index.xtp
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/basic/HelloServlet.java
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/basic/InitServlet.java
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/basic/MappingServlet.java
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/basic/URLServlet.java
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/database/InitDatabaseServlet.java
 %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/database/QueryServlet.java
-%%APP_NAME%%/doc/java_tut/WEB-INF/web.xml
 %%APP_NAME%%/doc/java_tut/WEB-INF/sql/default.sql
+%%APP_NAME%%/doc/java_tut/WEB-INF/web.xml
 %%APP_NAME%%/doc/java_tut/add_page.xtp
 %%APP_NAME%%/doc/java_tut/bean.xtp
 %%APP_NAME%%/doc/java_tut/cache.xtp
@@ -157,15 +166,42 @@
 %%APP_NAME%%/doc/java_tut/filter-vary.xtp
 %%APP_NAME%%/doc/java_tut/form.xtp
 %%APP_NAME%%/doc/java_tut/hardcore.xtp
+%%APP_NAME%%/doc/java_tut/images/same_srun.gif
+%%APP_NAME%%/doc/java_tut/images/srunc.gif
 %%APP_NAME%%/doc/java_tut/index.xtp
 %%APP_NAME%%/doc/java_tut/isp.xtp
+%%APP_NAME%%/doc/java_tut/javadoc/allclasses-frame.html
+%%APP_NAME%%/doc/java_tut/javadoc/allclasses-noframe.html
+%%APP_NAME%%/doc/java_tut/javadoc/constant-values.html
+%%APP_NAME%%/doc/java_tut/javadoc/deprecated-list.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/HelloServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/InitServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/MappingServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/URLServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-frame.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-summary.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-tree.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/InitDatabaseServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/QueryServlet.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-frame.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-summary.html
+%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-tree.html
+%%APP_NAME%%/doc/java_tut/javadoc/help-doc.html
+%%APP_NAME%%/doc/java_tut/javadoc/index-all.html
+%%APP_NAME%%/doc/java_tut/javadoc/index.html
+%%APP_NAME%%/doc/java_tut/javadoc/overview-frame.html
+%%APP_NAME%%/doc/java_tut/javadoc/overview-summary.html
+%%APP_NAME%%/doc/java_tut/javadoc/overview-tree.html
+%%APP_NAME%%/doc/java_tut/javadoc/package-list
+%%APP_NAME%%/doc/java_tut/javadoc/resources/inherit.gif
+%%APP_NAME%%/doc/java_tut/javadoc/stylesheet.css
 %%APP_NAME%%/doc/java_tut/linux-boot.xtp
 %%APP_NAME%%/doc/java_tut/linux-init.xtp
 %%APP_NAME%%/doc/java_tut/mail_form.xtp
 %%APP_NAME%%/doc/java_tut/multipart.xtp
 %%APP_NAME%%/doc/java_tut/parse_error.xtp
-%%APP_NAME%%/doc/java_tut/req_headers.xtp
 %%APP_NAME%%/doc/java_tut/plugin-dispatch.xtp
+%%APP_NAME%%/doc/java_tut/req_headers.xtp
 %%APP_NAME%%/doc/java_tut/req_url.xtp
 %%APP_NAME%%/doc/java_tut/run-at.xtp
 %%APP_NAME%%/doc/java_tut/run_error.xtp
@@ -186,36 +222,6 @@
 %%APP_NAME%%/doc/java_tut/xtp-jsp.xtp
 %%APP_NAME%%/doc/java_tut/xtp-page.xtp
 %%APP_NAME%%/doc/java_tut/xtp-strict.xtp
-%%APP_NAME%%/doc/java_tut/javadoc/constant-values.html
-%%APP_NAME%%/doc/java_tut/javadoc/resources/inherit.gif
-%%APP_NAME%%/doc/java_tut/javadoc/overview-tree.html
-%%APP_NAME%%/doc/java_tut/javadoc/index-all.html
-%%APP_NAME%%/doc/java_tut/javadoc/deprecated-list.html
-%%APP_NAME%%/doc/java_tut/javadoc/allclasses-frame.html
-%%APP_NAME%%/doc/java_tut/javadoc/allclasses-noframe.html
-%%APP_NAME%%/doc/java_tut/javadoc/index.html
-%%APP_NAME%%/doc/java_tut/javadoc/packages.html
-%%APP_NAME%%/doc/java_tut/javadoc/overview-summary.html
-%%APP_NAME%%/doc/java_tut/javadoc/overview-frame.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-frame.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-summary.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/package-tree.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/HelloServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/InitServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/MappingServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic/URLServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-frame.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-summary.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/package-tree.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/InitDatabaseServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database/QueryServlet.html
-%%APP_NAME%%/doc/java_tut/javadoc/serialized-form.html
-%%APP_NAME%%/doc/java_tut/javadoc/package-list
-%%APP_NAME%%/doc/java_tut/javadoc/help-doc.html
-%%APP_NAME%%/doc/java_tut/javadoc/stylesheet.css
-%%APP_NAME%%/doc/java_tut/images/same_srun.gif
-%%APP_NAME%%/doc/java_tut/images/srunc.gif
-%%APP_NAME%%/doc/ref/jsp/jsp-el.xtp
 %%APP_NAME%%/doc/ref/admin.xtp
 %%APP_NAME%%/doc/ref/app-config.xtp
 %%APP_NAME%%/doc/ref/atp.xtp
@@ -236,16 +242,6 @@
 %%APP_NAME%%/doc/ref/cse-netscape.xtp
 %%APP_NAME%%/doc/ref/cse-oreilly-website.xtp
 %%APP_NAME%%/doc/ref/db-config.xtp
-%%APP_NAME%%/doc/ref/xml/attributes.xtp
-%%APP_NAME%%/doc/ref/xml/elements.xtp
-%%APP_NAME%%/doc/ref/xml/get_elements.xtp
-%%APP_NAME%%/doc/ref/xml/html.xtp
-%%APP_NAME%%/doc/ref/xml/index.xtp
-%%APP_NAME%%/doc/ref/xml/intro.xtp
-%%APP_NAME%%/doc/ref/xml/parsing.xtp
-%%APP_NAME%%/doc/ref/xml/sax.xtp
-%%APP_NAME%%/doc/ref/xml/text.xtp
-%%APP_NAME%%/doc/ref/xml/vfs.xtp
 %%APP_NAME%%/doc/ref/ejb-ias.xtp
 %%APP_NAME%%/doc/ref/ejb-jboss.xtp
 %%APP_NAME%%/doc/ref/ejb-jonas.xtp
@@ -271,6 +267,7 @@
 %%APP_NAME%%/doc/ref/jms.xtp
 %%APP_NAME%%/doc/ref/jmx.xtp
 %%APP_NAME%%/doc/ref/jndi.xtp
+%%APP_NAME%%/doc/ref/jsp/jsp-el.xtp
 %%APP_NAME%%/doc/ref/jsp-actions.xtp
 %%APP_NAME%%/doc/ref/jsp-applications.xtp
 %%APP_NAME%%/doc/ref/jsp-directives.xtp
@@ -290,6 +287,36 @@
 %%APP_NAME%%/doc/ref/servlet.xtp
 %%APP_NAME%%/doc/ref/servletcontext.xtp
 %%APP_NAME%%/doc/ref/sessions.xtp
+%%APP_NAME%%/doc/ref/srun-other.xtp
+%%APP_NAME%%/doc/ref/ssl-quick.xml
+%%APP_NAME%%/doc/ref/ssl-quick.xtp
+%%APP_NAME%%/doc/ref/ssl.xml
+%%APP_NAME%%/doc/ref/ssl.xtp
+%%APP_NAME%%/doc/ref/starting.xtp
+%%APP_NAME%%/doc/ref/static.xtp
+%%APP_NAME%%/doc/ref/stylescript.xtp
+%%APP_NAME%%/doc/ref/taglib.xtp
+%%APP_NAME%%/doc/ref/toc.xml
+%%APP_NAME%%/doc/ref/topics.xtp
+%%APP_NAME%%/doc/ref/trouble.xtp
+%%APP_NAME%%/doc/ref/velocity.xtp
+%%APP_NAME%%/doc/ref/virtual-host.xtp
+%%APP_NAME%%/doc/ref/visual-age.xtp
+%%APP_NAME%%/doc/ref/war-dir.xtp
+%%APP_NAME%%/doc/ref/webdav.xtp
+%%APP_NAME%%/doc/ref/xml/attributes.xtp
+%%APP_NAME%%/doc/ref/xml/elements.xtp
+%%APP_NAME%%/doc/ref/xml/get_elements.xtp
+%%APP_NAME%%/doc/ref/xml/html.xtp
+%%APP_NAME%%/doc/ref/xml/index.xtp
+%%APP_NAME%%/doc/ref/xml/intro.xtp
+%%APP_NAME%%/doc/ref/xml/parsing.xtp
+%%APP_NAME%%/doc/ref/xml/sax.xtp
+%%APP_NAME%%/doc/ref/xml/text.xtp
+%%APP_NAME%%/doc/ref/xml/vfs.xtp
+%%APP_NAME%%/doc/ref/xml.xtp
+%%APP_NAME%%/doc/ref/xpath-fun.xtp
+%%APP_NAME%%/doc/ref/xpath.xtp
 %%APP_NAME%%/doc/ref/xsl/apply-templates.xtp
 %%APP_NAME%%/doc/ref/xsl/attribute.xtp
 %%APP_NAME%%/doc/ref/xsl/boxes.xtp
@@ -310,56 +337,27 @@
 %%APP_NAME%%/doc/ref/xsl/xpath-select.xtp
 %%APP_NAME%%/doc/ref/xsl/xpath.xtp
 %%APP_NAME%%/doc/ref/xsl/xsl-api.xtp
-%%APP_NAME%%/doc/ref/xsl/xsl.xtp
 %%APP_NAME%%/doc/ref/xsl/xsl-boxes.xtp
-%%APP_NAME%%/doc/ref/srun-other.xtp
-%%APP_NAME%%/doc/ref/ssl-quick.xml
-%%APP_NAME%%/doc/ref/ssl-quick.xtp
-%%APP_NAME%%/doc/ref/ssl.xml
-%%APP_NAME%%/doc/ref/ssl.xtp
-%%APP_NAME%%/doc/ref/starting.xtp
-%%APP_NAME%%/doc/ref/static.xtp
-%%APP_NAME%%/doc/ref/stylescript.xtp
-%%APP_NAME%%/doc/ref/taglib.xtp
-%%APP_NAME%%/doc/ref/toc.xml
-%%APP_NAME%%/doc/ref/topics.xtp
-%%APP_NAME%%/doc/ref/trouble.xtp
-%%APP_NAME%%/doc/ref/velocity.xtp
-%%APP_NAME%%/doc/ref/virtual-host.xtp
-%%APP_NAME%%/doc/ref/visual-age.xtp
-%%APP_NAME%%/doc/ref/war-dir.xtp
-%%APP_NAME%%/doc/ref/webdav.xtp
-%%APP_NAME%%/doc/ref/xml.xtp
-%%APP_NAME%%/doc/ref/xpath-fun.xtp
-%%APP_NAME%%/doc/ref/xpath.xtp
+%%APP_NAME%%/doc/ref/xsl/xsl.xtp
 %%APP_NAME%%/doc/ref/xsl.xtp
 %%APP_NAME%%/doc/ref/xslt-lite-eg.xtp
 %%APP_NAME%%/doc/ref/xslt-lite.xtp
-%%APP_NAME%%/doc/ref/xtp-jsp.xtp
 %%APP_NAME%%/doc/ref/xtp-index.xtp
 %%APP_NAME%%/doc/ref/xtp-intro.xtp
+%%APP_NAME%%/doc/ref/xtp-jsp.xtp
 %%APP_NAME%%/doc/ref/xtp.xtp
-%%APP_NAME%%/doc/faq/classloader.xtp
-%%APP_NAME%%/doc/faq/config.xtp
-%%APP_NAME%%/doc/faq/debug.xtp
-%%APP_NAME%%/doc/faq/index.xtp
-%%APP_NAME%%/doc/faq/install.xtp
-%%APP_NAME%%/doc/faq/misc.xtp
-%%APP_NAME%%/doc/faq/servlet.xtp
-%%APP_NAME%%/doc/faq/ssl.xtp
-%%APP_NAME%%/doc/faq/toc.xml
-%%APP_NAME%%/doc/css/default.css
-%%APP_NAME%%/lib/resin.jar
-%%APP_NAME%%/lib/jsdk23.jar
-%%APP_NAME%%/lib/jdbc2_0-stdext.jar
-%%APP_NAME%%/lib/jta_101.jar
-%%APP_NAME%%/lib/jndi.jar
+%%APP_NAME%%/doc/toc.xml
 %%APP_NAME%%/lib/dom.jar
-%%APP_NAME%%/lib/sax.jar
 %%APP_NAME%%/lib/jaxp.jar
+%%APP_NAME%%/lib/jdbc-mysql.jar
+%%APP_NAME%%/lib/jdbc2_0-stdext.jar
 %%APP_NAME%%/lib/jmx.jar
+%%APP_NAME%%/lib/jndi.jar
+%%APP_NAME%%/lib/jsdk23.jar
+%%APP_NAME%%/lib/jta_101.jar
+%%APP_NAME%%/lib/resin.jar
+%%APP_NAME%%/lib/sax.jar
 %%APP_NAME%%/lib/webutil.jar
-%%APP_NAME%%/lib/jdbc-mysql.jar
 %%APP_NAME%%/xsl/caucho/comment.xsl
 %%APP_NAME%%/xsl/caucho/contents.xsl
 %%APP_NAME%%/xsl/caucho/control.xsl
@@ -374,19 +372,20 @@
 %%APP_NAME%%/xsl/default.xsl
 %%APP_NAME%%/xsl/doc_header.xsl
 %%APP_NAME%%/xsl/header.xsl
+%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl
+%%APP_NAME%%/xsl/js/caucho/format.xsl
+%%APP_NAME%%/xsl/js/caucho/weblog.xsl
 %%APP_NAME%%/xsl/js_header.xsl
 %%APP_NAME%%/xsl/new_doc_header.xsl
 %%APP_NAME%%/xsl/search.xsl
 %%APP_NAME%%/xsl/subpage.xsl
-%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl
-%%APP_NAME%%/xsl/js/caucho/format.xsl
-%%APP_NAME%%/xsl/js/caucho/weblog.xsl
 %%APP_NAME%%/libexec/libresin.so
 etc/rc.d/%%APP_NAME%%.sh
 sbin/%%APP_NAME%%ctl
 %%MOD_DIR%%/mod_caucho.so
 %%APACHE%%@exec %%APXS%% -e -a -n caucho %f
 %%APACHE%%@unexec %%APXS%% -e -A -n caucho %f
+@dirrm %%APP_NAME%%/doc/css
 @dirrm %%APP_NAME%%/doc/examples/basic/WEB-INF/classes
 @dirrm %%APP_NAME%%/doc/examples/basic/WEB-INF
 @dirrm %%APP_NAME%%/doc/examples/basic/com/caucho/fortune
@@ -424,6 +423,7 @@ sbin/%%APP_NAME%%ctl
 @dirrm %%APP_NAME%%/doc/examples/xsl/data
 @dirrm %%APP_NAME%%/doc/examples/xsl
 @dirrm %%APP_NAME%%/doc/examples
+@dirrm %%APP_NAME%%/doc/faq
 @dirrm %%APP_NAME%%/doc/images
 @dirrm %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/basic
 @dirrm %%APP_NAME%%/doc/java_tut/WEB-INF/classes/example/servlet/database
@@ -432,20 +432,18 @@ sbin/%%APP_NAME%%ctl
 @dirrm %%APP_NAME%%/doc/java_tut/WEB-INF/classes
 @dirrm %%APP_NAME%%/doc/java_tut/WEB-INF/sql
 @dirrm %%APP_NAME%%/doc/java_tut/WEB-INF
-@dirrm %%APP_NAME%%/doc/java_tut/javadoc/resources
+@dirrm %%APP_NAME%%/doc/java_tut/images
 @dirrm %%APP_NAME%%/doc/java_tut/javadoc/example/servlet/basic
 @dirrm %%APP_NAME%%/doc/java_tut/javadoc/example/servlet/database
 @dirrm %%APP_NAME%%/doc/java_tut/javadoc/example/servlet
 @dirrm %%APP_NAME%%/doc/java_tut/javadoc/example
+@dirrm %%APP_NAME%%/doc/java_tut/javadoc/resources
 @dirrm %%APP_NAME%%/doc/java_tut/javadoc
-@dirrm %%APP_NAME%%/doc/java_tut/images
 @dirrm %%APP_NAME%%/doc/java_tut
 @dirrm %%APP_NAME%%/doc/ref/jsp
 @dirrm %%APP_NAME%%/doc/ref/xml
 @dirrm %%APP_NAME%%/doc/ref/xsl
 @dirrm %%APP_NAME%%/doc/ref
-@dirrm %%APP_NAME%%/doc/faq
-@dirrm %%APP_NAME%%/doc/css
 @dirrm %%APP_NAME%%/doc
 @dirrm %%APP_NAME%%/lib
 @dirrm %%APP_NAME%%/xsl/caucho