Date: 2004-10-04T16:59:00
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -241,16 +241,6 @@
src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java
src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java
}}}
- * xmldb
- {{{
-
src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
-
src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
- src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
- src/blocks/xmldb/conf/xindice-mapping.xweb
- src/blocks/xmldb/conf/xmldb.xconf
- src/blocks/xmldb/conf/xindice-servlet.xweb
- src/blocks/xmldb/WEB-INF/xindice.xml
- }}}
* xsp
{{{
src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java
@@ -312,6 +302,7 @@
* slop
* stx
* taglib
- * Velocity
+ * velocity
* web3
- * Woody
+ * woody
+ * xmldb
