Return-Path: Delivered-To: apmail-cocoon-docs-archive@www.apache.org Received: (qmail 86467 invoked from network); 27 Sep 2004 11:56:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 27 Sep 2004 11:56:29 -0000 Received: (qmail 82727 invoked by uid 500); 27 Sep 2004 11:56:28 -0000 Delivered-To: apmail-cocoon-docs-archive@cocoon.apache.org Received: (qmail 82693 invoked by uid 500); 27 Sep 2004 11:56:27 -0000 Mailing-List: contact docs-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: docs@cocoon.apache.org Delivered-To: mailing list docs@cocoon.apache.org Received: (qmail 82675 invoked by uid 99); 27 Sep 2004 11:56:27 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 27 Sep 2004 04:56:25 -0700 Received: (qmail 86427 invoked from network); 27 Sep 2004 11:56:24 -0000 Received: from unknown (HELO minotaur.apache.org) (127.0.0.1) by 127.0.0.1 with SMTP; 27 Sep 2004 11:56:24 -0000 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: docs@cocoon.apache.org To: docs@cocoon.apache.org Subject: =?iso-8859-1?q?=5BCocoon_Wiki=5D_Updated=3A__MergingBranches?= Date: Mon, 27 Sep 2004 11:56:24 -0000 Message-ID: <20040927115624.86373.59447@minotaur.apache.org> X-Spam-Rating: 127.0.0.1 1.6.2 0/1000/N X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Date: 2004-09-27T04:56:24 Editor: CarstenZiegeler 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/Backgroun= dEnvironment.java - src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecuto= r.java - src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobSchedul= er.java - src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCr= onJob.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.j= ava @@ -356,6 +341,7 @@ * axis * batik * bsf (Groovy support is not merged as it requires JDK 1.4) + * cron * databases * Deli * eventcache