4 files changed, 155 insertions, 87 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 01739a0029f0..ade6cf1e4779 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION= 	1.7.4
+PORTVERSION= 	1.8
 CATEGORIES=	textproc www java
 MASTER_SITES=	http://xml.apache.org/cocoon/dist/
 DISTNAME=	Cocoon-${PORTVERSION}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 JDK_VERSION=	1.1.8
 CLASSPATH=	${LOCALBASE}/jdk${JDK_VERSION}/lib/classes.zip
-LIBS=		fop_0_12_1.jar xalan_1_0_1.jar xerces_1_0_3.jar
+LIBS=		fop_0_13_0.jar xalan_1_2_D02.jar xerces_1_2.jar
 JDIR=		${PREFIX}/share/java/classes
 CDIR=		${PREFIX}/etc/apache/cocoon
 SDIR=		${PREFIX}/share/java/cocoon
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index f2bec65928be..b8a79445ff66 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon-1.7.4.tar.gz) = 184467d297cf7e876a54644af3cfe39f
+MD5 (Cocoon-1.8.tar.gz) = 7fa79afbb60ab210752f34636c124dd1
diff --git a/www/cocoon/pkg-message b/www/cocoon/pkg-message
index 18fc522d86a0..d5b436f736d6 100644
--- a/www/cocoon/pkg-message
+++ b/www/cocoon/pkg-message
@@ -7,9 +7,9 @@ To activate Cocoon:
 (2) Add following lines into jserv.properties.
 
 	"wrapper.classpath=/usr/local/share/java/classes/cocoon.jar"
-	"wrapper.classpath=/usr/local/share/java/classes/xerces_1_0_3.jar"
-	"wrapper.classpath=/usr/local/share/java/classes/xalan_1_0_1.jar"
-	"wrapper.classpath=/usr/local/share/java/classes/fop_0_12_1.jar"
+	"wrapper.classpath=/usr/local/share/java/classes/xerces_1_2.jar"
+	"wrapper.classpath=/usr/local/share/java/classes/xalan_1_2_D02.jar"
+	"wrapper.classpath=/usr/local/share/java/classes/fop_0_13_0.jar"
 
 (3) Add following line into zone.properties.
 
diff --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index 214d7e7d2176..4ce162ba3458 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -3,41 +3,16 @@ etc/apache/cocoon/cocoon.properties.default
 @exec [ ! -f %B/cocoon.properties ] && cp %B/%f %B/cocoon.properties
 @unexec rmdir %D/etc/apache/cocoon > /dev/null 2>&1 || true
 share/java/classes/cocoon.jar
-share/java/classes/fop_0_12_1.jar
-share/java/classes/xalan_1_0_1.jar
-share/java/classes/xerces_1_0_3.jar
+share/java/classes/fop_0_13_0.jar
+share/java/classes/xalan_1_2_D02.jar
+share/java/classes/xerces_1_2.jar
 %%DOC%%share/java/cocoon/LICENSE
 %%DOC%%share/java/cocoon/README
-%%DOC%%share/java/cocoon/docs/changes.html
-%%DOC%%share/java/cocoon/docs/cocoon2.html
-%%DOC%%share/java/cocoon/docs/dcp.html
-%%DOC%%share/java/cocoon/docs/dynamic.html
-%%DOC%%share/java/cocoon/docs/faqs.html
-%%DOC%%share/java/cocoon/docs/guide.html
-%%DOC%%share/java/cocoon/docs/index.html
-%%DOC%%share/java/cocoon/docs/infrastracture.html
-%%DOC%%share/java/cocoon/docs/install.html
-%%DOC%%share/java/cocoon/docs/javadoc.html
-%%DOC%%share/java/cocoon/docs/ldap.html
-%%DOC%%share/java/cocoon/docs/license.html
-%%DOC%%share/java/cocoon/docs/livesites.html
-%%DOC%%share/java/cocoon/docs/sql.html
-%%DOC%%share/java/cocoon/docs/sqltablig.html
-%%DOC%%share/java/cocoon/docs/technologies.html
-%%DOC%%share/java/cocoon/docs/todo.html
-%%DOC%%share/java/cocoon/docs/wd-xsp.html
-%%DOC%%share/java/cocoon/docs/xsp.html
 %%DOC%%share/java/cocoon/docs/api/allclasses-frame.html
 %%DOC%%share/java/cocoon/docs/api/deprecated-list.html
 %%DOC%%share/java/cocoon/docs/api/help-doc.html
 %%DOC%%share/java/cocoon/docs/api/index.html
 %%DOC%%share/java/cocoon/docs/api/javadoc.css
