6 files changed, 113 insertions, 201 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index c62e865bde66..dadca8dbbb42 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -6,35 +6,33 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION=	2.1.5.1
-PORTREVISION=	2
+PORTVERSION=	2.1.6
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
 DISTNAME=	${PDISTNAME}-src
 
 MAINTAINER=	jb.quenot@caraldi.com
 COMMENT=	XML Web Development Framework
 
-USE_JAVA=	yes
-JAVA_VERSION=	1.3+
-USE_PYTHON=	1.6+
-MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
-WRKSRC=	${WRKDIR}/${PDISTNAME}
-APP_VERSION=	${PORTVERSION:C/\..*$//}
-APP_NAME?=	${PORTNAME}
-APP_HOME?=	${PREFIX}/${APP_NAME}
-LATEST_LINK=	${APP_NAME}
-PLIST=		${WRKDIR}/pkg-plist
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PDISTNAME=	${PORTNAME}-${PORTVERSION}
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+USE_JAVA=		yes
+JAVA_VERSION=		1.3+
+USE_PYTHON=		1.6+
+USE_REINPLACE=		YES
+MAKE_ENV=		JAVA_HOME=${JAVA_HOME}
+WRKSRC=			${WRKDIR}/${PDISTNAME}
+APP_NAME?=		${PORTNAME}
+APP_HOME?=		${PREFIX}/${APP_NAME}
+LATEST_LINK=		${APP_NAME}
+PLIST=			${WRKDIR}/pkg-plist
+PKGMESSAGE=		${WRKDIR}/pkg-message
+PDISTNAME=		${PORTNAME}-${PORTVERSION}
+PKGINSTALL=		${WRKDIR}/pkg-install
+PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 
 COCOON_LIB=	${JAVASHAREDIR}/${APP_NAME}
 PLIST_SUB+=	"COCOON_LIB=${COCOON_LIB}"
 
-COPYDIRS=	*.txt tools/jetty tools/loader legal
+COPYDIRS=	*.txt tools/jetty tools/loader legal webapp
 
 PORT?=		8888
 PID_FILE?=	/var/run/${APP_NAME}.pid
@@ -71,13 +69,30 @@ SUBSTITUTIONS=	\
 BLOCKSEXP+=	-e 's/^include.block.${BLOCK}=.*$$/include.block.${BLOCK}=true/'
 .endfor
 
-post-patch:
+post-configure:
 	@${ECHO_MSG} "===> Configuring blocks: ${BLOCKS}"
 	${SED} -e 's/.*include.block\(.*\)=.*$$/include.block\1=false/' < ${WRKSRC}/blocks.properties | \
 	${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties
+	${CP} ${WRKSRC}/build.properties ${WRKSRC}/local.build.properties
 .if (! defined(WITH_DOCS))
-	${SED} -e 's/^#exclude/exclude/' < ${WRKSRC}/build.properties \
-	> ${WRKSRC}/local.build.properties
+	${REINPLACE_CMD} \
+       	-e 's/^#\(exclude.webapp.documentation=\)/\1/' \
+       	-e 's/^#\(exclude.webapp.javadocs=\)/\1/' \
+       	-e 's/^#\(exclude.documentation=\)/\1/' \
+       	-e 's/^#\(exclude.javadocs=\)/\1/' \
+       	${WRKSRC}/local.build.properties
+.endif
+.if (! defined(WITH_SAMPLES))
+	${REINPLACE_CMD} \
+       	-e 's/^#\(exclude.webapp.samples=\)/\1/' \
+       	-e 's/^#\(exclude.webapp.test-suite=\)/\1/' \
+       	${WRKSRC}/local.build.properties
+.endif
+# Include Java source code into the binary jar files
+.if (defined(WITH_SOURCES))
+	${REINPLACE_CMD} \
+       	-e 's/^#\(include.sources-in-jars=\)/\1/' \
+       	${WRKSRC}/local.build.properties
 .endif
 
 pre-build:
@@ -87,13 +102,14 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh
 
 post-build:
+	${LN} -s ${WRKSRC}/build/webapp ${WRKSRC}/webapp
+
 	@${ECHO_MSG} "===> Building packing list"
-	@> ${PLIST}
 
-	@cd ${WRKSRC}/build && ${FIND} webapp -type f \
+	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} -type f \
 	| ${SED} -e "s|^|${APP_NAME}/|" >> ${PLIST}
 
-	@cd ${WRKSRC}/build && ${FIND} -d webapp -type d \
+	@cd ${WRKSRC} && ${FIND} -H -d ${COPYDIRS} -type d \
 	| ${SED} -e "s|^|@dirrm ${APP_NAME}/|" >> ${PLIST}
 
 	@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}
