3 files changed, 248 insertions, 67 deletions

diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index 74100f952ce0..03eb53f547c3 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	Cocoon_1.3.1
-PKGNAME=	cocoon-1.3.1
+DISTNAME=	Cocoon_1.4
+PKGNAME=	cocoon-1.4
 CATEGORIES=	textproc www java
 MASTER_SITES=	http://java.apache.org/cocoon/dist/
 EXTRACT_SUFX=	.jar
@@ -29,12 +29,12 @@ JAVASUBDIR=	jdk1.1.8
 do-install:
 	@${MKDIR} ${PREFIX}/share/java/classes ${PREFIX}/share/java/cocoon
 	@(cd ${WRKSRC}/bin; \
-	  ${INSTALL_DATA} Cocoon.jar openxml.jar xslp.jar \
+	  ${INSTALL_DATA} Cocoon.jar fop.091.jar openxml.106.jar xslp.19990832.jar \
 		${PREFIX}/share/java/classes)
 	@(cd ${WRKSRC}; \
 	 ${CP} -R [L-Rd-i]* ${PREFIX}/share/java/cocoon)
-	@${INSTALL_DATA} ${FILESDIR}/cocoon.properties.default \
-		${PREFIX}/etc/apache
+	@${INSTALL_DATA} ${WRKSRC}/bin/cocoon.properties \
+		${PREFIX}/etc/apache/cocoon.properties.default
 
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
diff --git a/textproc/cocoon/distinfo b/textproc/cocoon/distinfo
index 5bb8138e5db8..9f832ca9a24b 100644
--- a/textproc/cocoon/distinfo
+++ b/textproc/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon_1.3.1.jar) = 0dc6d1c329dcdbb24909015ad916a426
+MD5 (Cocoon_1.4.jar) = 89af0c237a469bc436e0c7d17fa11246
diff --git a/textproc/cocoon/pkg-plist b/textproc/cocoon/pkg-plist
index 2aec639741be..7ab0f5aa5acf 100644
--- a/textproc/cocoon/pkg-plist
+++ b/textproc/cocoon/pkg-plist
@@ -1,7 +1,8 @@
 etc/apache/cocoon.properties.default
 share/java/classes/Cocoon.jar
-share/java/classes/openxml.jar
-share/java/classes/xslp.jar
+share/java/classes/fop.091.jar
+share/java/classes/openxml.106.jar
+share/java/classes/xslp.19990832.jar
 share/java/cocoon/LICENSE
 share/java/cocoon/META-INF/MANIFEST.MF
 share/java/cocoon/README
@@ -16,24 +17,17 @@ share/java/cocoon/docs/api/org/apache/cocoon/Browsers.html
 share/java/cocoon/docs/api/org/apache/cocoon/Cocoon.html
 share/java/cocoon/docs/api/org/apache/cocoon/Defaults.html
 share/java/cocoon/docs/api/org/apache/cocoon/Engine.html
+share/java/cocoon/docs/api/org/apache/cocoon/EngineWrapper.HttpServletRequestImpl.html
+share/java/cocoon/docs/api/org/apache/cocoon/EngineWrapper.HttpServletResponseImpl.html
+share/java/cocoon/docs/api/org/apache/cocoon/EngineWrapper.html
 share/java/cocoon/docs/api/org/apache/cocoon/Frontend.html
 share/java/cocoon/docs/api/org/apache/cocoon/Utils.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/AbstractCache.html
 share/java/cocoon/docs/api/org/apache/cocoon/cache/Cache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/CachedObject.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/CheckDateCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/DoNothingCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/ForeverCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/Latch.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/Sync.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/AbstractCache.html
+share/java/cocoon/docs/api/org/apache/cocoon/cache/CocoonCache.html
+share/java/cocoon/docs/api/org/apache/cocoon/cache/NoCache.html
 share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/Cache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/CachedObject.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/CheckDateCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/DoNothingCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/ForeverCache.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/Latch.html
-share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/Sync.html
+share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/CocoonCache.html
+share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use/NoCache.html
 share/java/cocoon/docs/api/org/apache/cocoon/cache/package-frame.html
 share/java/cocoon/docs/api/org/apache/cocoon/cache/package-summary.html
 share/java/cocoon/docs/api/org/apache/cocoon/cache/package-tree.html
@@ -43,66 +37,219 @@ share/java/cocoon/docs/api/org/apache/cocoon/class-use/Browsers.html
 share/java/cocoon/docs/api/org/apache/cocoon/class-use/Cocoon.html
 share/java/cocoon/docs/api/org/apache/cocoon/class-use/Defaults.html
 share/java/cocoon/docs/api/org/apache/cocoon/class-use/Engine.html
