Return-Path: Delivered-To: apmail-cocoon-dev-archive@www.apache.org Received: (qmail 76436 invoked from network); 25 Feb 2006 16:51:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Feb 2006 16:51:51 -0000 Received: (qmail 52153 invoked by uid 500); 25 Feb 2006 16:51:49 -0000 Delivered-To: apmail-cocoon-dev-archive@cocoon.apache.org Received: (qmail 52125 invoked by uid 500); 25 Feb 2006 16:51:49 -0000 Mailing-List: contact dev-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@cocoon.apache.org List-Id: Delivered-To: mailing list dev@cocoon.apache.org Received: (qmail 52114 invoked by uid 99); 25 Feb 2006 16:51:49 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO [127.0.0.1]) (209.237.227.194) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Feb 2006 08:51:49 -0800 Message-ID: <44008BF2.70802@apache.org> Date: Sat, 25 Feb 2006 17:55:14 +0100 From: Carsten Ziegeler User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: dev@cocoon.apache.org Subject: Re: Using trunk References: <43FE4526.8020704@nada.kth.se> <43FEB4E9.9040202@apache.org> <44001B00.9040705@nada.kth.se> In-Reply-To: <44001B00.9040705@nada.kth.se> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Daniel Fagerstrom wrote: > I described what files need to be copied in the first mail in the > thread, it is as simple as that. > > 1. Add the block you want to depend on to the pom.xml in cocoon-webapp. > 2. Copy the content of src/main/resources/WEB-INF in the blocks to the > src/main/webapp/WEB-INF of cocoon-webapp. > 3. Copy the contents of src/main/resources/samples in the sample blocks > to src/main/webapp/samples/blocks/ of cocoon-webapp. > Ah, ok, now, this means that you change the the src of the cocoon-webapp block (pom.xml and additional files in the resources). Now if I accidentially commit the webapp block I would commit all those stuff as well. Or am I wrong? Isn't there a better way? Carsten -- Carsten Ziegeler - Open Source Group, S&N AG http://www.s-und-n.de http://www.osoco.org/weblogs/rael/