@@ -104,22 +120,17 @@ post-build:
 do-install:
 	@${ECHO_MSG} "===> Installing ${COPYDIRS}"
 	@${MKDIR} ${APP_HOME}
-	@cd ${WRKSRC} && ${FIND} ${COPYDIRS} \
-	| ${XARGS} ${TAR} -C ${WRKSRC} -cf- | ${TAR} -C ${APP_HOME} -xpf-
-
-	@${ECHO_MSG} "===> Installing webapp"
-	@cd ${WRKSRC}/build && ${FIND} webapp \
-	| ${XARGS} ${TAR} -C ${WRKSRC}/build -cf- | ${TAR} -C ${APP_HOME} -xpf-
+	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${APP_HOME}
 
 	@${ECHO_MSG} "===> Installing into ${PREFIX}/sbin"
 	@${SED} ${SUBSTITUTIONS} ${WRKSRC}/cocoon.sh > ${WRKDIR}/${APP_NAME}.sh
-	@${INSTALL} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/sbin
 	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/${APP_NAME}ctl > ${WRKDIR}/${APP_NAME}ctl
-	@${INSTALL} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
 
 	@${ECHO_MSG} "===> Installing ${PREFIX}/etc/rc.d/${APP_NAME}.sh"
 	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/${APP_NAME}.sh > ${WRKDIR}/${APP_NAME}.sh
-	@${INSTALL} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/etc/rc.d
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/etc/rc.d
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/www/cocoon/Makefile.options b/www/cocoon/Makefile.options
index 4ad158d4fa71..3fe197519631 100644
--- a/www/cocoon/Makefile.options
+++ b/www/cocoon/Makefile.options
@@ -1,29 +1,29 @@
 # ex:ts=22
 #
-OPTIONS+=	DOCS	'Include the documentation and samples'	on
+OPTIONS+=	DOCS	'Include the documentation'	on
+OPTIONS+=	SAMPLES	'Include the samples'		on
+OPTIONS+=	SOURCES	'Include the sources in jars'	off
 
 OPTIONS+=	AUTHENTICATION_FW	'Enable the authentication-fw block'	on
-OPTIONS+=	BATIK	'Enable the Batik block'	on
+OPTIONS+=	BATIK	'Enable the batik block'	on
 OPTIONS+=	BSF	'Enable the bsf block'	on
 OPTIONS+=	CHAPERON	'Enable the chaperon block'	on
 OPTIONS+=	DATABASES	'Enable the databases block'	on
-OPTIONS+=	FOP	'Enable the FOP Block (implies BATIK)'	on
+OPTIONS+=	FOP	'Enable the fop block'	on
 OPTIONS+=	HSQLDB	'Enable the hsqldb block'	on
 OPTIONS+=	HTML	'Enable the html block'	on
 OPTIONS+=	ITEXT	'Enable the itext block'	on
-OPTIONS+=	JFOR	'Enable the JFOR Block'	on
+OPTIONS+=	JFOR	'Enable the jfor block'	on
 OPTIONS+=	JSP	'Enable the jsp block'	on
 OPTIONS+=	LINKREWRITER	'Enable the linkrewriter block'	on
 OPTIONS+=	LUCENE	'Enable the lucene block'	on
 OPTIONS+=	NAMING	'Enable the naming block'	on
-OPTIONS+=	PARANOID	'Enable the Paranoid Cocoon Servlet'	on
-OPTIONS+=	PHP	'Enable the php block'	on
+OPTIONS+=	PARANOID	'Enable the paranoid block'	on
 OPTIONS+=	POI	'Enable the poi block'	on
-OPTIONS+=	PORTAL_FW	'Enable the portal-fw block'	on
+OPTIONS+=	PORTAL	'Enable the portal block'	off
 OPTIONS+=	PROFILER	'Enable the profiler block'	on
 OPTIONS+=	PYTHON	'Enable the python block'	on
 OPTIONS+=	SESSION_FW	'Enable the session-fw block'	on