+share/java/cocoon/docs/api/org/apache/cocoon/class-use/EngineWrapper.HttpServletRequestImpl.html
+share/java/cocoon/docs/api/org/apache/cocoon/class-use/EngineWrapper.HttpServletResponseImpl.html
+share/java/cocoon/docs/api/org/apache/cocoon/class-use/EngineWrapper.html
 share/java/cocoon/docs/api/org/apache/cocoon/class-use/Frontend.html
 share/java/cocoon/docs/api/org/apache/cocoon/class-use/Utils.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/DefaultDCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/ServletDCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/class-use/DefaultDCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/class-use/ServletDCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/DCPExample.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/DummyProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/class-use/DCPExample.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/class-use/DummyProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/example/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/Formatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/FormatterFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/OpenXMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/class-use/Formatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/class-use/FormatterFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/class-use/OpenXMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/OpenXMLHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/XSLPHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/class-use/OpenXMLHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/class-use/XSLPHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/FOPFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/class-use/FOPFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/OpenXMLXHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/class-use/OpenXMLXHTMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/OpenXMLXMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/class-use/OpenXMLXMLFormatter.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/AbstractActor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Actor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Changeable.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurable.html
-share/java/cocoon/docs/api/org/apache/cocoon/framework/ConfigurationFactory.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurations.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Director.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/Factory.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/InitializationException.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Manager.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Monitor.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Monitor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Page.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/Router.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/Status.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/AbstractActor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Actor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Changeable.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Configurable.html
-share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/ConfigurationFactory.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Configurations.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Director.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Factory.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/InitializationException.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Manager.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Monitor.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Monitor.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Page.html
+share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Router.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use/Status.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/package-frame.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/package-summary.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/package-tree.html
 share/java/cocoon/docs/api/org/apache/cocoon/framework/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/AbstractInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Instance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Interpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/InterpreterFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/LanguageException.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Module.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/AbstractInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/Instance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/Interpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/InterpreterFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/LanguageException.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use/Module.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptEvaluator.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInstance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptModule.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/class-use/EcmaScriptEvaluator.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/class-use/EcmaScriptInstance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/class-use/EcmaScriptInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/class-use/EcmaScriptModule.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInstance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaModule.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/class-use/JavaInstance.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/class-use/JavaInterpreter.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/class-use/JavaModule.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/interpreter/package-use.html
 share/java/cocoon/docs/api/org/apache/cocoon/package-frame.html
 share/java/cocoon/docs/api/org/apache/cocoon/package-summary.html
 share/java/cocoon/docs/api/org/apache/cocoon/package-tree.html
 share/java/cocoon/docs/api/org/apache/cocoon/package-use.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/IBMXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/OpenXMLParser.html
+share/java/cocoon/docs/api/org/apache/cocoon/parser/OracleXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/Parser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/SunXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use/IBMXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use/OpenXMLParser.html
+share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use/OracleXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use/Parser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use/SunXMLParser.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/package-frame.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/package-summary.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/package-tree.html
 share/java/cocoon/docs/api/org/apache/cocoon/parser/package-use.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/OpenXMLPrinter.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/Printer.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/SunPrinter.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/class-use/OpenXMLPrinter.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/class-use/Printer.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/class-use/SunPrinter.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/package-frame.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/package-summary.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/package-tree.html
-share/java/cocoon/docs/api/org/apache/cocoon/printer/package-use.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/AbstractXSLProcessor.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/LotusXSLProcessor.XMLParser.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/LotusXSLProcessor.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/PINotFoundException.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/Processor.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorException.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/XSLPProcessor.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/AbstractXSLProcessor.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/LotusXSLProcessor.XMLParser.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/LotusXSLProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorFactory.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/PINotFoundException.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/Processor.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/ProcessorException.html
-share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/XSLPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use/ProcessorFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPEngine.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPException.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/DCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/class-use/DCPEngine.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/class-use/DCPException.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/class-use/DCPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/package-use.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/package-frame.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/package-summary.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/package-tree.html
 share/java/cocoon/docs/api/org/apache/cocoon/processor/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/AbstractXSLTProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/LotusXSLProcessor.XMLParser.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/LotusXSLProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/OracleXSLProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/XSLPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use/AbstractXSLTProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use/LotusXSLProcessor.XMLParser.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use/LotusXSLProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use/OracleXSLProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use/XSLPProcessor.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/AbstractProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/FileProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/Producer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/ProducerFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/class-use/AbstractProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/class-use/FileProducer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/class-use/Producer.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/class-use/ProducerFactory.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/producer/package-use.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/CocoonStore.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Memorizer.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Memorizer.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/MemoryStore.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Serializer.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Serializer.ExtensionFileFilter.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Serializer.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/Store.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/CocoonStore.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Memorizer.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Memorizer.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/MemoryStore.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Serializer.Container.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Serializer.ExtensionFileFilter.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Serializer.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/class-use/Store.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/package-frame.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/package-summary.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/package-tree.html
+share/java/cocoon/docs/api/org/apache/cocoon/store/package-use.html
 share/java/cocoon/docs/api/overview-frame.html
 share/java/cocoon/docs/api/overview-summary.html
 share/java/cocoon/docs/api/overview-tree.html
