Author: cziegeler Date: Wed Jan 19 01:22:13 2005 New Revision: 125598 URL: http://svn.apache.org/viewcvs?view=rev&rev=125598 Log: Start syncing build system: put all jars to lib/optional Added: cocoon/trunk/lib/core/servlet-2_3.jar - copied unchanged from r125593, cocoon/trunk/lib/optional/servlet-2_3.jar cocoon/trunk/lib/optional/antlr-2.7.4.jar (contents, props changed) cocoon/trunk/lib/optional/apache-garbage-0.0.jar - copied unchanged from r125597, cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar cocoon/trunk/lib/optional/axis-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar cocoon/trunk/lib/optional/axis-jaxrpc-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar cocoon/trunk/lib/optional/axis-saaj-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar cocoon/trunk/lib/optional/batik-all-1.5.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar cocoon/trunk/lib/optional/bsf-2.3.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar cocoon/trunk/lib/optional/chaperon-20040205.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar cocoon/trunk/lib/optional/cocoon-serializers-charsets-0.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar cocoon/trunk/lib/optional/commons-betwixt-0.6.jar - copied unchanged from r125597, cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar cocoon/trunk/lib/optional/commons-codec-1.3.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar cocoon/trunk/lib/optional/commons-dbcp-1.2.1.jar (contents, props changed) cocoon/trunk/lib/optional/commons-digester-1.6.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar cocoon/trunk/lib/optional/commons-discovery-0.2.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar cocoon/trunk/lib/optional/commons-el-1.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar cocoon/trunk/lib/optional/commons-pool-1.2.jar (contents, props changed) cocoon/trunk/lib/optional/commons-transaction-1.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar cocoon/trunk/lib/optional/daisy-htmlcleaner-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar cocoon/trunk/lib/optional/daisy-util-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar cocoon/trunk/lib/optional/db-ojb-1.0.1.jar (contents, props changed) cocoon/trunk/lib/optional/deli-x031104.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar cocoon/trunk/lib/optional/fop-0.20.5.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar cocoon/trunk/lib/optional/geronimo-spec-jms-DEV-20031120.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar cocoon/trunk/lib/optional/geronimo-spec-jta-DEV-20040202.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar cocoon/trunk/lib/optional/hsqldb-1.7.3.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar cocoon/trunk/lib/optional/icu4j-3.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar cocoon/trunk/lib/optional/itext-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar cocoon/trunk/lib/optional/jakarta-slide-webdavlib-2.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar cocoon/trunk/lib/optional/jdom-1.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar cocoon/trunk/lib/optional/jena-2.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar cocoon/trunk/lib/optional/jfor-0.7.1.jar (contents, props changed) cocoon/trunk/lib/optional/joost-20040330.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar cocoon/trunk/lib/optional/jsp-api-2.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar cocoon/trunk/lib/optional/jtidy-04aug2000r7-dev.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar cocoon/trunk/lib/optional/lucene-1.4.3.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar cocoon/trunk/lib/optional/myfaces-20041005m.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar cocoon/trunk/lib/optional/myfaces-jsf-api-20041005.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar cocoon/trunk/lib/optional/nekodtd-0.1.11.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar cocoon/trunk/lib/optional/pluto-1.0.1-rc2.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar cocoon/trunk/lib/optional/poi-2.5.1-final-20040804.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar cocoon/trunk/lib/optional/portlet-api-1.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar cocoon/trunk/lib/optional/qdox-1.5.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar cocoon/trunk/lib/optional/quartz-1.4.3.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar cocoon/trunk/lib/optional/slide-kernel-2.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar cocoon/trunk/lib/optional/slide-stores-2.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar cocoon/trunk/lib/optional/slide-webdavservlet-2.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar cocoon/trunk/lib/optional/velocity-1.4.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar cocoon/trunk/lib/optional/wsdl4j-1.4.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar cocoon/trunk/lib/optional/xindice-1.1b4.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar cocoon/trunk/lib/optional/xmldb-api-20030701.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar cocoon/trunk/lib/optional/xmldb-common-20030701.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar cocoon/trunk/lib/optional/xmldb-xupdate-20040205.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar cocoon/trunk/lib/optional/xmlrpc-1.1.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar cocoon/trunk/src/blocks/scratchpad/mocks/apache-garbage-0.0.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar cocoon/trunk/src/blocks/scratchpad/mocks/commons-betwixt-0.6.jar - copied unchanged from r125593, cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar Removed: cocoon/trunk/lib/optional/servlet-2_3.jar cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar cocoon/trunk/src/blocks/jfor/lib/jfor-0.7.1.jar cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar cocoon/trunk/src/blocks/ojb/lib/antlr-2.7.4.jar cocoon/trunk/src/blocks/ojb/lib/commons-dbcp-1.2.1.jar cocoon/trunk/src/blocks/ojb/lib/commons-pool-1.2.jar cocoon/trunk/src/blocks/ojb/lib/db-ojb-1.0.1.jar cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar Modified: cocoon/trunk/lib/jars.xml cocoon/trunk/tools/src/blocks-build.xsl cocoon/trunk/tools/targets/compile-build.xml cocoon/trunk/tools/targets/init-build.xml cocoon/trunk/tools/targets/validate-build.xml cocoon/trunk/tools/targets/webapp-build.xml
Copied: cocoon/trunk/lib/core/servlet-2_3.jar (from r125593, cocoon/trunk/lib/optional/servlet-2_3.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/core/servlet-2_3.jar?view=diff&rev=125598&p1=cocoon/trunk/lib/optional/servlet-2_3.jar&r1=125593&p2=cocoon/trunk/lib/core/servlet-2_3.jar&r2=125598 ============================================================================== Modified: cocoon/trunk/lib/jars.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?view=diff&rev=125598&p1=cocoon/trunk/lib/jars.xml&r1=125597&p2=cocoon/trunk/lib/jars.xml&r2=125598 ============================================================================== --- cocoon/trunk/lib/jars.xml (original) +++ cocoon/trunk/lib/jars.xml Wed Jan 19 01:22:13 2005 @@ -248,7 +248,7 @@ the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation.</description> <used-by>SVG serializer (batik block)</used-by> - <lib>batik/lib/batik-all-1.5.1.jar</lib> + <lib>optional/batik-all-1.5.1.jar</lib> <homepage>http://xml.apache.org/batik/</homepage> </file> @@ -263,7 +263,7 @@ support the additional languages. </description> <used-by>BSF Block (Script generator, script action)</used-by> - <lib>bsf/lib/bsf-2.3.0.jar</lib> + <lib>optional/bsf-2.3.0.jar</lib> <homepage>http://jakarta.apache.org/bsf/</homepage> </file> @@ -314,7 +314,7 @@ delivery context. </description> <used-by>DELI (deli block)</used-by> - <lib>deli/lib/deli-x031104.jar</lib> + <lib>optionaldeli-x031104.jar</lib> <homepage>http://delicon.sourceforge.net</homepage> </file> @@ -347,7 +347,7 @@ <title>iText XML to PDF/HTML/RTF converter (Renderer)</title> <description>iText reads XML documents and turns them into PDFs</description> <used-by>iText serializer</used-by> - <lib>itext/lib/itext-1.1.jar</lib> + <lib>optional/itext-1.1.jar</lib> <homepage>http://www.lowagie.com/iText/</homepage> </file> @@ -358,7 +358,7 @@ the XSL recommendation and then turns it into a PDF document. </description> <used-by>FOP serializer (fop block)</used-by> - <lib>fop/lib/fop-0.20.5.jar</lib> + <lib>optional/fop-0.20.5.jar</lib> <homepage>http://xml.apache.org/fop/</homepage> </file> @@ -370,7 +370,7 @@ common wordprocessors. </description> <used-by>RTF serializer (jfor block)</used-by> - <lib>jfor/lib/jfor-0.7.1.jar</lib> + <lib>optional/jfor-0.7.1.jar</lib> <homepage>http://www.jfor.org</homepage> </file> @@ -382,7 +382,7 @@ database engine which offers both in memory and disk based tables. </description> <used-by>Cocoon samples webapp</used-by> - <lib>hsqldb/lib/hsqldb-1.7.3.jar</lib> + <lib>optional/hsqldb-1.7.3.jar</lib> <homepage>http://hsqldb.sourceforge.net/</homepage> </file> @@ -393,7 +393,7 @@ based upon Microsoft's OLE 2 Compound Document format using pure Java. </description> <used-by>MS Excel serializer (poi block)</used-by> - <lib>poi/lib/poi-2.5.1-final-20040804.jar</lib> + <lib>optional/poi-2.5.1-final-20040804.jar</lib> <homepage>http://jakarta.apache.org/poi/</homepage> </file> @@ -401,7 +401,7 @@ <title>Jena RDF framework</title> <description>Jena is a java API for manipulating RDF models.</description> <used-by>DELI (deli block)</used-by> - <lib>deli/lib/jena-2.1.jar</lib> + <lib>optional/jena-2.1.jar</lib> <homepage>http://jena.sourceforge.net/</homepage> </file> @@ -411,7 +411,7 @@ provides robust and full-featured Unicode services on a wide variety of platforms. </description> <used-by>DELI (deli block)</used-by> - <lib>deli/lib/icu4j-3.0.jar</lib> + <lib>optional/icu4j-3.0.jar</lib> <homepage>http://oss.software.ibm.com/icu4j/</homepage> </file> @@ -435,7 +435,7 @@ <title>Transform HTML to XML</title> <description>Tidy is a HTML syntax checker and pretty printer.</description> <used-by>HTML generator (html block), RSSTransformer (Portal block)</used-by> - <lib>html/lib/jtidy-04aug2000r7-dev.jar</lib> + <lib>optional/jtidy-04aug2000r7-dev.jar</lib> <homepage>http://jtidy.sourceforge.net/</homepage> </file> @@ -443,7 +443,7 @@ <title>CyberNeko DTD Converter</title> <description>NekoHTML is a lightweight HTML syntax correcter written using Xerces Native Interface.</description> <used-by>Forms block</used-by> - <lib>forms/lib/nekodtd-0.1.11.jar</lib> + <lib>optional/nekodtd-0.1.11.jar</lib> <homepage>http://www.apache.org/~andyc/neko/</homepage> </file> @@ -462,7 +462,7 @@ on it to have a nice output, limitted to a subset of the HTML DTD </description> <used-by>Forms block</used-by> - <lib>forms/lib/daisy-htmlcleaner-1.1.jar</lib> + <lib>optional/daisy-htmlcleaner-1.1.jar</lib> <homepage>http://daisy.cocoondev.org/</homepage> </file> @@ -472,7 +472,7 @@ Java Utility classes of Daisy </description> <used-by>Forms block - HTMLCleaner</used-by> - <lib>forms/lib/daisy-util-1.1.jar</lib> + <lib>optional/daisy-util-1.1.jar</lib> <homepage>http://daisy.cocoondev.org/</homepage> </file> @@ -483,7 +483,7 @@ searching of documents. </description> <used-by>Lucene block</used-by> - <lib>lucene/lib/lucene-1.4.3.jar</lib> + <lib>optional/lucene-1.4.3.jar</lib> <homepage>http://jakarta.apache.org/lucene/</homepage> </file> @@ -519,7 +519,7 @@ <title>Servlet API</title> <description>Servlet API Version 2.3</description> <used-by>Cocoon</used-by> - <lib>optional/servlet-2_3.jar</lib> + <lib>core/servlet-2_3.jar</lib> <homepage>http://jakarta.apache.org/tomcat/</homepage> </file> @@ -527,7 +527,7 @@ <title>Velocity engine</title> <description>Velocity is a general purpose template engine written in Java.</description> <used-by>Velocity Generator (velocity block)</used-by> - <lib>velocity/lib/velocity-1.4.jar</lib> + <lib>optional/velocity-1.4.jar</lib> <homepage>http://jakarta.apache.org/velocity/</homepage> </file> @@ -535,7 +535,7 @@ <title>XML:DB APIs</title> <description>Database tailored for the storage of XML data.</description> <used-by>XML:DB source (xmldb block)</used-by> - <lib>xmldb/lib/xmldb-api-20030701.jar</lib> + <lib>optional/xmldb-api-20030701.jar</lib> <homepage>http://www.xmldb.org/</homepage> </file> @@ -543,7 +543,7 @@ <title>XML:DB APIs</title> <description>Database tailored for the storage of XML data.</description> <used-by>XML:DB source (xmldb block)</used-by> - <lib>xmldb/lib/xmldb-common-20030701.jar</lib> + <lib>optional/xmldb-common-20030701.jar</lib> <homepage>http://www.xmldb.org/</homepage> </file> @@ -551,7 +551,7 @@ <title>XML:DB APIs</title> <description>Database tailored for the storage of XML data.</description> <used-by>XML:DB source (xmldb block)</used-by> - <lib>xmldb/lib/xmldb-xupdate-20040205.jar</lib> + <lib>optional/xmldb-xupdate-20040205.jar</lib> <homepage>http://www.xmldb.org/</homepage> </file> @@ -559,7 +559,7 @@ <title>XML Xindice</title> <description>Native XML Database by Apache XML project</description> <used-by>xmldb block</used-by> - <lib>xmldb/lib/xindice-1.1b4.jar</lib> + <lib>optional/xindice-1.1b4.jar</lib> <homepage>http://xml.apache.org/xindice/</homepage> </file> @@ -570,7 +570,7 @@ HTTP to implement remote procedure calls. </description> <used-by>xmldb block</used-by> - <lib>xmldb/lib/xmlrpc-1.1.jar</lib> + <lib>optional/xmlrpc-1.1.jar</lib> <homepage>http://ws.apache.org/xmlrpc/</homepage> </file> @@ -637,7 +637,7 @@ those to XML files. </description> <used-by>Chaperon block</used-by> - <lib>chaperon/lib/chaperon-20040205.jar</lib> + <lib>optional/chaperon-20040205.jar</lib> <homepage>http://chaperon.sourceforge.net</homepage> </file> @@ -668,7 +668,7 @@ A large list of character sets used for XML/HTML serialization. </description> <used-by>serializers</used-by> - <lib>serializers/lib/cocoon-serializers-charsets-0.1.jar</lib> + <lib>optional/cocoon-serializers-charsets-0.1.jar</lib> <homepage>http://cocoon.apache.org/</homepage> </file> @@ -676,7 +676,7 @@ <title>Slide kernel</title> <description>The Jakarta Slide kernel API.</description> <used-by>Slide block</used-by> - <lib>slide/lib/slide-kernel-2.1.jar</lib> + <lib>optional/slide-kernel-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -684,7 +684,7 @@ <title>Slide stores</title> <description>The Jakarta Slide stores implementation.</description> <used-by>Slide block</used-by> - <lib>slide/lib/slide-stores-2.1.jar</lib> + <lib>optional/slide-stores-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -692,7 +692,7 @@ <title>Slide WebDAV Servlet</title> <description>The Jakarta Slide WebDAV servlet.</description> <used-by>Slide block</used-by> - <lib>slide/lib/slide-webdavservlet-2.1.jar</lib> + <lib>optional/slide-webdavservlet-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -700,7 +700,7 @@ <title>Slide WebDAV Client library</title> <description>The Jakarta Slide WebDAV client library.</description> <used-by>WebDAV block</used-by> - <lib>webdav/lib/jakarta-slide-webdavlib-2.1.jar</lib> + <lib>optional/jakarta-slide-webdavlib-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -708,7 +708,7 @@ <title>Jakarta Commons Transaction</title> <description>Utility classes commonly used in transactional Java programming</description> <used-by>WebDAV block</used-by> - <lib>slide/lib/commons-transaction-1.0.jar</lib> + <lib>optional/commons-transaction-1.0.jar</lib> <homepage>http://jakarta.apache.org/commons/transaction/</homepage> </file> @@ -716,7 +716,7 @@ <title>Jakarta Commons Codec</title> <description>Implementations of common encoders and decoders</description> <used-by>WebDAV block</used-by> - <lib>slide/lib/commons-codec-1.3.jar</lib> + <lib>optional/commons-codec-1.3.jar</lib> <homepage>http://jakarta.apache.org/commons/codec/</homepage> </file> @@ -724,7 +724,7 @@ <title>JDOM</title> <description>JDOM</description> <used-by>Slide block</used-by> - <lib>slide/lib/jdom-1.0.jar</lib> + <lib>optional/jdom-1.0.jar</lib> <homepage>http://www.jdom.org/</homepage> </file> @@ -735,7 +735,7 @@ Implementation taken from the Apache Geronimo project for license compatibility. </description> <used-by>Slide block</used-by> - <lib>slide/lib/geronimo-spec-jta-DEV-20040202.jar</lib> + <lib>optional/geronimo-spec-jta-DEV-20040202.jar</lib> <homepage>http://java.sun.com/products/jta/</homepage> </file> @@ -747,7 +747,7 @@ describing services </description> <used-by>Axis block</used-by> - <lib>axis/lib/wsdl4j-1.4.jar</lib> + <lib>optional/wsdl4j-1.4.jar</lib> <homepage>http://www-124.ibm.com/developerworks/projects/wsdl4j/</homepage> </file> @@ -758,7 +758,7 @@ SOAP 1.1 specification and SOAP with Attachments note. </description> <used-by>Axis block</used-by> - <lib>axis/lib/axis-saaj-1.1.jar</lib> + <lib>optional/axis-saaj-1.1.jar</lib> <homepage>http://java.sun.com/xml/saaj/</homepage> </file> @@ -770,7 +770,7 @@ general, and for lifecycle management of singleton (factory) classes. </description> <used-by>Axis block</used-by> - <lib>axis/lib/commons-discovery-0.2.jar</lib> + <lib>optional/commons-discovery-0.2.jar</lib> <homepage>http://jakarta.apache.org/commons/discovery/</homepage> </file> @@ -783,7 +783,7 @@ on the Java platform. </description> <used-by>Axis block</used-by> - <lib>axis/lib/axis-jaxrpc-1.1.jar</lib> + <lib>optional/axis-jaxrpc-1.1.jar</lib> <homepage>http://java.sun.com/xml/jaxrpc/</homepage> </file> @@ -794,7 +794,7 @@ Protocol") </description> <used-by>Axis block</used-by> - <lib>axis/lib/axis-1.1.jar</lib> + <lib>optional/axis-1.1.jar</lib> <homepage>http://ws.apache.org/axis/</homepage> </file> @@ -831,7 +831,7 @@ <title>Joost</title> <description>Streaming Transformation for XML (STX) library</description> <used-by>STX block</used-by> - <lib>stx/lib/joost-20040330.jar</lib> + <lib>optional/joost-20040330.jar</lib> <homepage>http://joost.sourceforge.net/</homepage> </file> @@ -842,7 +842,7 @@ definitions from source files complete with JavaDoc @tags. </description> <used-by>QDoxSource (qdox block)</used-by> - <lib>qdox/lib/qdox-1.5.jar</lib> + <lib>optional/qdox-1.5.jar</lib> <homepage>http://qdox.codehaus.org/</homepage> </file> @@ -850,7 +850,7 @@ <title>Quartz</title> <description>Quartz Scheduler</description> <used-by>Cron block</used-by> - <lib>cron/lib/quartz-1.4.3.jar</lib> + <lib>optional/quartz-1.4.3.jar</lib> <homepage>http://sourceforge.net/projects/quartz/</homepage> </file> @@ -858,7 +858,7 @@ <title>Garbage</title> <description>Garbage</description> <used-by>Scratchpad block</used-by> - <lib>scratchpad/lib/apache-garbage-0.0.jar</lib> + <lib>optional/apache-garbage-0.0.jar</lib> <homepage>http://cocoon.apache.org/</homepage> </file> @@ -872,7 +872,7 @@ specification. </description> <used-by>BetwixtTransformer</used-by> - <lib>scratchpad/lib/commons-betwixt-0.6.jar</lib> + <lib>optional/commons-betwixt-0.6.jar</lib> <homepage>http://jakarta.apache.org/commons/betwixt/</homepage> </file> @@ -898,7 +898,7 @@ available for your use, or you can also create your own. </description> <used-by>Faces block, BetwixtTransformer</used-by> - <lib>faces/lib/commons-digester-1.6.jar</lib> + <lib>optional/commons-digester-1.6.jar</lib> <homepage>http://jakarta.apache.org/commons/digester/</homepage> </file> @@ -910,7 +910,7 @@ translators from grammatical descriptions containing Java, C#, or C++ actions </description> <used-by>OJB</used-by> - <lib>ojb/lib/antlr-2.7.4.jar</lib> + <lib>optional/antlr-2.7.4.jar</lib> <homepage>http://www.antlr.org/</homepage> </file> @@ -920,7 +920,7 @@ Database Connection Pool API </description> <used-by>OJB</used-by> - <lib>ojb/lib/commons-dbcp-1.2.1.jar</lib> + <lib>optional/commons-dbcp-1.2.1.jar</lib> <homepage>http://jakarta.apache.org/commons/dbcp/</homepage> </file> @@ -931,7 +931,7 @@ may be useful when creating new pool implementations. </description> <used-by>OJB</used-by> - <lib>ojb/lib/commons-pool-1.2.jar</lib> + <lib>optional/commons-pool-1.2.jar</lib> <homepage>http://jakarta.apache.org/commons/pool/</homepage> </file> @@ -942,7 +942,7 @@ for Java Objects against relational databases. </description> <used-by>OJB</used-by> - <lib>ojb/lib/db-ojb-1.0.1.jar</lib> + <lib>optional/db-ojb-1.0.1.jar</lib> <homepage>http://db.apache.org/ojb/</homepage> </file> <!-- OJB block end (6-Aug-2003) --> @@ -957,7 +957,7 @@ under the Apache license and therefore freely distributable. </description> <used-by>JMS</used-by> - <lib>jms/lib/geronimo-spec-jms-DEV-20031120.jar</lib> + <lib>optional/geronimo-spec-jms-DEV-20031120.jar</lib> <homepage>http://incubator.apache.org/projects/geronimo/index.html</homepage> </file> <!-- @@ -966,7 +966,7 @@ <description>OpenJMS core libraries. OpenJMS is a OpenSource JMS, Java Messaging Service, implementation.</description> <used-by>JMS</used-by> - <lib>jms/lib/exolabcore-0.3.6.jar</lib> + <lib>optional/exolabcore-0.3.6.jar</lib> <homepage>http://openjms.sf.net</homepage> </file> <file> @@ -974,7 +974,7 @@ <description>OpenJMS client libraries. OpenJMS is a OpenSource JMS, Java Messaging Service, implementation.</description> <used-by>JMS</used-by> - <lib>jms/lib/openjms-client-0.7.6-rc2.jar</lib> + <lib>optional/openjms-client-0.7.6-rc2.jar</lib> <homepage>http://openjms.sf.net</homepage> </file> <file> @@ -990,7 +990,7 @@ language. </description> <used-by>JMS</used-by> - <lib>jms/lib/jms-1.0.2a.jar</lib> + <lib>optional/jms-1.0.2a.jar</lib> <homepage>http://java.sun.com/jms</homepage> </file> <file> @@ -1004,7 +1004,7 @@ Developers can now build powerful and portable directory-enabled applications using this industry standard.</description> <used-by>JMS</used-by> - <lib>jms/lib/jndi-1.2.1.jar</lib> + <lib>optional/jndi-1.2.1.jar</lib> <homepage>http://java.sun.com/jndi</homepage> </file> --> @@ -1018,7 +1018,7 @@ original spec. </description> <used-by>Portal</used-by> - <lib>portal/lib/portlet-api-1.0.jar</lib> + <lib>optional/portlet-api-1.0.jar</lib> <homepage>http://portals.apache.org/pluto/</homepage> </file> <file> @@ -1029,7 +1029,7 @@ original spec. </description> <used-by>Portal</used-by> - <lib>portal/lib/pluto-1.0.1-rc2.jar</lib> + <lib>optional/pluto-1.0.1-rc2.jar</lib> <homepage>http://portals.apache.org/pluto/</homepage> </file> @@ -1051,7 +1051,7 @@ specification. </description> <used-by>Faces block</used-by> - <lib>faces/lib/myfaces-20041005m.jar</lib> + <lib>optional/myfaces-20041005m.jar</lib> <homepage>http://www.myfaces.org/</homepage> </file> @@ -1062,7 +1062,7 @@ specification. </description> <used-by>Faces block</used-by> - <lib>faces/lib/myfaces-jsf-api-20041005.jar</lib> + <lib>optional/myfaces-jsf-api-20041005.jar</lib> <homepage>http://www.myfaces.org/</homepage> </file> @@ -1072,7 +1072,7 @@ EL is the JSP 2.0 Expression Language Interpreter from Apache. </description> <used-by>Faces block</used-by> - <lib>faces/lib/commons-el-1.0.jar</lib> + <lib>optional/commons-el-1.0.jar</lib> <homepage>http://jakarta.apache.org/commons/el/</homepage> </file> @@ -1082,7 +1082,7 @@ JSP API classes from Apache Tomcat </description> <used-by>Faces block</used-by> - <lib>faces/lib/jsp-api-2.0.jar</lib> + <lib>optional/jsp-api-2.0.jar</lib> <homepage>http://jakarta.apache.org/tomcat/</homepage> </file> Added: cocoon/trunk/lib/optional/antlr-2.7.4.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/antlr-2.7.4.jar?view=auto&rev=125598 ============================================================================== Binary file. No diff available. Copied: cocoon/trunk/lib/optional/apache-garbage-0.0.jar (from r125597, cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/apache-garbage-0.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar&r1=125597&p2=cocoon/trunk/lib/optional/apache-garbage-0.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/axis-1.1.jar (from r125593, cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/axis-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/axis-1.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/axis-jaxrpc-1.1.jar (from r125593, cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/axis-jaxrpc-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/axis-jaxrpc-1.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/axis-saaj-1.1.jar (from r125593, cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/axis-saaj-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/axis-saaj-1.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/batik-all-1.5.1.jar (from r125593, cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/batik-all-1.5.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/batik-all-1.5.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/bsf-2.3.0.jar (from r125593, cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/bsf-2.3.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/bsf-2.3.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/chaperon-20040205.jar (from r125593, cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/chaperon-20040205.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar&r1=125593&p2=cocoon/trunk/lib/optional/chaperon-20040205.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/cocoon-serializers-charsets-0.1.jar (from r125593, cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/cocoon-serializers-charsets-0.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/cocoon-serializers-charsets-0.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/commons-betwixt-0.6.jar (from r125597, cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-betwixt-0.6.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar&r1=125597&p2=cocoon/trunk/lib/optional/commons-betwixt-0.6.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/commons-codec-1.3.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-codec-1.3.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar&r1=125593&p2=cocoon/trunk/lib/optional/commons-codec-1.3.jar&r2=125598 ============================================================================== Added: cocoon/trunk/lib/optional/commons-dbcp-1.2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-dbcp-1.2.1.jar?view=auto&rev=125598 ============================================================================== Binary file. No diff available. Copied: cocoon/trunk/lib/optional/commons-digester-1.6.jar (from r125593, cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-digester-1.6.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar&r1=125593&p2=cocoon/trunk/lib/optional/commons-digester-1.6.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/commons-discovery-0.2.jar (from r125593, cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-discovery-0.2.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar&r1=125593&p2=cocoon/trunk/lib/optional/commons-discovery-0.2.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/commons-el-1.0.jar (from r125593, cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-el-1.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/commons-el-1.0.jar&r2=125598 ============================================================================== Added: cocoon/trunk/lib/optional/commons-pool-1.2.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-pool-1.2.jar?view=auto&rev=125598 ============================================================================== Binary file. No diff available. Copied: cocoon/trunk/lib/optional/commons-transaction-1.0.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-transaction-1.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/commons-transaction-1.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/daisy-htmlcleaner-1.1.jar (from r125593, cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/daisy-htmlcleaner-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/daisy-htmlcleaner-1.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/daisy-util-1.1.jar (from r125593, cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/daisy-util-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/daisy-util-1.1.jar&r2=125598 ============================================================================== Added: cocoon/trunk/lib/optional/db-ojb-1.0.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/db-ojb-1.0.1.jar?view=auto&rev=125598 ============================================================================== Binary file. No diff available. Copied: cocoon/trunk/lib/optional/deli-x031104.jar (from r125593, cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/deli-x031104.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar&r1=125593&p2=cocoon/trunk/lib/optional/deli-x031104.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/fop-0.20.5.jar (from r125593, cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/fop-0.20.5.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar&r1=125593&p2=cocoon/trunk/lib/optional/fop-0.20.5.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/geronimo-spec-jms-DEV-20031120.jar (from r125593, cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/geronimo-spec-jms-DEV-20031120.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar&r1=125593&p2=cocoon/trunk/lib/optional/geronimo-spec-jms-DEV-20031120.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/geronimo-spec-jta-DEV-20040202.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/geronimo-spec-jta-DEV-20040202.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar&r1=125593&p2=cocoon/trunk/lib/optional/geronimo-spec-jta-DEV-20040202.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/hsqldb-1.7.3.jar (from r125593, cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/hsqldb-1.7.3.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar&r1=125593&p2=cocoon/trunk/lib/optional/hsqldb-1.7.3.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/icu4j-3.0.jar (from r125593, cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/icu4j-3.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/icu4j-3.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/itext-1.1.jar (from r125593, cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/itext-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/itext-1.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/jakarta-slide-webdavlib-2.1.jar (from r125593, cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jakarta-slide-webdavlib-2.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/jakarta-slide-webdavlib-2.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/jdom-1.0.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jdom-1.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/jdom-1.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/jena-2.1.jar (from r125593, cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jena-2.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/jena-2.1.jar&r2=125598 ============================================================================== Added: cocoon/trunk/lib/optional/jfor-0.7.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jfor-0.7.1.jar?view=auto&rev=125598 ============================================================================== Binary file. No diff available. Copied: cocoon/trunk/lib/optional/joost-20040330.jar (from r125593, cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/joost-20040330.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar&r1=125593&p2=cocoon/trunk/lib/optional/joost-20040330.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/jsp-api-2.0.jar (from r125593, cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jsp-api-2.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/jsp-api-2.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/jtidy-04aug2000r7-dev.jar (from r125593, cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/jtidy-04aug2000r7-dev.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar&r1=125593&p2=cocoon/trunk/lib/optional/jtidy-04aug2000r7-dev.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/lucene-1.4.3.jar (from r125593, cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/lucene-1.4.3.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar&r1=125593&p2=cocoon/trunk/lib/optional/lucene-1.4.3.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/myfaces-20041005m.jar (from r125593, cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/myfaces-20041005m.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar&r1=125593&p2=cocoon/trunk/lib/optional/myfaces-20041005m.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/myfaces-jsf-api-20041005.jar (from r125593, cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/myfaces-jsf-api-20041005.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar&r1=125593&p2=cocoon/trunk/lib/optional/myfaces-jsf-api-20041005.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/nekodtd-0.1.11.jar (from r125593, cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/nekodtd-0.1.11.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar&r1=125593&p2=cocoon/trunk/lib/optional/nekodtd-0.1.11.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/pluto-1.0.1-rc2.jar (from r125593, cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/pluto-1.0.1-rc2.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar&r1=125593&p2=cocoon/trunk/lib/optional/pluto-1.0.1-rc2.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/poi-2.5.1-final-20040804.jar (from r125593, cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/poi-2.5.1-final-20040804.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar&r1=125593&p2=cocoon/trunk/lib/optional/poi-2.5.1-final-20040804.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/portlet-api-1.0.jar (from r125593, cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/portlet-api-1.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar&r1=125593&p2=cocoon/trunk/lib/optional/portlet-api-1.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/qdox-1.5.jar (from r125593, cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/qdox-1.5.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar&r1=125593&p2=cocoon/trunk/lib/optional/qdox-1.5.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/quartz-1.4.3.jar (from r125593, cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/quartz-1.4.3.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar&r1=125593&p2=cocoon/trunk/lib/optional/quartz-1.4.3.jar&r2=125598 ============================================================================== Deleted: /cocoon/trunk/lib/optional/servlet-2_3.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/servlet-2_3.jar?view=auto&rev=125597 ============================================================================== Copied: cocoon/trunk/lib/optional/slide-kernel-2.1.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/slide-kernel-2.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/slide-kernel-2.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/slide-stores-2.1.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/slide-stores-2.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/slide-stores-2.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/slide-webdavservlet-2.1.jar (from r125593, cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/slide-webdavservlet-2.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/slide-webdavservlet-2.1.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/velocity-1.4.jar (from r125593, cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/velocity-1.4.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar&r1=125593&p2=cocoon/trunk/lib/optional/velocity-1.4.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/wsdl4j-1.4.jar (from r125593, cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/wsdl4j-1.4.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar&r1=125593&p2=cocoon/trunk/lib/optional/wsdl4j-1.4.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/xindice-1.1b4.jar (from r125593, cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/xindice-1.1b4.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar&r1=125593&p2=cocoon/trunk/lib/optional/xindice-1.1b4.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/xmldb-api-20030701.jar (from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/xmldb-api-20030701.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar&r1=125593&p2=cocoon/trunk/lib/optional/xmldb-api-20030701.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/xmldb-common-20030701.jar (from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/xmldb-common-20030701.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar&r1=125593&p2=cocoon/trunk/lib/optional/xmldb-common-20030701.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/xmldb-xupdate-20040205.jar (from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/xmldb-xupdate-20040205.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar&r1=125593&p2=cocoon/trunk/lib/optional/xmldb-xupdate-20040205.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/lib/optional/xmlrpc-1.1.jar (from r125593, cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/xmlrpc-1.1.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar&r1=125593&p2=cocoon/trunk/lib/optional/xmlrpc-1.1.jar&r2=125598 ============================================================================== Deleted: /cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/lib/axis-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/lib/axis-jaxrpc-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/lib/axis-saaj-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/lib/commons-discovery-0.2.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/lib/wsdl4j-1.4.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/lib/batik-all-1.5.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/bsf/lib/bsf-2.3.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/lib/chaperon-20040205.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/cron/lib/quartz-1.4.3.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/lib/deli-x031104.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/lib/icu4j-3.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/lib/jena-2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/commons-digester-1.6.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/commons-el-1.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/jsp-api-2.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/myfaces-20041005m.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/fop/lib/fop-0.20.5.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/lib/daisy-htmlcleaner-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/lib/daisy-util-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/lib/nekodtd-0.1.11.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/lib/hsqldb-1.7.3.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/itext/lib/itext-1.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/jfor/lib/jfor-0.7.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jfor/lib/jfor-0.7.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/lucene/lib/lucene-1.4.3.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/ojb/lib/antlr-2.7.4.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/lib/antlr-2.7.4.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/ojb/lib/commons-dbcp-1.2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/lib/commons-dbcp-1.2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/ojb/lib/commons-pool-1.2.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/lib/commons-pool-1.2.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/ojb/lib/db-ojb-1.0.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/lib/db-ojb-1.0.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/lib/pluto-1.0.1-rc2.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/lib/portlet-api-1.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/qdox/lib/qdox-1.5.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar?view=auto&rev=125597 ============================================================================== Copied: cocoon/trunk/src/blocks/scratchpad/mocks/apache-garbage-0.0.jar (from r125593, cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/mocks/apache-garbage-0.0.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/scratchpad/lib/apache-garbage-0.0.jar&r1=125593&p2=cocoon/trunk/src/blocks/scratchpad/mocks/apache-garbage-0.0.jar&r2=125598 ============================================================================== Copied: cocoon/trunk/src/blocks/scratchpad/mocks/commons-betwixt-0.6.jar (from r125593, cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/mocks/commons-betwixt-0.6.jar?view=diff&rev=125598&p1=cocoon/trunk/src/blocks/scratchpad/lib/commons-betwixt-0.6.jar&r1=125593&p2=cocoon/trunk/src/blocks/scratchpad/mocks/commons-betwixt-0.6.jar&r2=125598 ============================================================================== Deleted: /cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/commons-codec-1.3.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/commons-transaction-1.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/jdom-1.0.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/slide-kernel-2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/slide-stores-2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/lib/slide-webdavservlet-2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/stx/lib/joost-20040330.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/velocity/lib/velocity-1.4.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.1.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/lib/xindice-1.1b4.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/lib/xmldb-api-20030701.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/lib/xmldb-common-20030701.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar?view=auto&rev=125597 ============================================================================== Deleted: /cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/lib/xmlrpc-1.1.jar?view=auto&rev=125597 ============================================================================== Modified: cocoon/trunk/tools/src/blocks-build.xsl Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/blocks-build.xsl?view=diff&rev=125598&p1=cocoon/trunk/tools/src/blocks-build.xsl&r1=125597&p2=cocoon/trunk/tools/src/blocks-build.xsl&r2=125598 ============================================================================== --- cocoon/trunk/tools/src/blocks-build.xsl (original) +++ cocoon/trunk/tools/src/blocks-build.xsl Wed Jan 19 01:22:13 2005 @@ -35,9 +35,6 @@ <include name="*.jar"/> </fileset> --> - <fileset dir="${{lib.optional}}"> - <include name="*.jar"/> - </fileset> <fileset dir="${{build.blocks}}"> <include name="*.jar"/> </fileset> @@ -58,35 +55,374 @@ <exclude name="**/package.html"/> </patternset> + <macrodef name="test-include-block"> + <attribute name="name"/> + <sequential> + <condition property="[EMAIL PROTECTED]"> + <not> + <istrue value="[EMAIL PROTECTED]"/> + </not> + </condition> + <condition property="[EMAIL PROTECTED]"> + <isfalse value="[EMAIL PROTECTED]"/> + </condition> + </sequential> + </macrodef> + + <macrodef name="print-excluded-block"> + <attribute name="name"/> + <sequential> + <if> + <istrue value="[EMAIL PROTECTED]"/> + <then> + <echo message=" Block '@{{name}}' is excluded from the build."/> + </then> + </if> + </sequential> + </macrodef> + + <macrodef name="block-compile"> + <attribute name="name"/> + <attribute name="package"/> + <sequential> + <!-- Test if this block has special build --> + <if> + <available file="${{blocks}}/@{{name}}/build.xml"/> + <then> + <ant inheritAll="true" + inheritRefs="false" + target="main" + antfile="${{blocks}}/@{{name}}/build.xml"> + <property name="block.dir" value="${{blocks}}/@{{name}}"/> + </ant> + </then> + </if> + <!-- Test if this block has mocks --> + <if> + <available type="dir" file="${{blocks}}/@{{name}}/mocks/"/> + <then> + <mkdir dir="${{build.blocks}}/@{{name}}/mocks"/> + <javac srcdir="${{blocks}}/@{{name}}/mocks" + destdir="${{build.blocks}}/@{{name}}/mocks" + debug="${{compiler.debug}}" + optimize="${{compiler.optimize}}" + deprecation="${{compiler.deprecation}}" + target="${{target.vm}}" + nowarn="${{compiler.nowarn}}" + compiler="${{compiler}}"> + <classpath refid="@{{name}}.classpath"/> + </javac> + </then> + </if> + <!-- This is a little bit tricky: + As the javac task checks, if a src directory is available and + stops if its not available, we use the following property + to either point to a jdk dependent directory or - if not + available - to the usual java source directory. + If someone knows a better solution... + --> + <!-- Currently, we have no JVM dependent sources + <condition property="dependend.vm" value="${{target.vm}}"> + <available file="${{blocks}}/@{{name}}/java${{target.vm}}"/> + </condition> + <condition property="dependend.vm" value=""> + <not> + <available file="${{blocks}}/@{{name}}/java${{target.vm}}"/> + </not> + </condition> + --> + <javac destdir="${{build.blocks}}/@{{name}}/dest" + debug="${{compiler.debug}}" + optimize="${{compiler.optimize}}" + deprecation="${{compiler.deprecation}}" + target="${{target.vm}}" + nowarn="${{compiler.nowarn}}" + compiler="${{compiler}}"> + <src path="${{blocks}}/@{{name}}/java"/> + <!-- Currently, we have no JVM dependent sources + <src path="${{blocks}}/@{{name}}/java${{dependend.vm}}"/> + --> + <classpath refid="@{{name}}.classpath"/> + <exclude name="**/samples/**/*.java"/> + </javac> + + <copy filtering="on" todir="${{build.blocks}}/@{{name}}/dest"> + <fileset dir="${{blocks}}/@{{name}}/java"> + <patternset refid="unprocessed.sources"/> + </fileset> + </copy> + + <copy filtering="off" todir="${{build.blocks}}/@{{name}}/dest"> + <fileset dir="${{blocks}}/@{{name}}/java"> + <include name="**/Manifest.mf"/> + <include name="META-INF/**"/> + </fileset> + </copy> + <jar jarfile="${{build.blocks}}/@{{name}}-block.jar" index="true"> + <fileset dir="${{build.blocks}}/@{{name}}/dest"> + <include name="@{{package}}/**"/> + <include name="META-INF/**"/> + </fileset> + </jar> + <if> + <istrue value="${{include.sources-in-jars}}"/> + <then> + <jar jarfile="${{build.blocks}}/@{{name}}-block.jar" update="true"> + <fileset dir="${{blocks}}/@{{name}}/java"> + <include name="**/*.java"/> + </fileset> + </jar> + </then> + </if> + + <if> + <istrue value="${{include.sources-jars}}"/> + <then> + <jar jarfile="${{build.blocks}}/@{{name}}-block.src.jar"> + <fileset dir="${{blocks}}/@{{name}}/java"> + <include name="**/*.java"/> + </fileset> + </jar> + </then> + </if> + + <!-- exclude sample classes from the block package --> + <if> + <isfalse value="${{internal.exclude.webapp.samples}}"/> + <then> + <mkdir dir="${{build.blocks}}/@{{name}}/samples"/> + <javac destdir="${{build.blocks}}/@{{name}}/samples" + debug="${{compiler.debug}}" + optimize="${{compiler.optimize}}" + deprecation="${{compiler.deprecation}}" + target="${{target.vm}}" + nowarn="${{compiler.nowarn}}" + compiler="${{compiler}}"> + <src path="${{blocks}}/@{{name}}/java"/> + <!-- Currently, we have no JVM dependent sources + <src path="${{blocks}}/@{{name}}/java${{dependend.vm}}"/> + --> + <classpath refid="@{{name}}.classpath"/> + <include name="**/samples/**/*.java"/> + </javac> + </then> + </if> + </sequential> + </macrodef> + + <macrodef name="block-patch"> + <attribute name="name"/> + <sequential> + <xpatch file="${{build.webapp}}/sitemap.xmap" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.xmap"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}" addcomments="true"> + <include name="@{{name}}/conf/*.xconf"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/logkit.xconf" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.xlog"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.xweb"/> + </xpatch> + + <!-- generate sitemap entries + <sitemap-components sitemap="${{build.webapp}}/sitemap.xmap" + source="${{blocks}}/@{{name}}/java" + block="@{{name}}"> + <xsl:if test="@status='unstable'"> + <xsl:attribute name="stable">false</xsl:attribute> + </xsl:if> + <xsl:if test="@status='deprecated'"> + <xsl:attribute name="deprecated">true</xsl:attribute> + </xsl:if> + </sitemap-components> + --> + + <!-- generate sitemap components docs --> + <!-- TODO - this is the wrong place for documentation, but currently blocks + don't have own docs! + <mkdir dir="${{build.context}}/xdocs/userdocs"/> + <sitemap-components docDir="${{build.context}}/xdocs/userdocs" + source="${{blocks}}/@{{name}}/java" + block="@{{name}}"> + <xsl:if test="@status='unstable'"> + <xsl:attribute name="stable">false</xsl:attribute> + </xsl:if> + <xsl:if test="@status='deprecated'"> + <xsl:attribute name="deprecated">true</xsl:attribute> + </xsl:if> + </sitemap-components> + --> + </sequential> + </macrodef> + + <macrodef name="block-roles"> + <attribute name="name"/> + <sequential> + <xpatch file="${{build.dest}}/org/apache/cocoon/cocoon.roles" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.xroles"/> + </xpatch> + </sequential> + </macrodef> + + <macrodef name="block-patch-samples"> + <attribute name="name"/> + <sequential> + <xpatch file="${{build.webapp}}/samples/sitemap.xmap" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.samplesxpipe"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}"> + <include name="@{{name}}/conf/*.samplesxconf"/> + </xpatch> + </sequential> + </macrodef> + + <macrodef name="block-samples"> + <attribute name="name"/> + <sequential> + <!-- Test if this block has samples --> + <if> + <available file="${{blocks}}/@{{name}}/samples/sitemap.xmap"/> + <then> + <copy filtering="on" todir="${{build.webapp}}/samples/blocks/@{{name}}"> + <fileset dir="${{blocks}}/@{{name}}/samples"/> + <fileset dir="${{blocks}}/@{{name}}/conf" includes="*.xsamples"/> + </copy> + <!-- copy sample classes --> + <copy todir="${{build.webapp.classes}}" filtering="off"> + <fileset dir="${{build.blocks}}/@{{name}}/samples"/> + </copy> + </then> + </if> + </sequential> + </macrodef> + + <macrodef name="block-lib"> + <attribute name="name"/> + <sequential> + <!-- if this block has a lib directory copy those too (deprecated) --> + <if> + <available type="dir" file="${{blocks}}/@{{name}}/lib"/> + <then> + <echo> + NOTICE: the preferred method of including library dependencies in your block + is by putting them in lib/optional and then declaring them in gump.xml. + </echo> + <copy filtering="off" todir="${{build.webapp.lib}}"> + <fileset dir="${{blocks}}/@{{name}}/lib"> + <include name="*.jar"/> + <exclude name="servlet*.jar"/> + </fileset> + </copy> + </then> + </if> + <!-- Test if this block has global WEB-INF files --> + <if> + <available type="dir" file="${{blocks}}/@{{name}}/WEB-INF/"/> + <then> + <copy filtering="on" todir="${{build.webapp.webinf}}"> + <fileset dir="${{blocks}}/@{{name}}/WEB-INF/"> + <include name="**"/> + </fileset> + </copy> + </then> + </if> + </sequential> + </macrodef> + + <macrodef name="block-tests"> + <attribute name="name"/> + <sequential> + <!-- Test if this block has tests --> + <if> + <available file="${{blocks}}/@{{name}}/test"/> + <then> + <mkdir dir="${{build.blocks}}/@{{name}}/test"/> + + <copy todir="${{build.blocks}}/@{{name}}/test" filtering="on"> + <fileset dir="${{blocks}}/@{{name}}/test" excludes="**/*.java"/> + </copy> + + <javac destdir="${{build.blocks}}/@{{name}}/test" + debug="${{compiler.debug}}" + optimize="${{compiler.optimize}}" + deprecation="${{compiler.deprecation}}" + target="${{target.vm}}" + nowarn="${{compiler.nowarn}}" + compiler="${{compiler}}"> + <src path="${{blocks}}/@{{name}}/test"/> + <classpath> + <path refid="@{{name}}.classpath"/> + <path refid="test.classpath"/> + <pathelement location="${{build.test}}"/> + </classpath> + </javac> + + <junit printsummary="yes" fork="yes" failureproperty="junit.test.failed"> + <jvmarg value="-Djava.endorsed.dirs=lib/endorsed"/> + <jvmarg value="-Djunit.test.loglevel=${{junit.test.loglevel}}"/> + <classpath> + <path refid="@{{name}}.classpath"/> + <path refid="test.classpath"/> + <pathelement location="${{build.test}}"/> + <pathelement location="${{build.blocks}}/@{{name}}/test"/> + </classpath> + <formatter type="plain" usefile="no"/> + <formatter type="xml"/> + <batchtest todir="${{build.test.output}}"> + <fileset dir="${{build.blocks}}/@{{name}}/test"> + <include name="**/*TestCase.class"/> + <include name="**/*Test.class"/> + <exclude name="**/AllTest.class"/> + <exclude name="**/*$$*Test.class"/> + <exclude name="**/Abstract*.class"/> + </fileset> + </batchtest> + </junit> + </then> + </if> + </sequential> + </macrodef> + + <macrodef name="block-prepare-anteater-tests"> + <attribute name="name"/> + <sequential> + <!-- Test if this block has Anteater tests --> + <if> + <available file="${{blocks}}/@{{name}}/test/anteater"/> + <then> + <copy todir="${{build.test}}/anteater"> + <fileset dir="${{blocks}}/@{{name}}/test/anteater"/> + <mapper type="glob" from="*.xml" to="@{{name}}-*.xml"/> + </copy> + </then> + </if> + </sequential> + </macrodef> <xsl:apply-templates select="module"/> </project> </xsl:template> - <xsl:template match="module"> <xsl:variable name="cocoon-blocks" select="project[starts-with(@name, 'cocoon-block-')]"/> <target name="init"> <xsl:for-each select="$cocoon-blocks"> <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <condition property="include.block.{$block-name}"> - <not> - <istrue value="${{exclude.block.{$block-name}}}"/> - </not> - </condition> - <condition property="internal.exclude.block.{$block-name}"> - <isfalse value="${{include.block.{$block-name}}}"/> - </condition> + <test-include-block name="{$block-name}"/> </xsl:for-each> </target> <target name="unstable" depends="init"> + <condition property="unstable.blocks.present"> + <or> <xsl:for-each select="[EMAIL PROTECTED]'unstable']"> <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <condition property="unstable.blocks.present"> <isfalse value="${{internal.exclude.block.{$block-name}}}"/> - </condition> </xsl:for-each> + </or> + </condition> <if> <istrue value="${{unstable.blocks.present}}"/> <then> @@ -105,12 +441,14 @@ </target> <target name="excluded" depends="init"> + <condition property="excluded.blocks.present"> + <or> <xsl:for-each select="$cocoon-blocks"> <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <condition property="excluded.blocks.present"> <istrue value="${{internal.exclude.block.{$block-name}}}"/> - </condition> </xsl:for-each> + </or> + </condition> <if> <istrue value="${{excluded.blocks.present}}"/> <then> @@ -118,12 +456,7 @@ <xsl:for-each select="$cocoon-blocks"> <xsl:sort select="@name"/> <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <if> - <istrue value="${{internal.exclude.block.{$block-name}}}"/> - <then> - <echo message=" Block '{$block-name}' is excluded from the build."/> - </then> - </if> + <print-excluded-block name="{$block-name}"/> </xsl:for-each> <echo message="===================================================="/> </then> @@ -258,7 +591,7 @@ stylesheetfile="${{resources.javadoc}}/javadoc.css" useexternalfile="yes" additionalparam="${{javadoc.additionalparam}}" - maxmemory="128m"> + maxmemory="192m"> <link packagelistloc="${{resources.javadoc}}/avalon-excalibur" offline="true" href="http://excalibur.apache.org/apidocs"/> @@ -274,6 +607,10 @@ offline="true" href="http://xml.apache.org/xalan-j/apidocs"/> <link packagelistloc="${{resources.javadoc}}/xerces" offline="true" href="http://xml.apache.org/xerces2-j/javadocs/api"/> + <link packagelistloc="${{resources.javadoc}}/log4j" + offline="true" href="http://logging.apache.org/log4j/docs/api"/> + <link packagelistloc="${{resources.javadoc}}/logkit" + offline="true" href="http://avalon.apache.org/avalon/runtime/3.3.0/impl"/> <tag name="avalon.component" scope="types" description="Avalon component" /> <tag name="avalon.service" scope="types" description="Implements service:" /> @@ -339,133 +676,7 @@ </xsl:for-each> </xsl:if> </xsl:attribute> - - <!-- Test if this block has special build --> - <if> - <available file="${{blocks}}/{$block-name}/build.xml"/> - <then> - <ant inheritAll="true" - inheritRefs="false" - target="main" - antfile="${{blocks}}/{$block-name}/build.xml"> - <property name="block.dir" value="${{blocks}}/{$block-name}"/> - </ant> - </then> - </if> - - <!-- Test if this block has mocks --> - <if> - <available type="dir" file="${{blocks}}/{$block-name}/mocks/"/> - <then> - <mkdir dir="${{build.blocks}}/{$block-name}/mocks"/> - <javac srcdir="${{blocks}}/{$block-name}/mocks" - destdir="${{build.blocks}}/{$block-name}/mocks" - debug="${{compiler.debug}}" - optimize="${{compiler.optimize}}" - deprecation="${{compiler.deprecation}}" - target="${{target.vm}}" - nowarn="${{compiler.nowarn}}" - compiler="${{compiler}}"> - <classpath refid="{$block-name}.classpath"/> - </javac> - </then> - </if> - - <!-- This is a little bit tricky: - As the javac task checks, if a src directory is available and - stops if its not available, we use the following property - to either point to a jdk dependent directory or - if not - available - to the usual java source directory. - If someone knows a better solution... - --> - <!-- Currently, we have no JVM dependent sources - <condition property="dependend.vm" value="${{target.vm}}"> - <available file="${{blocks}}/{$block-name}/java${{target.vm}}"/> - </condition> - <condition property="dependend.vm" value=""> - <not> - <available file="${{blocks}}/{$block-name}/java${{target.vm}}"/> - </not> - </condition> - --> - <javac destdir="${{build.blocks}}/{$block-name}/dest" - debug="${{compiler.debug}}" - optimize="${{compiler.optimize}}" - deprecation="${{compiler.deprecation}}" - target="${{target.vm}}" - nowarn="${{compiler.nowarn}}" - compiler="${{compiler}}"> - <src path="${{blocks}}/{$block-name}/java"/> - <!-- Currently, we have no JVM dependent sources - <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/> - --> - <classpath refid="{$block-name}.classpath"/> - <exclude name="**/samples/**/*.java"/> - </javac> - - <copy filtering="on" todir="${{build.blocks}}/{$block-name}/dest"> - <fileset dir="${{blocks}}/{$block-name}/java"> - <patternset refid="unprocessed.sources"/> - </fileset> - </copy> - - <copy filtering="off" todir="${{build.blocks}}/{$block-name}/dest"> - <fileset dir="${{blocks}}/{$block-name}/java"> - <include name="**/Manifest.mf"/> - <include name="META-INF/**"/> - </fileset> - </copy> - - <jar jarfile="${{build.blocks}}/{$block-name}-block.jar" index="true"> - <fileset dir="${{build.blocks}}/{$block-name}/dest"> - <include name="{translate(package/text(), '.', '/')}/**"/> - <include name="META-INF/**"/> - </fileset> - </jar> - - <if> - <istrue value="${{include.sources-in-jars}}"/> - <then> - <jar jarfile="${{build.blocks}}/{$block-name}-block.jar" update="true"> - <fileset dir="${{blocks}}/{$block-name}/java"> - <include name="**/*.java"/> - </fileset> - </jar> - </then> - </if> - - <if> - <istrue value="${{include.sources-jars}}"/> - <then> - <jar jarfile="${{build.blocks}}/{$block-name}-block.src.jar"> - <fileset dir="${{blocks}}/{$block-name}/java"> - <include name="**/*.java"/> - </fileset> - </jar> - </then> - </if> - - <!-- exclude sample classes from the block package --> - <if> - <isfalse value="${{internal.exclude.webapp.samples}}"/> - <then> - <mkdir dir="${{build.blocks}}/{$block-name}/samples"/> - <javac destdir="${{build.blocks}}/{$block-name}/samples" - debug="${{compiler.debug}}" - optimize="${{compiler.optimize}}" - deprecation="${{compiler.deprecation}}" - target="${{target.vm}}" - nowarn="${{compiler.nowarn}}" - compiler="${{compiler}}"> - <src path="${{blocks}}/{$block-name}/java"/> - <!-- Currently, we have no JVM dependent sources - <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/> - --> - <classpath refid="{$block-name}.classpath"/> - <include name="**/samples/**/*.java"/> - </javac> - </then> - </if> + <block-compile name="{$block-name}" package="{translate(package/text(), '.', '/')}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> @@ -480,45 +691,7 @@ </xsl:for-each> </xsl:if> </xsl:attribute> - - <xpatch file="${{build.webapp}}/sitemap.xmap" srcdir="${{blocks}}"> - <include name="{$block-name}/conf/*.xmap"/> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}" addcomments="true"> - <include name="{$block-name}/conf/*.xconf"/> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}"> - <include name="{$block-name}/conf/*.xweb"/> - </xpatch> - - <!-- generate sitemap entries - <sitemap-components sitemap="${{build.webapp}}/sitemap.xmap" - source="${{blocks}}/{$block-name}/java" - block="{$block-name}"> - <xsl:if test="@status='unstable'"> - <xsl:attribute name="stable">false</xsl:attribute> - </xsl:if> - <xsl:if test="@status='deprecated'"> - <xsl:attribute name="deprecated">true</xsl:attribute> - </xsl:if> - </sitemap-components> - --> - - <!-- generate sitemap components docs --> - <!-- TODO - this is the wrong place for documentation, but currently blocks - don't have own docs! - <mkdir dir="${{build.context}}/xdocs/userdocs"/> - <sitemap-components docDir="${{build.context}}/xdocs/userdocs" - source="${{blocks}}/{$block-name}/java" - block="{$block-name}"> - <xsl:if test="@status='unstable'"> - <xsl:attribute name="stable">false</xsl:attribute> - </xsl:if> - <xsl:if test="@status='deprecated'"> - <xsl:attribute name="deprecated">true</xsl:attribute> - </xsl:if> - </sitemap-components> - --> + <block-patch name="{$block-name}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> @@ -531,19 +704,11 @@ </xsl:for-each> </xsl:attribute> </xsl:if> - - <xpatch file="${{build.dest}}/org/apache/cocoon/cocoon.roles" srcdir="${{blocks}}"> - <include name="{$block-name}/conf/*.xroles"/> - </xpatch> + <block-roles name="{$block-name}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> - <xpatch file="${{build.webapp}}/samples/sitemap.xmap" srcdir="${{blocks}}"> - <include name="{$block-name}/conf/*.samplesxpipe"/> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}"> - <include name="{$block-name}/conf/*.samplesxconf"/> - </xpatch> + <block-patch-samples name="{$block-name}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> @@ -556,22 +721,7 @@ </xsl:for-each> </xsl:attribute> </xsl:if> - - <!-- Test if this block has samples --> - <if> - <available file="${{blocks}}/{$block-name}/samples/sitemap.xmap"/> - <then> - <copy filtering="on" todir="${{build.webapp}}/samples/blocks/{$block-name}"> - <fileset dir="${{blocks}}/{$block-name}/samples"/> - <fileset dir="${{blocks}}/{$block-name}/conf" includes="*.xsamples"/> - </copy> - - <!-- copy sample classes --> - <copy todir="${{build.webapp.classes}}" filtering="off"> - <fileset dir="${{build.blocks}}/{$block-name}/samples"/> - </copy> - </then> - </if> + <block-samples name="{$block-name}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> @@ -585,33 +735,19 @@ </xsl:attribute> </xsl:if> - <!-- Test if this block has libraries --> - <if> - <available type="dir" file="${{blocks}}/{$block-name}/lib/"/> - <then> + <!-- Copy the library depencies --> + <xsl:if test="library[not(@bundle='false')]"> <copy filtering="off" todir="${{build.webapp.lib}}"> - <fileset dir="${{blocks}}/{$block-name}/lib"> - <include name="*.jar"/> - <exclude name="servlet*.jar"/> - </fileset> - </copy> - </then> - </if> - - <!-- Test if this block has global WEB-INF files --> - <if> - <available type="dir" file="${{blocks}}/{$block-name}/WEB-INF/"/> - <then> - <copy filtering="on" todir="${{build.webapp.webinf}}"> - <fileset dir="${{blocks}}/{$block-name}/WEB-INF/"> - <include name="**"/> + <fileset dir="${{lib.optional}}"> + <xsl:for-each select="library[not(@bundle='false')]"> + <include name="[EMAIL PROTECTED]"/> + </xsl:for-each> </fileset> </copy> - </then> - </if> + </xsl:if> + <block-lib name="{$block-name}"/> </target> - <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> <xsl:if test="depend"> <xsl:attribute name="depends"> @@ -627,6 +763,14 @@ <path id="{$block-name}.classpath"> <path refid="classpath"/> + <xsl:if test="library"> + <fileset dir="${{lib.optional}}"> + <xsl:for-each select="library"> + <include name="[EMAIL PROTECTED]"/> + </xsl:for-each> + </fileset> + </xsl:if> + <!-- include the block/lib directory (deprecated) --> <fileset dir="${{blocks}}/{$block-name}"> <include name="lib/*.jar"/> </fileset> @@ -651,68 +795,11 @@ </xsl:for-each> </xsl:if> </xsl:attribute> - - <!-- Test if this block has tests --> - <if> - <available file="${{blocks}}/{$block-name}/test"/> - <then> - <mkdir dir="${{build.blocks}}/{$block-name}/test"/> - - <copy todir="${{build.blocks}}/{$block-name}/test" filtering="on"> - <fileset dir="${{blocks}}/{$block-name}/test" excludes="**/*.java"/> - </copy> - - <javac destdir="${{build.blocks}}/{$block-name}/test" - debug="${{compiler.debug}}" - optimize="${{compiler.optimize}}" - deprecation="${{compiler.deprecation}}" - target="${{target.vm}}" - nowarn="${{compiler.nowarn}}" - compiler="${{compiler}}"> - <src path="${{blocks}}/{$block-name}/test"/> - <classpath> - <path refid="{$block-name}.classpath"/> - <path refid="test.classpath"/> - <pathelement location="${{build.test}}"/> - </classpath> - </javac> - - <junit printsummary="yes" fork="yes" failureproperty="junit.test.failed"> - <jvmarg value="-Djava.endorsed.dirs=lib/endorsed"/> - <jvmarg value="-Djunit.test.loglevel=${{junit.test.loglevel}}"/> - <classpath> - <path refid="{$block-name}.classpath"/> - <path refid="test.classpath"/> - <pathelement location="${{build.test}}"/> - <pathelement location="${{build.blocks}}/{$block-name}/test"/> - </classpath> - <formatter type="plain" usefile="no"/> - <formatter type="xml"/> - <batchtest todir="${{build.test.output}}"> - <fileset dir="${{build.blocks}}/{$block-name}/test"> - <include name="**/*TestCase.class"/> - <include name="**/*Test.class"/> - <exclude name="**/AllTest.class"/> - <exclude name="**/*$$*Test.class"/> - <exclude name="**/Abstract*.class"/> - </fileset> - </batchtest> - </junit> - </then> - </if> + <block-tests name="{$block-name}"/> </target> <target name="[EMAIL PROTECTED]" unless="internal.exclude.block.{$block-name}"> - <!-- Test if this block has Anteater tests --> - <if> - <available file="${{blocks}}/{$block-name}/test/anteater"/> - <then> - <copy todir="${{build.test}}/anteater"> - <fileset dir="${{blocks}}/{$block-name}/test/anteater"/> - <mapper type="glob" from="*.xml" to="{$block-name}-*.xml"/> - </copy> - </then> - </if> + <block-prepare-anteater-tests name="{$block-name}"/> </target> </xsl:template> </xsl:stylesheet> Modified: cocoon/trunk/tools/targets/compile-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/compile-build.xml?view=diff&rev=125598&p1=cocoon/trunk/tools/targets/compile-build.xml&r1=125597&p2=cocoon/trunk/tools/targets/compile-build.xml&r2=125598 ============================================================================== --- cocoon/trunk/tools/targets/compile-build.xml (original) +++ cocoon/trunk/tools/targets/compile-build.xml Wed Jan 19 01:22:13 2005 @@ -227,7 +227,6 @@ <xslt in="${gump.descriptor}" out="${build.temp}/blocks-build.xml" - processor="trax" style="${tools.src}/blocks-build.xsl"/> </target> Modified: cocoon/trunk/tools/targets/init-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?view=diff&rev=125598&p1=cocoon/trunk/tools/targets/init-build.xml&r1=125597&p2=cocoon/trunk/tools/targets/init-build.xml&r2=125598 ============================================================================== --- cocoon/trunk/tools/targets/init-build.xml (original) +++ cocoon/trunk/tools/targets/init-build.xml Wed Jan 19 01:22:13 2005 @@ -126,9 +126,6 @@ <include name="*.jar"/> </fileset> --> - <fileset dir="${lib.optional}"> - <include name="*.jar"/> - </fileset> <path location="${build.mocks}"/> <path location="${build.dest}"/> </path> Modified: cocoon/trunk/tools/targets/validate-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/validate-build.xml?view=diff&rev=125598&p1=cocoon/trunk/tools/targets/validate-build.xml&r1=125597&p2=cocoon/trunk/tools/targets/validate-build.xml&r2=125598 ============================================================================== --- cocoon/trunk/tools/targets/validate-build.xml (original) +++ cocoon/trunk/tools/targets/validate-build.xml Wed Jan 19 01:22:13 2005 @@ -68,7 +68,6 @@ value="/"/> <xslt in="${lib}/jars.xml" out="${build.temp}/jars.xml" - processor="trax" style="${tools}/src/check-jars.xsl"> <param name="stylesheet-path" expression="${tools}/src"/> <param name="current-jars-path" expression="${build.temp}"/> Modified: cocoon/trunk/tools/targets/webapp-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/webapp-build.xml?view=diff&rev=125598&p1=cocoon/trunk/tools/targets/webapp-build.xml&r1=125597&p2=cocoon/trunk/tools/targets/webapp-build.xml&r2=125598 ============================================================================== --- cocoon/trunk/tools/targets/webapp-build.xml (original) +++ cocoon/trunk/tools/targets/webapp-build.xml Wed Jan 19 01:22:13 2005 @@ -65,10 +65,6 @@ <include name="*.jar"/> </fileset> --> - <fileset dir="${lib.optional}"> - <include name="*.jar"/> - <exclude name="servlet*.jar"/> - </fileset> <fileset dir="${lib.local}"> <include name="*.jar"/> <exclude name="servlet*.jar"/>