-%%DOC%%share/java/cocoon/docs/api/overview-frame.html
-%%DOC%%share/java/cocoon/docs/api/overview-summary.html
-%%DOC%%share/java/cocoon/docs/api/overview-tree.html
-%%DOC%%share/java/cocoon/docs/api/package-list
-%%DOC%%share/java/cocoon/docs/api/packages.html
-%%DOC%%share/java/cocoon/docs/api/serialized-form.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Browsers.Browser.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Browsers.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Cocoon.html
@@ -47,11 +22,11 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/EngineWrapper.HttpServletResponseImpl.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/EngineWrapper.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Frontend.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Profiler.ProfProcess.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Profiler.RequestMarker.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Profiler.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Tokenizer.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/Utils.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/cache/Cache.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/cache/CocoonCache.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/cache/NoCache.html
@@ -103,22 +78,15 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/InterpreterFactory.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/LanguageException.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Module.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-tree.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptEvaluator.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInstance.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInterpreter.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptModule.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInstance.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInterpreter.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaModule.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/AbstractLogger.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/Logger.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/ServletLogger.html
@@ -126,9 +94,11 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/logger/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/AbstractParser.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/Parser.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/SunXMLParser.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/XercesParser.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-summary.html
@@ -137,9 +107,6 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/Processor.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorException.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorFactory.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPEngine.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPException.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPProcessor.html
@@ -154,6 +121,9 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ldap/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ldap/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ldap/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/sql/ConnectionCreator.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/sql/ConnectionDefs.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/sql/DefaultQueryCreator.html
@@ -178,26 +148,36 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/XSPProcessor.PageEntry.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/XSPProcessor.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/XSPUtil.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/XSPLanguageProcessor.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/XSPPreprocessor.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-frame.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-summary.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/JavaCompiler.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/JikesJavaCompiler.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/SunJavaCompiler.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/XSPClassLoader.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/XSPJavaPreprocessor.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/XSPJavaProcessor.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPContextLibrary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPCookieLibrary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPGlobalLibrary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPRequestLibrary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPResponseLibrary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/XSPSessionLibrary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/calendar/XSPCalendar.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/calendar/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/calendar/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/calendar/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/fpError.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/fpLibrary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/fpResource.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/package-tree.html
@@ -206,11 +186,13 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/sql/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/sql/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/sql/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-frame.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-summary.html
+%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/AbstractProducer.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/Producer.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/ProducerFactory.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/ProducerFromFile.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/ProducerFromRequest.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-tree.html
@@ -220,7 +202,6 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-tree.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/Transformer.html
-%%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XTTransformer.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XalanTransformer.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-summary.html
@@ -229,6 +210,19 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-frame.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-summary.html
 %%DOC%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-tree.html
+%%DOC%%share/java/cocoon/docs/api/overview-frame.html
+%%DOC%%share/java/cocoon/docs/api/overview-summary.html
+%%DOC%%share/java/cocoon/docs/api/overview-tree.html
+%%DOC%%share/java/cocoon/docs/api/package-list
+%%DOC%%share/java/cocoon/docs/api/packages.html
+%%DOC%%share/java/cocoon/docs/api/serialized-form.html
+%%DOC%%share/java/cocoon/docs/changes.html
+%%DOC%%share/java/cocoon/docs/cocoon2.html
+%%DOC%%share/java/cocoon/docs/connection-pool.html
+%%DOC%%share/java/cocoon/docs/dcp.html
+%%DOC%%share/java/cocoon/docs/dynamic.html
+%%DOC%%share/java/cocoon/docs/faqs.html
+%%DOC%%share/java/cocoon/docs/fp.html
 %%DOC%%share/java/cocoon/docs/graphics/changes-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/changes-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/changes-label-2.jpg