-OPTIONS+=	SWF	'Enable the swf block'	on
 OPTIONS+=	VELOCITY	'Enable the velocity block'	on
 OPTIONS+=	WEB3	'Enable the web3 block'	on
 OPTIONS+=	XMLDB	'Enable the xmldb block'	on
@@ -34,6 +34,7 @@ OPTIONS+=	AXIS	'Enable the axis block'	on
 OPTIONS+=	CRON	'Enable the cron block'	on
 OPTIONS+=	DELI	'Enable the deli block'	on
 OPTIONS+=	EVENTCACHE	'Enable the eventcache block'	on
+OPTIONS+=	FACES	'Enable the faces block'	on
 OPTIONS+=	FORMS	'Enable the forms block'	on
 OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	on
 OPTIONS+=	JMS	'Enable the jms block'	on
@@ -42,7 +43,6 @@ OPTIONS+=	MAIL	'Enable the mail block'	on
 OPTIONS+=	MIDI	'Enable the midi block'	on
 OPTIONS+=	OJB	'Enable the ojb block'	on
 OPTIONS+=	PETSTORE	'Enable the petstore block'	on
-OPTIONS+=	PORTAL	'Enable the portal block'	on
 OPTIONS+=	PROXY	'Enable the proxy block'	on
 OPTIONS+=	QDOX	'Enable the qdox block'	on
 OPTIONS+=	REPOSITORY	'Enable the repository block'	on
@@ -54,4 +54,7 @@ OPTIONS+=	STX	'Enable the stx block'	on
 OPTIONS+=	TAGLIB	'Enable the taglib block'	on
 OPTIONS+=	TOUR	'Enable the tour block'	on
 OPTIONS+=	WEBDAV	'Enable the webdav block'	on
+OPTIONS+=	PHP	'Enable the php block'	off
+OPTIONS+=	PORTAL_FW	'Enable the portal-fw block'	off
+OPTIONS+=	SWF	'Enable the swf block'	off
 OPTIONS+=	WOODY	'Enable the woody block'	off
diff --git a/www/cocoon/Makefile.test-options b/www/cocoon/Makefile.test-options
index a3b70bd4b9ca..3fd9ebd9bc74 100644
--- a/www/cocoon/Makefile.test-options
+++ b/www/cocoon/Makefile.test-options
@@ -56,6 +56,8 @@ BLOCKS+=	xsp
 
 .if defined(WITH_LUCENE)
 BLOCKS+=	lucene
+BLOCKS+=	forms
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_NAMING)
@@ -66,17 +68,14 @@ BLOCKS+=	naming
 BLOCKS+=	paranoid
 .endif
 
-.if defined(WITH_PHP)
-BLOCKS+=	php
-.endif
-
 .if defined(WITH_POI)
 BLOCKS+=	poi
 .endif
 
-.if defined(WITH_PORTAL_FW)
-BLOCKS+=	portal-fw
+.if defined(WITH_PORTAL)
+BLOCKS+=	portal
 BLOCKS+=	authentication-fw
+BLOCKS+=	html
 BLOCKS+=	session-fw
 BLOCKS+=	xsp
 .endif
@@ -95,10 +94,6 @@ BLOCKS+=	session-fw
 BLOCKS+=	xsp
 .endif
 
-.if defined(WITH_SWF)
-BLOCKS+=	swf
-.endif
-
 .if defined(WITH_VELOCITY)
 BLOCKS+=	velocity
 .endif
@@ -141,6 +136,19 @@ BLOCKS+=	deli
 
 .if defined(WITH_EVENTCACHE)
 BLOCKS+=	eventcache
+BLOCKS+=	databases
+BLOCKS+=	hsqldb
+BLOCKS+=	jms
+BLOCKS+=	xsp
+.endif
+
+.if defined(WITH_FACES)
+BLOCKS+=	faces
+BLOCKS+=	authentication-fw
+BLOCKS+=	html
+BLOCKS+=	portal
+BLOCKS+=	session-fw
+BLOCKS+=	taglib
 BLOCKS+=	xsp
 .endif
 
@@ -153,6 +161,7 @@ BLOCKS+=	xsp
 BLOCKS+=	javaflow
 BLOCKS+=	databases
 BLOCKS+=	forms
+BLOCKS+=	hsqldb
 BLOCKS+=	ojb
 BLOCKS+=	xsp
 .endif
