Date: 2004-09-27T04:56:24
   Editor: CarstenZiegeler <[EMAIL PROTECTED]>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -108,21 +108,6 @@
    src/blocks/chaperon/samples/stylesheets/error2html.xsl
    src/blocks/chaperon/samples/stylesheets/wiki2xdoc.xsl
    }}}
- * Cron
-   {{{
-   
src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
-   
src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
-   
src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
-   
src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java
-   src/blocks/cron/java/org/apache/cocoon/components/cron/TestCronJob.java
-   src/blocks/cron/samples/cron.xml
-   src/blocks/cron/samples/sitemap.xmap
-   src/blocks/cron/samples/docs.xml
-   src/blocks/cron/conf/cron-category.xlog
-   src/blocks/cron/conf/cron.xsamples
-   src/blocks/cron/conf/cron.xconf
-   src/blocks/cron/conf/cron-target.xlog
-   }}}
  * html
    {{{
    src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
@@ -356,6 +341,7 @@
  * axis
  * batik
  * bsf (Groovy support is not merged as it requires JDK 1.4)
+ * cron
  * databases
  * Deli
  * eventcache