Return-Path: 
 <forrest-dev-return-2423-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 8801 invoked by uid 500); 9 Sep 2002 10:07:20 -0000
Mailing-List: contact forrest-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-dev-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-dev-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-dev@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-dev@xml.apache.org
Received: (qmail 8785 invoked from network); 9 Sep 2002 10:07:15 -0000
Received: from new-smtp1.ihug.com.au (203.109.250.27)
  by daedalus.apache.org with SMTP; 9 Sep 2002 10:07:15 -0000
Received: from p1443-apx1.syd.ihug.com.au (expresso.localdomain)
 [203.173.139.173]
	by new-smtp1.ihug.com.au with esmtp (Exim 3.22 #1 (Debian))
	id 17oLRo-0001Ty-00; Mon, 09 Sep 2002 20:07:12 +1000
Received: from jeff by expresso.localdomain with local (Exim 3.35 #1 (Debian))
	id 17oLmD-0002uB-00
	for <forrest-dev@xml.apache.org>; Mon, 09 Sep 2002 20:28:17 +1000
Date: Mon, 9 Sep 2002 20:28:16 +1000
From: Jeff Turner <jefft@apache.org>
To: forrest-dev@xml.apache.org
Subject: [PATCH] build system: webapp target
Message-ID: <20020909102816.GB1184@expresso.localdomain>
Mail-Followup-To: forrest-dev@xml.apache.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="UlVJffcvxoiEqYs2"
Content-Disposition: inline
User-Agent: Mutt/1.4i
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
Status: O
X-Status: 
X-Keywords: 


--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

I've been hacking away at a Forrest site for the last 2 weeks, and now
that it's mostly working I'd like to get some of the patches I made back
into Forrest.

First up is a small mod for build.build.xml and forrest.build.xml. There
is a new 'webapp' target, which builds an unpackaged webapp. The existing
'webapp' target has been renamed to 'war'.

The idea is that you point Tomcat to $FORREST_HOME/build/webapp, then run
'./build.sh -f build.build.xml webapp', and then play in the
build/webapp directory, and see immediately the effect of changes. Once
you're happy, roll back the change into src/resouces/*. I find this a
much faster way to work on Forrest than waiting for 7+ minute static
builds.


--Jeff

--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="webapptarget.diff"

Index: build.build.xml
===================================================================
RCS file: /home/cvspublic/xml-forrest/build.build.xml,v
retrieving revision 1.5
diff -r1.5 build.build.xml
394c394,405
<       <property name="project.war" value="./build/forrest.war" />
---
>       <property name="project.webapp" value="./build/webapp" />
>     </ant>
>   </target>
> 
>   <!-- =================================================================== -->
>   <!-- Generate a .war files of the project-site                           -->
>   <!-- =================================================================== -->
>   <target name="war" depends="dist-shbat">
>     <property name="forrest.home" value="${dist-shbat.dir}" />
>     <ant antfile="${forrest.home}/forrest.build.xml" target="war">
>       <property name="project.home"     value="."            />
>       <property name="project.war" value="./build/${name}.war" />
Index: forrest.build.xml
===================================================================
RCS file: /home/cvspublic/xml-forrest/forrest.build.xml,v
retrieving revision 1.6
diff -r1.6 forrest.build.xml
46,47c46,47
<     <property name="forrest.home" value="." />
<     <property name="project.home" value="." />
---
>     <property name="forrest.home" location="." />
>     <property name="project.home" location="." />
54a55
>     <property name="project.webapp"      value="${project.home}/build/webapp" />
329a331,363
>   <target name="project.webapp.defined" unless="project.webapp">
>     <echo>
>       ------------------------------------------------
>       Error: $${project.webapp} variable has not been set. This is where the
>       webapp will be assembled. Please define it in the calling script.
>       ------------------------------------------------
>     </echo>
>     <fail message="project.webapp variable not set"/>
>   </target>
> 
>   <!-- ===============================================================
>        Builds a cocoon webapp for your project based on the siteplan.
>        param: location to put generated webapp ${project.webapp}
>        =============================================================== -->
>   <target name="webapp" depends="init, project.webapp.defined, prepare-context">
>     <!-- this will need revisions in the case of the siteplan
>     extra project-custom classes then will need to be warred in as well. -->
>     <mkdir dir="${project.webapp}/WEB-INF"/>
>     <copy file="${forrest.home}/WEB-INF/web.xml" todir="${project.webapp}/WEB-INF"/>
>     <copy todir="${project.webapp}">
>       <fileset dir="${project.ctxt-dir}" >
>         <exclude name="*.xconf" /> <!-- CLI wants them there, webapp finds them in WEB-INF -->
>       </fileset>
>     </copy>
>     <copy todir="${project.webapp}/WEB-INF">
>       <fileset dir="${forrest.home}/WEB-INF">
>         <include name="*.xconf" />
>         <include name="lib/**"/>
>         <include name="classes/**"/>
>       </fileset>
>     </copy>
>   </target>
> 
335c369
<   <target name="webapp" depends="init, prepare-context">
---
>   <target name="war" depends="init, prepare-context">

--UlVJffcvxoiEqYs2--