@@ -237,6 +231,10 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/graphics/cocoon2-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/cocoon2-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/cocoon2-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/connection-pool-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/connection-pool-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/connection-pool-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/connection-pool-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/dcp-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/dcp-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/dcp-label-2.jpg
@@ -245,45 +243,54 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/graphics/dynamic-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/dynamic-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/dynamic-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-36-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-36-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-36-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-58-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-58-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-58-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-60-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-60-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-60-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-62-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-62-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-62-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-64-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-64-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/ext-64-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-48-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-48-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-48-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-68-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-68-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-68-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-70-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-70-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-70-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-74-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-74-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/ext-74-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/faqs-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/faqs-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/faqs-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/faqs-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/fp-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/fp-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/fp-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/fp-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/guide-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/guide-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/guide-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/guide-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/how-it-works-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/how-it-works-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/how-it-works-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/how-it-works-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/index-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/index-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/index-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/index-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/infrastracture-header.jpg
-%%DOC%%share/java/cocoon/docs/graphics/infrastracture-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/infrastracture-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/infrastracture-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/infrastructure-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/infrastructure-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/infrastructure-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/infrastructure-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-solaris-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-solaris-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-solaris-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-solaris-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-windows-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-windows-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-windows-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/install-case-windows-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/install-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/install-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/install-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/install-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/javadoc-header.jpg
-%%DOC%%share/java/cocoon/docs/graphics/javadoc-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/javadoc-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/javadoc-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/ldap-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/ldap-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/ldap-label-2.jpg
@@ -296,14 +303,18 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/graphics/livesites-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/livesites-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/livesites-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/mail-lists-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/mail-lists-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/mail-lists-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/mail-lists-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/sql-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/sql-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/sql-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/sql-label-3.jpg
-%%DOC%%share/java/cocoon/docs/graphics/sqltablig-header.jpg
-%%DOC%%share/java/cocoon/docs/graphics/sqltablig-label-1.jpg
-%%DOC%%share/java/cocoon/docs/graphics/sqltablig-label-2.jpg
-%%DOC%%share/java/cocoon/docs/graphics/sqltablig-label-3.jpg
+%%DOC%%share/java/cocoon/docs/graphics/sqltaglib-header.jpg
+%%DOC%%share/java/cocoon/docs/graphics/sqltaglib-label-1.jpg
+%%DOC%%share/java/cocoon/docs/graphics/sqltaglib-label-2.jpg
+%%DOC%%share/java/cocoon/docs/graphics/sqltaglib-label-3.jpg
 %%DOC%%share/java/cocoon/docs/graphics/technologies-header.jpg
 %%DOC%%share/java/cocoon/docs/graphics/technologies-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/technologies-label-2.jpg
@@ -320,6 +331,8 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/graphics/xsp-label-1.jpg
 %%DOC%%share/java/cocoon/docs/graphics/xsp-label-2.jpg
 %%DOC%%share/java/cocoon/docs/graphics/xsp-label-3.jpg
+%%DOC%%share/java/cocoon/docs/guide.html
+%%DOC%%share/java/cocoon/docs/how-it-works.html
 %%DOC%%share/java/cocoon/docs/images/add.jpg
 %%DOC%%share/java/cocoon/docs/images/cocoon-small.jpg
 %%DOC%%share/java/cocoon/docs/images/cocoon.jpg
@@ -331,6 +344,51 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/images/remove.jpg
 %%DOC%%share/java/cocoon/docs/images/schema.jpg
 %%DOC%%share/java/cocoon/docs/images/update.jpg
