You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/07 16:38:35 UTC
svn commit: r169083 - in /incubator/beehive/trunk:
netui/ant/webappTemplate.xml samples/petstoreWeb/build-dist.properties
samples/petstoreWeb/build-dist.xml samples/petstoreWeb/build.properties
samples/petstoreWeb/build.xml user/beehive-runtime.xml
Author: ekoneil
Date: Sat May 7 07:38:33 2005
New Revision: 169083
URL: http://svn.apache.org/viewcvs?rev=169083&view=rev
Log:
Fixes in the petstore build.
These changes:
- add error.jsp to the runtime that NetUI deploys in the distribution and in the SVN build
- adds a derby.jar property to the .properties file
- fixes a classpath problem with running the HTTPUnit tests for petstoreWeb
- adds a "copy.jsps" target that can be used to move JSP changes into the deployed / exploded webapp dir
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/samples/petstoreWeb/build-dist.properties
incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
incubator/beehive/trunk/samples/petstoreWeb/build.properties
incubator/beehive/trunk/samples/petstoreWeb/build.xml
incubator/beehive/trunk/user/beehive-runtime.xml
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Sat May 7 07:38:33 2005
@@ -97,6 +97,13 @@
<include name="**/*"/>
</fileset>
</copy>
+
+ <!-- copy the /error.jsp file; this should really live in resources/beehive -->
+ <copy todir="${webapp.dir}" overwrite="false">
+ <fileset dir="${webapp.dist.dir}">
+ <include name="error.jsp"/>
+ </fileset>
+ </copy>
</target>
<target name="undeploy.netui.runtime" description="Clean the NetUI runtime from a webapp root directory.">
Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.properties?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.properties (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.properties Sat May 7 07:38:33 2005
@@ -8,6 +8,8 @@
servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+derby.jar=/path/to/derby
+
# Set this path in order to run HTTPUnit tests against the webapp
httpunit.dir=/fixme/to/run/tests
Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml Sat May 7 07:38:33 2005
@@ -48,6 +48,7 @@
<path refid="webapp.classpath"/>
<pathelement location="${testclasses.dir}"/>
<fileset dir="${httpunit.dir}/lib" includes="*.jar"/>
+ <fileset dir="${httpunit.dir}/jars" includes="*.jar"/>
</path>
<!-- ========================================= -->
@@ -57,7 +58,12 @@
<target name="deploy-beehive" description="Copy the Beehive webapp rutime into the petstoreWeb webapp">
<mkdir dir="${build.dir}"/>
+ <available file="${derby.jar}" property="derby.present"/>
+ <fail unless="derby.present"
+ message="Unable to locate ${derby.jar}. Please download Derby from http://incubator.apache.org/derby/derby_downloads.html and set the derby.jar property in build.properties"/>
+
<copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/lib/controls/jdbc-control.jar"/>
+ <copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
<deploy-netui webappDir="${build.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
@@ -74,12 +80,6 @@
</fileset>
</copy>
- <copy todir="${build.dir}/WEB-INF/lib">
- <fileset dir="${basedir}/lib">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
<copy todir="${build.dir}/WEB-INF/classes">
<fileset dir="${src.dir}/">
<include name="sql/**"/>
@@ -107,6 +107,16 @@
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
</target>
+
+ <target name="copy.jsps"
+ description="When deploying an exploded webapp, this target copies changed JSPs into the deployed directory">
+ <copy todir="${build.dir}/">
+ <fileset dir="${web.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="WEB-INF/**"/>
+ </fileset>
+ </copy>
+ </target>
<!-- ========================================= -->
<!-- clean - clean the webapp -->
@@ -127,7 +137,6 @@
<target name="war" description="Build a compressed WAR file that can be deployed to an application container">
<property name="archive.dir" location="${basedir}"/>
- <!-- this does *not* exclude source from the archive -->
<war destfile="${archive.dir}/${context.path}.war" webxml="${build.dir}/WEB-INF/web.xml">
<fileset dir="${build.dir}">
<exclude name="WEB-INF/web.xml"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/build.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.properties?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.properties (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.properties Sat May 7 07:38:33 2005
@@ -2,5 +2,7 @@
# petstoreWeb properties file for SVN
#
context.path=petstoreWeb
+
derby.jar=${beehive.home}/external/derby/derby_46005.jar
+
httpunit.dir=/no/such/dir
Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Sat May 7 07:38:33 2005
@@ -27,7 +27,6 @@
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
- <property name="context.path" value="petstoreWeb"/>
<property name="build.dir" location="build"/>
<property name="web.dir" location="web"/>
<property name="src.dir" location="src"/>
@@ -46,6 +45,7 @@
<path refid="webapp.classpath"/>
<pathelement location="${testclasses.dir}"/>
<fileset dir="${httpunit.dir}/lib" includes="*.jar"/>
+ <fileset dir="${httpunit.dir}/jars" includes="*.jar"/>
</path>
<!-- ========================================= -->
@@ -111,6 +111,16 @@
classpathref="webapp.classpath"/>
</target>
+ <target name="copy.jsps"
+ description="When deploying an exploded webapp, this target copies changed JSPs into the deployed directory">
+ <copy todir="${build.dir}/">
+ <fileset dir="${web.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="WEB-INF/**"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ========================================= -->
<!-- clean - clean the webapp -->
<!-- ========================================= -->
Modified: incubator/beehive/trunk/user/beehive-runtime.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-runtime.xml?rev=169083&r1=169082&r2=169083&view=diff
==============================================================================
--- incubator/beehive/trunk/user/beehive-runtime.xml (original)
+++ incubator/beehive/trunk/user/beehive-runtime.xml Sat May 7 07:38:33 2005
@@ -29,6 +29,12 @@
<include name="**/*"/>
</fileset>
</copy>
+
+ <copy todir="${webapp.dir}">
+ <fileset dir="../samples/netui-blank">
+ <include name="error.jsp"/>
+ </fileset>
+ </copy>
</target>
<target name="deploy.wsm.webapp.runtime" description="Deploy the Beehive/WSM webapp runtime given a webapp root as -Dwebapp.dir">