Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 5641 invoked from network); 11 Mar 2006 10:42:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Mar 2006 10:42:12 -0000 Received: (qmail 16791 invoked by uid 500); 11 Mar 2006 10:42:12 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 16740 invoked by uid 500); 11 Mar 2006 10:42:11 -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 16729 invoked by uid 99); 11 Mar 2006 10:42:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Mar 2006 02:42:11 -0800 X-ASF-Spam-Status: No, hits=-9.4 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; Sat, 11 Mar 2006 02:42:11 -0800 Received: (qmail 5568 invoked by uid 65534); 11 Mar 2006 10:41:50 -0000 Message-ID: <20060311104150.5564.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r385053 - in /cocoon/trunk/cocoon-template/cocoon-template-impl/src/main: java/org/apache/cocoon/template/template-instructions.xml resources/org/apache/cocoon/template/template-instructions.xml Date: Sat, 11 Mar 2006 10:41:50 -0000 To: cvs@cocoon.apache.org From: bruno@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bruno Date: Sat Mar 11 02:41:49 2006 New Revision: 385053 URL: http://svn.apache.org/viewcvs?rev=385053&view=rev Log: Sharing template block with 2.1: step 3: move template-instructions.xml between java sources (AFAIK 2.1 build doesn't support a separate resources dir) Added: cocoon/trunk/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/template-instructions.xml - copied unchanged from r385046, cocoon/trunk/cocoon-template/cocoon-template-impl/src/main/resources/org/apache/cocoon/template/template-instructions.xml Removed: cocoon/trunk/cocoon-template/cocoon-template-impl/src/main/resources/org/apache/cocoon/template/template-instructions.xml