Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 75158 invoked from network); 5 Oct 2005 09:29:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Oct 2005 09:29:50 -0000 Received: (qmail 80218 invoked by uid 500); 5 Oct 2005 09:29:50 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 80157 invoked by uid 500); 5 Oct 2005 09:29:49 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 80146 invoked by uid 99); 5 Oct 2005 09:29:49 -0000 X-ASF-Spam-Status: No, hits=-9.8 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.29) with SMTP; Wed, 05 Oct 2005 02:29:48 -0700 Received: (qmail 74815 invoked by uid 65534); 5 Oct 2005 09:29:28 -0000 Message-ID: <20051005092928.74812.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r295026 - in /cocoon/trunk: ./ src/java/org/apache/cocoon/components/source/impl/ src/webapp/WEB-INF/xconf/ src/webapp/samples/sources/ Date: Wed, 05 Oct 2005 09:29:24 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: vgritsenko Date: Wed Oct 5 02:28:58 2005 New Revision: 295026 URL: http://svn.apache.org/viewcvs?rev=295026&view=rev Log: Moved support for zip: sources from scratchpad into the core. Added: cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ZipSource.java - copied unchanged from r295024, cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/ZipSource.java cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java - copied unchanged from r295024, cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java cocoon/trunk/src/webapp/samples/sources/test.sxw - copied unchanged from r295024, cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sources/test.sxw cocoon/trunk/src/webapp/samples/sources/test.zip - copied unchanged from r295024, cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sources/test.zip Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf cocoon/trunk/src/webapp/samples/sources/samples.xml cocoon/trunk/src/webapp/samples/sources/sitemap.xmap cocoon/trunk/status.xml Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?rev=295026&r1=295025&r2=295026&view=diff ============================================================================== --- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original) +++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Wed Oct 5 02:28:58 2005 @@ -539,6 +539,7 @@ + - - - + + - - Back to the samples home page. - + + Back to the samples home page. + - - Some of these samples require XSP to be present in order to work. - + + Some of these samples require XSP to be present in order to work. + - + - - This is the simpliest sample, similar to the "Hello World!". - + + This is the simpliest sample, similar to the "Hello World!". + - - Source is obtained from local file - - - - Source is obtained via cocoon:/source - - - - Source is obtained via cocoon://sub/source - - - - Source is obtained via http://<serverName>[:<serverPort>][/<contextPath>]/samples/sources/xsp/source - - - - Source is generated dynamically and obtained as Cocoon source cocoon:/dynamic-source - + + Source is obtained from local file + + + + Source is obtained via cocoon:/source + + + + Source is obtained via cocoon://sub/source + + + + Source is obtained via http://<serverName>[:<serverPort>][/<contextPath>]/samples/sources/xsp/source + + + + Source is generated dynamically and obtained as Cocoon source cocoon:/dynamic-source + - - XSL is obtained from local file - - - - XSL is obtained via cocoon:/xsl-source, processed by this sitemap directly. - - - - XSL is obtained via cocoon://sub/xsl-source, processed by root sitemap. - - - - XSL is obtained via http://<serverName>[:<serverPort>][/<contextPath>]/samples/sources/xsl-source - - - - XSL is dynamically generated and obtained as Cocoon source cocoon:/xsl-dynamic-source. - + + XSL is obtained from local file + + + + XSL is obtained via cocoon:/xsl-source, processed by this sitemap directly. + + + + XSL is obtained via cocoon://sub/xsl-source, processed by root sitemap. + + + + XSL is obtained via http://<serverName>[:<serverPort>][/<contextPath>]/samples/sources/xsl-source + + + + XSL is dynamically generated and obtained as Cocoon source cocoon:/xsl-dynamic-source. + - - Combines last XSP sample with last XSL sample: XSP is obtained via Cocoon - source cocoon:/dynamic-source, and processed by XSL obtained via Cocoon - source cocoon:/xsl-dynamic-source. - + + Combines last XSP sample with last XSL sample: XSP is obtained via Cocoon + source cocoon:/dynamic-source, and processed by XSL obtained via Cocoon + source cocoon:/xsl-dynamic-source. + - + - - Demonstrates use of upload:// pseudo-protocol. - + + Demonstrates use of upload:// pseudo-protocol. + + + + + Read test.xml file from test.zip ZIP archive + + + Read content.xml file out of test.sxw OpenOffice document. + + + Modified: cocoon/trunk/src/webapp/samples/sources/sitemap.xmap URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/sources/sitemap.xmap?rev=295026&r1=295025&r2=295026&view=diff ============================================================================== --- cocoon/trunk/src/webapp/samples/sources/sitemap.xmap (original) +++ cocoon/trunk/src/webapp/samples/sources/sitemap.xmap Wed Oct 5 02:28:58 2005 @@ -1,6 +1,6 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - Modified: cocoon/trunk/status.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=295026&r1=295025&r2=295026&view=diff ============================================================================== --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Wed Oct 5 02:28:58 2005 @@ -573,10 +573,13 @@ + + Moved support for zip: sources from scratchpad into the core. + - CForms: Small change to the calendar styling which now shows dropdowns to choose the time when - the date format includes time also. - + CForms: Small change to the calendar styling which now shows dropdowns + to choose the time when the date format includes time also. + Updated quartz to 1.5.0.