Date: 2004-08-16T01:40:41
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -346,14 +346,11 @@
src/blocks/ojb/lib/commons-dbcp-1.1.jar
src/blocks/ojb/lib/commons-pool-1.1.jar
src/blocks/ojb/lib/db-ojb-1.0.rc6.jar
- src/blocks/qdox/lib/qdox-1.5.jar
- src/blocks/qdox/lib/qdox-1.3.jar
tools/lib/ant-junit.jar
tools/lib/qdox-1.5.jar
tools/lib/ant-trax.jar
tools/lib/ant-launcher.jar
tools/lib/ant.jar
- tools/lib/qdox-1.3.jar
lib/optional/servlet-2_3.jar
lib/optional/jdtcore-3.0.0.jar
lib/optional/asm-util-1.4.2.jar
@@ -374,42 +371,6 @@
lib/core/commons-collections-3.0.jar
lib/core/util.concurrent-1.3.3.jar
lib/core/rhino1.5r4-continuations-20040228.jar
- }}}
- * Tools (with the exception of new-targets)
- {{{
- tools/jetty/conf/webdefaults.xml
- tools/instrumentation/readme.txt
- tools/src/blocks-build.xsl
- tools/src/anttasks/DocumentCache.java
- tools/src/anttasks/PoolSetterTask.java
- tools/src/anttasks/SitemapTask.java
- tools/src/anttasks/doclets/PackageOverviewXMLWriter.java
- tools/src/anttasks/doclets/AbstractXMLWriter.java
- tools/src/anttasks/doclets/Resolver.java
- tools/src/anttasks/doclets/ClassXMLWriter.java
- tools/src/anttasks/doclets/QdoxJavadocTask.java
- tools/src/anttasks/doclets/PackageXMLWriter.java
- tools/src/anttasks/doclets/resources/index.html
- tools/src/anttasks/doclets/ClassOverviewXMLWriter.java
- tools/src/anttasks/doclets/stylesheets/class2html.xsl
- tools/src/anttasks/doclets/stylesheets/allclasses2html.xsl
- tools/src/anttasks/doclets/stylesheets/allpackages2html.xsl
- tools/src/anttasks/doclets/stylesheets/package2html.xsl
- tools/src/anttasks/doclets/stylesheets/allpackages2overviewhtml.xsl
- tools/src/anttasks/XConfToolTask.java
- tools/bin/appendcp.bat
- tools/bin/ant
- tools/bin/ant.cmd
- tools/bin/envset.cmd
- tools/bin/create-repository-jars.sh
- tools/bin/runrc.cmd
- tools/bin/antenv.cmd
- tools/targets/init-build.xml
- tools/targets/samples-build.xml
- tools/targets/docs-build.xml
- tools/targets/compile-build.xml
- tools/targets/webapp-build.xml
- tools/targets/test-build.xml
}}}
* Root Directory
blocks.properties