@@ -160,7 +169,6 @@ BLOCKS+=	xsp
 .if defined(WITH_JMS)
 BLOCKS+=	jms
 BLOCKS+=	databases
-BLOCKS+=	eventcache
 BLOCKS+=	hsqldb
 BLOCKS+=	xsp
 .endif
@@ -172,11 +180,6 @@ BLOCKS+=	linotype
 .if defined(WITH_MAIL)
 BLOCKS+=	mail
 BLOCKS+=	asciiart
-BLOCKS+=	batik
-BLOCKS+=	cron
-BLOCKS+=	scratchpad
-BLOCKS+=	velocity
-BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_MIDI)
@@ -187,6 +190,7 @@ BLOCKS+=	midi
 BLOCKS+=	ojb
 BLOCKS+=	databases
 BLOCKS+=	forms
+BLOCKS+=	hsqldb
 BLOCKS+=	xsp
 .endif
 
@@ -199,14 +203,6 @@ BLOCKS+=	velocity
 BLOCKS+=	xsp
 .endif
 
-.if defined(WITH_PORTAL)
-BLOCKS+=	portal
-BLOCKS+=	authentication-fw
-BLOCKS+=	html
-BLOCKS+=	session-fw
-BLOCKS+=	xsp
-.endif
-
 .if defined(WITH_PROXY)
 BLOCKS+=	proxy
 .endif
@@ -219,14 +215,21 @@ BLOCKS+=	qdox
 BLOCKS+=	repository
 BLOCKS+=	databases
 BLOCKS+=	eventcache
+BLOCKS+=	hsqldb
+BLOCKS+=	jms
 BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_SCRATCHPAD)
 BLOCKS+=	scratchpad
+BLOCKS+=	axis
 BLOCKS+=	batik
 BLOCKS+=	cron
-BLOCKS+=	velocity
+BLOCKS+=	databases
+BLOCKS+=	eventcache
+BLOCKS+=	hsqldb
+BLOCKS+=	jms
+BLOCKS+=	repository
 BLOCKS+=	xsp
 .endif
 
@@ -268,10 +271,27 @@ BLOCKS+=	xsp
 BLOCKS+=	webdav
 BLOCKS+=	databases
 BLOCKS+=	eventcache
+BLOCKS+=	hsqldb
+BLOCKS+=	jms
 BLOCKS+=	repository
 BLOCKS+=	xsp
 .endif
 