@@ -112,60 +259,94 @@ share/java/cocoon/docs/api/serialized-form.html
 share/java/cocoon/docs/api/stylesheet.css
 share/java/cocoon/docs/changes.html
 share/java/cocoon/docs/contributing.html
+share/java/cocoon/docs/dcp.html
 share/java/cocoon/docs/faq.html
 share/java/cocoon/docs/guide.html
 share/java/cocoon/docs/images/cocoon.jpg
 share/java/cocoon/docs/images/java-apache-project.gif
+share/java/cocoon/docs/images/schema.jpg
 share/java/cocoon/docs/index.html
 share/java/cocoon/docs/installing.html
 share/java/cocoon/docs/license/license.cocoon.html
+share/java/cocoon/docs/license/license.fop.html
 share/java/cocoon/docs/license/license.openxml.html
 share/java/cocoon/docs/license/license.xslp.html
 share/java/cocoon/docs/stylesheet.css
 share/java/cocoon/docs/todo.html
 share/java/cocoon/docs/xsp/WD-xsp.html
-share/java/cocoon/example/hello/hello.html
+share/java/cocoon/example/dcp/ecmascript/sample.es
+share/java/cocoon/example/dcp/ecmascript/sample.xml
+share/java/cocoon/example/dcp/java/sample.xml
+share/java/cocoon/example/dcp/sample.xsl
+share/java/cocoon/example/fo/darkness.xml
+share/java/cocoon/example/fo/darkness.xsl
+share/java/cocoon/example/fo/test.fo.xml
 share/java/cocoon/example/hello/hello.xml
 share/java/cocoon/example/hello/hello.xsl
 share/java/cocoon/example/index.html
-share/java/cocoon/example/java.apache.org/news.html
 share/java/cocoon/example/java.apache.org/news.text.xsl
 share/java/cocoon/example/java.apache.org/news.xml
 share/java/cocoon/example/java.apache.org/news.xsl
-share/java/cocoon/example/trilug/events.xml
-share/java/cocoon/example/trilug/events.xsl
-share/java/cocoon/example/trilug/resources.xml
-share/java/cocoon/example/trilug/resources.xsl
-share/java/cocoon/example/trilug/sidebar.xml
-share/java/cocoon/example/trilug/talks.xml
-share/java/cocoon/example/trilug/talks.xsl
+share/java/cocoon/example/wap/portfolio.html.xsl
+share/java/cocoon/example/wap/portfolio.wml.xsl
+share/java/cocoon/example/wap/portfolio.xml
 share/java/cocoon/example/xsp/page.xml
 share/java/cocoon/example/xsp/page.xsl
 share/java/cocoon/example/xsp/page.xsp
 share/java/cocoon/index.html
-@dirrm share/java/cocoon/META-INF
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/class-use
+@dirrm share/java/cocoon/example/fo
+@dirrm share/java/cocoon/example/wap
+@dirrm share/java/cocoon/example/java.apache.org
+@dirrm share/java/cocoon/example/hello
+@dirrm share/java/cocoon/example/xsp
+@dirrm share/java/cocoon/example/dcp/ecmascript
+@dirrm share/java/cocoon/example/dcp/java
+@dirrm share/java/cocoon/example/dcp
+@dirrm share/java/cocoon/example
+@dirrm share/java/cocoon/docs/images
+@dirrm share/java/cocoon/docs/license
+@dirrm share/java/cocoon/docs/xsp
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xslt
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/dcp
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/example/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/example
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/producer/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/producer
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/html/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/html
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/xhtml
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/pdf
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/xml
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter
 @dirrm share/java/cocoon/docs/api/org/apache/cocoon/framework/class-use
 @dirrm share/java/cocoon/docs/api/org/apache/cocoon/framework
 @dirrm share/java/cocoon/docs/api/org/apache/cocoon/parser/class-use
 @dirrm share/java/cocoon/docs/api/org/apache/cocoon/parser
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/printer/class-use
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/printer
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/class-use
-@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/dcp/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/dcp
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/store/class-use
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/store
+@dirrm share/java/cocoon/docs/api/org/apache/cocoon/class-use
 @dirrm share/java/cocoon/docs/api/org/apache/cocoon
 @dirrm share/java/cocoon/docs/api/org/apache
 @dirrm share/java/cocoon/docs/api/org
 @dirrm share/java/cocoon/docs/api
-@dirrm share/java/cocoon/docs/images
-@dirrm share/java/cocoon/docs/license
-@dirrm share/java/cocoon/docs/xsp
 @dirrm share/java/cocoon/docs
-@dirrm share/java/cocoon/example/hello
-@dirrm share/java/cocoon/example/java.apache.org
-@dirrm share/java/cocoon/example/trilug
-@dirrm share/java/cocoon/example/xsp
-@dirrm share/java/cocoon/example
+@dirrm share/java/cocoon/META-INF
 @dirrm share/java/cocoon