Thanks, Eddie - I am getting the good build.xml now and am able to build netui-samples in the dist.
- jeremiah > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Wednesday, May 11, 2005 7:48 PM > To: [EMAIL PROTECTED] > Subject: svn commit: r169742 - in /incubator/beehive/trunk: ./ > samples/controls-spring/integration/ samples/controls-spring/web/WEB- > INF/src/ samples/netui-samples/WEB-INF/src/ samples/netui-samples/WEB- > INF/src/global/ > > Author: ekoneil > Date: Wed May 11 18:48:06 2005 > New Revision: 169742 > > URL: http://svn.apache.org/viewcvs?rev=169742&view=rev > Log: > Additional distribution build changes. > > - Add .properties file to controls-spring to define the beehive.home and > servlet JAR > - remove netui-samples/WEB-INF/src/global directory > - fix the netui-samples build to work in a distribution > > BB: self > DRT: none / build.dist passes > > > Added: > incubator/beehive/trunk/samples/controls- > spring/integration/build.properties (with props) > incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.properties (with props) > Removed: > incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/global/ > Modified: > incubator/beehive/trunk/distribution.xml > incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build- > svn.xml > incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml > > Modified: incubator/beehive/trunk/distribution.xml > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?r ev > =169742&r1=169741&r2=169742&view=diff > ======================================================================== == > ==== > --- incubator/beehive/trunk/distribution.xml (original) > +++ incubator/beehive/trunk/distribution.xml Wed May 11 18:48:06 2005 > @@ -290,7 +290,6 @@ > <!-- rename build-dist.properties to build.properties --> > <copy tofile="${dist.dir}/samples/petstoreWeb/build.properties" > file="${beehive.home}/samples/petstoreWeb/build-dist.properties" > failOnError="true"/> > > - > <!-- Build the netui-samples distro --> > <ant antfile="${beehive.home}/ant/buildWebapp.xml" > target="clean"> > <property name="webapp.dir" > location="${beehive.home}/samples/netui-samples"/> > @@ -298,20 +297,18 @@ > > <copy todir="${dist.dir}/samples/netui-samples" > failOnError="true"> > <fileset dir="samples/netui-samples"> > - <exclude name="WEB-INF/src/build.xml"/> > <exclude name="WEB-INF/src/build-dist.xml"/> > <exclude name="WEB-INF/src/build-dist.properties"/> > <exclude name="WEB-INF/lib/*.jar"/> > </fileset> > </copy> > - > - <!-- rename build-dist.xml to build.xml --> > +<!-- > <copy tofile="${dist.dir}/samples/netui-samples/WEB- > INF/src/build.xml" > file="${beehive.home}/samples/netui-samples/WEB- > INF/src/build-dist.xml" failOnError="true"/> > > - <!-- rename build-dist.properties to build.properties --> > <copy tofile="${dist.dir}/samples/netui-samples/WEB- > INF/src/build.properties" > file="${beehive.home}/samples/netui-samples/WEB- > INF/src/build-dist.properties" failOnError="true"/> > +--> > > <!-- Build the controls blank template app distro --> > <copy todir="${dist.dir}/samples/controls-blank" > failOnError="true"> > > Added: incubator/beehive/trunk/samples/controls- > spring/integration/build.properties > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls- > spring/integration/build.properties?rev=169742&view=auto > ======================================================================== == > ==== > --- incubator/beehive/trunk/samples/controls- > spring/integration/build.properties (added) > +++ incubator/beehive/trunk/samples/controls- > spring/integration/build.properties Wed May 11 18:48:06 2005 > @@ -0,0 +1,4 @@ > +# > +# > +# > +servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar > \ No newline at end of file > > Propchange: incubator/beehive/trunk/samples/controls- > spring/integration/build.properties > ------------------------------------------------------------------------ -- > ---- > svn:eol-style = native > > Modified: incubator/beehive/trunk/samples/controls-spring/web/WEB- > INF/src/build-svn.xml > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls- > spring/web/WEB-INF/src/build- > svn.xml?rev=169742&r1=169741&r2=169742&view=diff > ======================================================================== == > ==== > --- incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build- > svn.xml (original) > +++ incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build- > svn.xml Wed May 11 18:48:06 2005 > @@ -45,7 +45,7 @@ > <!-- ========================================= --> > > <target name="build" description="Build the webapp"> > - <deploy-controls destDir="${basedir}"/> > + <deploy-controls destDir="${basedir}/WEB-INF/lib"/> > > <copy todir="${basedir}/WEB-INF/lib/" overwrite="true"> > <fileset dir="${basedir}/../integration/build/lib" includes="**" > /> > > Added: incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.properties > URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui- > samples/WEB-INF/src/build.properties?rev=169742&view=auto > ======================================================================== == > ==== > --- incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.properties (added) > +++ incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.properties Wed May 11 18:48:06 2005 > @@ -0,0 +1,9 @@ > +# > +# > +# > +beehive.home=../../../.. > + > +servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar > +jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar > + > +context.path=netui-samples > \ No newline at end of file > > Propchange: incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.properties > ------------------------------------------------------------------------ -- > ---- > svn:eol-style = native > > Modified: incubator/beehive/trunk/samples/netui-samples/WEB- > INF/src/build.xml > URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui- > samples/WEB-INF/src/build.xml?rev=169742&r1=169741&r2=169742&view=diff > ======================================================================== == > ==== > --- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml > (original) > +++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml > Wed May 11 18:48:06 2005 > @@ -24,6 +24,7 @@ > > <property environment="os"/> > <property file="build.properties"/> > + > <import file="${beehive.home}/beehive-imports.xml"/> > <import file="${beehive.home}/ant/beehive-tools.xml"/> > > @@ -85,9 +86,9 @@ > </target> > > <target name="clean" description="Clean the netui-samples webapp"> > - <delete dir="${webapp.dir}/WEB-INF/classes" > includeEmptyDirs="true"/> > - <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" > includeEmptyDirs="true"/> > - <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" > includeEmptyDirs="true" failOnError="false"/> > + <delete dir="${webapp.dir}/WEB-INF/classes"/> > + <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/> > + <delete dir="${webapp.dir}/WEB-INF/.pageflow-struts-generated"/> > </target> > > <target name="war" description="Build a compressed WAR file that can > be deployed to an application container"> >