+%%DOC%%share/java/cocoon/docs/index.html
+%%DOC%%share/java/cocoon/docs/infrastructure.html
+%%DOC%%share/java/cocoon/docs/install.html
+%%DOC%%share/java/cocoon/docs/install-case-solaris.html
+%%DOC%%share/java/cocoon/docs/install-case-windows.html
+%%DOC%%share/java/cocoon/docs/ldap.html
+%%DOC%%share/java/cocoon/docs/license.html
+%%DOC%%share/java/cocoon/docs/livesites.html
+%%DOC%%share/java/cocoon/docs/mail-lists.html
+%%DOC%%share/java/cocoon/docs/printer/changes.html
+%%DOC%%share/java/cocoon/docs/printer/cocoon2.html
+%%DOC%%share/java/cocoon/docs/printer/connection-pool.html
+%%DOC%%share/java/cocoon/docs/printer/dcp.html
+%%DOC%%share/java/cocoon/docs/printer/dynamic.html
+%%DOC%%share/java/cocoon/docs/printer/faqs.html
+%%DOC%%share/java/cocoon/docs/printer/fp.html
+%%DOC%%share/java/cocoon/docs/printer/guide.html
+%%DOC%%share/java/cocoon/docs/printer/how-it-works.html
+%%DOC%%share/java/cocoon/docs/printer/images/add.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/cocoon-small.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/cocoon.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/cocoon2.gif
+%%DOC%%share/java/cocoon/docs/printer/images/dcp-fig-1.gif
+%%DOC%%share/java/cocoon/docs/printer/images/dcp-fig-2.gif
+%%DOC%%share/java/cocoon/docs/printer/images/fix.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/pyramid-model.gif
+%%DOC%%share/java/cocoon/docs/printer/images/remove.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/schema.jpg
+%%DOC%%share/java/cocoon/docs/printer/images/update.jpg
+%%DOC%%share/java/cocoon/docs/printer/index.html
+%%DOC%%share/java/cocoon/docs/printer/infrastructure.html
+%%DOC%%share/java/cocoon/docs/printer/install-case-solaris.html
+%%DOC%%share/java/cocoon/docs/printer/install-case-windows.html
+%%DOC%%share/java/cocoon/docs/printer/install.html
+%%DOC%%share/java/cocoon/docs/printer/ldap.html
+%%DOC%%share/java/cocoon/docs/printer/license.html
+%%DOC%%share/java/cocoon/docs/printer/livesites.html
+%%DOC%%share/java/cocoon/docs/printer/mail-lists.html
+%%DOC%%share/java/cocoon/docs/printer/resources/simple.css
+%%DOC%%share/java/cocoon/docs/printer/sql.html
+%%DOC%%share/java/cocoon/docs/printer/sqltaglib.html
+%%DOC%%share/java/cocoon/docs/printer/technologies.html
+%%DOC%%share/java/cocoon/docs/printer/todo.html
+%%DOC%%share/java/cocoon/docs/printer/wd-xsp.html
+%%DOC%%share/java/cocoon/docs/printer/xsp.html
 %%DOC%%share/java/cocoon/docs/resources/bar-border-bottom.gif
 %%DOC%%share/java/cocoon/docs/resources/bar-border-left.gif
 %%DOC%%share/java/cocoon/docs/resources/bar-border-right.gif
@@ -356,12 +414,17 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%share/java/cocoon/docs/resources/script.js
 %%DOC%%share/java/cocoon/docs/resources/separator.gif
 %%DOC%%share/java/cocoon/docs/resources/void.gif
+%%DOC%%share/java/cocoon/docs/sql.html
+%%DOC%%share/java/cocoon/docs/sqltaglib.html
+%%DOC%%share/java/cocoon/docs/technologies.html
+%%DOC%%share/java/cocoon/docs/todo.html
+%%DOC%%share/java/cocoon/docs/wd-xsp.html
+%%DOC%%share/java/cocoon/docs/xsp.html
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/dcp
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/example
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/framework
-%%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/logger
@@ -373,6 +436,8 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language/java
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/language
+%%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/calendar
+%%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/fp
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library/sql
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp/library
 %%DOC%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp
@@ -387,6 +452,9 @@ share/java/classes/xerces_1_0_3.jar
 %%DOC%%@dirrm share/java/cocoon/docs/api/org
 %%DOC%%@dirrm share/java/cocoon/docs/api
 %%DOC%%@dirrm share/java/cocoon/docs/graphics
+%%DOC%%@dirrm share/java/cocoon/docs/printer/images
+%%DOC%%@dirrm share/java/cocoon/docs/printer/resources
+%%DOC%%@dirrm share/java/cocoon/docs/printer
 %%DOC%%@dirrm share/java/cocoon/docs/images
 %%DOC%%@dirrm share/java/cocoon/docs/resources
 %%DOC%%@dirrm share/java/cocoon/docs