You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2006/03/11 11:41:50 UTC

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

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


Re: 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

Posted by Bruno Dumon <br...@outerthought.org>.
On Mon, 2006-03-13 at 09:26 +0100, Leszek Gawron wrote:
> bruno@apache.org wrote:
> > 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
> you cannot do it like this - maven won't pick that file up for jar package.
> 

Ah of course. I have now added it to the resources in the pom of the
template block. If you prefer another solution, just let me know. BTW, I
think we'll need to do something similar for the resources in the forms
block.

-- 
Bruno Dumon                             http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
bruno@outerthought.org                          bruno@apache.org


Re: 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

Posted by Leszek Gawron <lg...@mobilebox.pl>.
bruno@apache.org wrote:
> 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
you cannot do it like this - maven won't pick that file up for jar package.

-- 
Leszek Gawron                                      lgawron@mobilebox.pl
IT Manager                                         MobileBox sp. z o.o.
+48 (61) 855 06 67                              http://www.mobilebox.pl
mobile: +48 (501) 720 812                       fax: +48 (61) 853 29 65