+.if defined(WITH_PHP)
+BLOCKS+=	php
+.endif
+
+.if defined(WITH_PORTAL_FW)
+BLOCKS+=	portal-fw
+BLOCKS+=	authentication-fw
+BLOCKS+=	session-fw
+BLOCKS+=	xsp
+.endif
+
+.if defined(WITH_SWF)
+BLOCKS+=	swf
+.endif
+
 .if defined(WITH_WOODY)
 BLOCKS+=	woody
 BLOCKS+=	xsp
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index 172962b9fc8a..2e142177587c 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -1,2 +1,2 @@
-MD5 (cocoon-2.1.5.1-src.tar.gz) = 0f6e58bd430db7cf6d98b1ccac2dcc99
-SIZE (cocoon-2.1.5.1-src.tar.gz) = 42035921
+MD5 (cocoon-2.1.6-src.tar.gz) = d7a3a5b2c89452df95f85eeb031bbbae
+SIZE (cocoon-2.1.6-src.tar.gz) = 44430985
diff --git a/www/cocoon/files/patch-build.sh b/www/cocoon/files/patch-build.sh
new file mode 100644
index 000000000000..861dc2b5c612
--- /dev/null
+++ b/www/cocoon/files/patch-build.sh
@@ -0,0 +1,8 @@
+--- build.sh.orig	Thu Nov  4 13:14:57 2004
++++ build.sh	Thu Nov  4 13:15:01 2004
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ 
+ #  Copyright 1999-2004 The Apache Software Foundation
+ #
diff --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index e5f03d01d5a3..e6530e7d10c8 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -1,135 +1,5 @@
-cocoon/CREDITS.txt
-cocoon/INSTALL.txt
-cocoon/LICENSE.txt
-cocoon/NOTICE.txt
-cocoon/README.txt
-cocoon/legal/altrmi-client-impl-0.9.2.jar.license.txt
-cocoon/legal/altrmi-client-interfaces-0.9.2.jar.license.txt
-cocoon/legal/altrmi-common-0.9.2.jar.license.txt
-cocoon/legal/altrmi-registry-0.9.2.jar.license.txt
-cocoon/legal/altrmi-server-impl-0.9.2.jar.license.txt
-cocoon/legal/altrmi-server-interfacesl-0.9.2.jar.license.txt
-cocoon/legal/ant-contrib-0.6.jar.license.txt
-cocoon/legal/ant-junit.jar.license.txt
-cocoon/legal/ant-launcher.jar.license.txt
-cocoon/legal/ant-trax.jar.license.txt
-cocoon/legal/ant.jar.license.txt
-cocoon/legal/antlr-2.7.3.jar.license.txt
-cocoon/legal/asm-1.4.2.jar.license.txt
-cocoon/legal/avalon-framework-api-4.1.5.jar.license.txt
-cocoon/legal/avalon-framework-impl-4.1.5.jar.license.txt
-cocoon/legal/axis-1.1.jar.license.txt
-cocoon/legal/axis-jaxrpc-1.1.jar.license.txt
-cocoon/legal/axis-saaj-1.1.jar.license.txt
-cocoon/legal/batik-all-1.5.1.jar.license.txt
-cocoon/legal/bsf-2.3.0.jar.license.txt
-cocoon/legal/castor-0.9.5.3-xml.jar.license.txt
-cocoon/legal/chaperon-20040205.jar.license.txt
-cocoon/legal/commons-beanutils-1.6.1.jar.license.txt
-cocoon/legal/commons-betwixt-20030910.jar.license.txt
-cocoon/legal/commons-cli-1.0.jar.license.txt
-cocoon/legal/commons-collections-3.0.jar.license.txt
-cocoon/legal/commons-dbcp-1.1.jar.license.txt
-cocoon/legal/commons-digester-1.3.jar.license.txt
-cocoon/legal/commons-discovery-0.2.jar.license.txt
-cocoon/legal/commons-httpclient-2.0-final.jar.license.txt
-cocoon/legal/commons-jexl-1.0-beta-1-20040113.jar.license.txt
-cocoon/legal/commons-jxpath-20030909.jar.license.txt
-cocoon/legal/commons-lang-2.0.jar.license.txt
-cocoon/legal/commons-logging-1.0.3.jar.license.txt
-cocoon/legal/commons-pool-1.1.jar.license.txt
-cocoon/legal/db-ojb-1.0.rc6.jar.license.txt
-cocoon/legal/deli-0.9.8.jar.license.txt
-cocoon/legal/ehcache-0.8.jar.license.txt
-cocoon/legal/excalibur-component-1.2.jar.license.txt
-cocoon/legal/excalibur-datasource-1.1.1.jar.license.txt
-cocoon/legal/excalibur-event-api-1.1.jar.license.txt
-cocoon/legal/excalibur-event-impl-1.1.jar.license.txt
-cocoon/legal/excalibur-i18n-1.1.jar.license.txt
-cocoon/legal/excalibur-instrument-1.0.jar.license.txt
-cocoon/legal/excalibur-instrument-client-2003-03-31.jar.license.txt
-cocoon/legal/excalibur-instrument-manager-1.0.jar.license.txt
-cocoon/legal/excalibur-instrument-manager-interfaces-1.0.jar.license.txt
-cocoon/legal/excalibur-io-1.1.jar.license.txt
-cocoon/legal/excalibur-logger-1.1.jar.license.txt
-cocoon/legal/excalibur-monitor-1.0.2.jar.license.txt
-cocoon/legal/excalibur-naming-1.0.jar.license.txt
-cocoon/legal/excalibur-pool-1.2.jar.license.txt
-cocoon/legal/excalibur-sourceresolve-1.1.jar.license.txt
-cocoon/legal/excalibur-store-1.0.jar.license.txt
-cocoon/legal/excalibur-testcase-1.2.jar.license.txt
-cocoon/legal/excalibur-util-1.0.jar.license.txt
-cocoon/legal/excalibur-xmlutil-1.0.jar.license.txt
-cocoon/legal/fop-0.20.5.jar.license.txt
-cocoon/legal/geronimo-spec-jms-DEV-20031120.jar.license.txt
-cocoon/legal/geronimo-spec-jta-DEV-20040202.jar.license.txt
-cocoon/legal/groovy-20040415.114632.jar.license.txt
-cocoon/legal/hsqldb-1.7.1.jar.license.txt
-cocoon/legal/htmlarea.license.txt
-cocoon/legal/icu4j.jar.license.txt
-cocoon/legal/itext-1.02b.jar.license.txt
-cocoon/legal/itext-xml-1.02.jar.license.txt
-cocoon/legal/jakarta-bcel-20040329.jar.license.txt
-cocoon/legal/jakarta-oro-2.0.8.jar.license.txt
-cocoon/legal/jakarta-regexp-1.3.jar.license.txt
-cocoon/legal/jakarta-slide-webdavlib-2.0rc1.jar.license.txt
-cocoon/legal/jcs-1.0-dev.20040516.jar.license.txt
-cocoon/legal/jdom-b9.jar.license.txt
-cocoon/legal/jdtcore-2.1.3.jar.license.txt
-cocoon/legal/jena-2.0.0.jar.license.txt
-cocoon/legal/jetty-4.2.19.jar.license.html
-cocoon/legal/jfor-0.7.1.jar.license.txt
-cocoon/legal/jing-20030619.jar.license.txt
-cocoon/legal/jisp-2.5.1.jar.license.txt
-cocoon/legal/joost-20040330.jar.license.txt
-cocoon/legal/jstyle.jar.license.txt
-cocoon/legal/jtidy-04aug2000r7-dev.jar.license.txt
-cocoon/legal/junit.jar.license.txt
-cocoon/legal/log4j-1.2.8.jar.license.txt
-cocoon/legal/logkit-1.2.2.jar.license.txt
-cocoon/legal/lucene-1.3-final.jar.license.txt
-cocoon/legal/midi-license.txt
-cocoon/legal/pizza-1.1.jar.license.txt
-cocoon/legal/pluto-20040310.jar.license.txt
-cocoon/legal/poi-2.5-final-20040302.jar.license.txt
-cocoon/legal/portlet-api-20040310.jar.license.txt
-cocoon/legal/qdox-1.3.jar.license.txt
-cocoon/legal/quartz-1.3.2.jar.license.txt
-cocoon/legal/rhino1.5r4-continuations-20040228.jar.license.txt
-cocoon/legal/servlet-2.3.jar.license.txt
-cocoon/legal/servlet_2_2.jar.license.txt
-cocoon/legal/slide-kernel-2.0.jar.license.txt
-cocoon/legal/slide-stores-2.0.jar.license.txt
-cocoon/legal/slide-webdavservlet-2.0.jar.license.txt
-cocoon/legal/spark.fpl.license.txt
-cocoon/legal/spark.opl.license.txt
-cocoon/legal/util.concurrent-1.3.3.jar.license.txt
-cocoon/legal/velocity-1.4.jar.license.jtxt
-cocoon/legal/wsdl4j-1.4.jar.license.txt
-cocoon/legal/xalan-2.6.0.jar.license.txt
-cocoon/legal/xercesImpl-2.6.2.jar.license.txt
-cocoon/legal/xindice-1.1b4.jar.license.txt
-cocoon/legal/xml-apis.jar.license.txt
-cocoon/legal/xml-commons-resolver-1.1.jar.license.txt
-cocoon/legal/xmldb-api-20030701.jar.license.txt
-cocoon/legal/xmldb-common-20030701.jar.license.txt
-cocoon/legal/xmldb-xupdate-20040205.jar.license.txt
-cocoon/legal/xmlunit0.8.jar.license.txt
-cocoon/legal/xreporter-expression-20030725.jar.license.txt
-cocoon/tools/jetty/conf/admin.xml
-cocoon/tools/jetty/conf/main.xml
-cocoon/tools/jetty/conf/webdefaults.xml
-cocoon/tools/jetty/lib/jetty-4.2.19.jar
-cocoon/tools/jetty/lib/servlet-2.3.jar
-cocoon/tools/loader/Loader$RepositoryClassLoader.class
-cocoon/tools/loader/Loader.class
-@dirrm cocoon/legal
-@dirrm cocoon/tools/jetty/conf
-@dirrm cocoon/tools/jetty/lib
-@dirrm cocoon/tools/jetty
-@dirrm cocoon/tools/loader
-@dirrm cocoon/tools
 sbin/cocoon.sh
 sbin/cocoonctl
 etc/rc.d/cocoon.sh
+@dirrm cocoon/tools
 @dirrm cocoon