Date: 2004-08-30T06:01:31
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -180,14 +180,6 @@
blocks.properties
status.xml
Blocks:
- * Apples
- {{{
-
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/AppleResponse.java
-
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
-
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/DefaultAppleResponse.java
-
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/AppleController.java
-
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
- }}}
* Chaperon
{{{
src/blocks/chaperon/samples/wiki/selftest.txt
@@ -212,11 +204,6 @@
src/blocks/cron/conf/cron.xconf
src/blocks/cron/conf/cron-target.xlog
}}}
- * Databases
- {{{
-
src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
-
src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
- }}}
* Eventcache
{{{
src/blocks/eventcache/java/org/apache/cocoon/caching/impl/JMSEventMessageListener.java
@@ -544,11 +531,13 @@
* misc
* tools
Blocks:
+ * apples
* asciiart
* authentication-fw
* axis
* batik
* bsf (Groovy support is not merged as it requires JDK 1.4)
+ * databases
* Deli
* fop
* hsqldb
