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 2006/05/03 23:51:00 UTC
svn commit: r399449 - in /beehive/trunk/samples:
netui-samples/src/Controller.java netui-samples/web/Controller.java
petstoreWeb/build-dist.properties petstoreWeb/build-dist.xml
petstoreWeb/build.properties petstoreWeb/build.xml
Author: ekoneil
Date: Wed May 3 14:50:58 2006
New Revision: 399449
URL: http://svn.apache.org/viewcvs?rev=399449&view=rev
Log:
Move an errant Controller.java file from web/ to src/ and consolidate the build files for the petstore.
BB: self
Test: distribution builds
Added:
beehive/trunk/samples/netui-samples/src/Controller.java
- copied unchanged from r398609, beehive/trunk/samples/netui-samples/web/Controller.java
Removed:
beehive/trunk/samples/netui-samples/web/Controller.java
beehive/trunk/samples/petstoreWeb/build-dist.xml
Modified:
beehive/trunk/samples/petstoreWeb/build-dist.properties
beehive/trunk/samples/petstoreWeb/build.properties
beehive/trunk/samples/petstoreWeb/build.xml
Modified: beehive/trunk/samples/petstoreWeb/build-dist.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build-dist.properties?rev=399449&r1=399448&r2=399449&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build-dist.properties (original)
+++ beehive/trunk/samples/petstoreWeb/build-dist.properties Wed May 3 14:50:58 2006
@@ -1,5 +1,5 @@
#
-#
+# petstoreWeb properties
#
beehive.home=../../
@@ -9,6 +9,8 @@
jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
derby.jar=/path/to/derby.jar
+
+jdbc-control.jar=${beehive.home}/lib/controls/beehive-jdbc-control.jar
# Set this path in order to run HTTPUnit tests against the webapp
httpunit.dir=/fixme/to/run/tests
Modified: beehive/trunk/samples/petstoreWeb/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.properties?rev=399449&r1=399448&r2=399449&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.properties (original)
+++ beehive/trunk/samples/petstoreWeb/build.properties Wed May 3 14:50:58 2006
@@ -10,4 +10,7 @@
derby.jar=${beehive.home}/external/derby/derby_46005.jar
-httpunit.dir=/no/such/dir
+jdbc-control.jar=${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar
+
+# Set this path in order to run HTTPUnit tests against the webapp
+httpunit.dir=/fixme/to/run/tests
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.xml?rev=399449&r1=399448&r2=399449&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Wed May 3 14:50:58 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!--
- Copyright 2005 The Apache Software Foundation
+ Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
<property name="build.dir" location="build"/>
<property name="web.dir" location="web"/>
<property name="src.dir" location="src"/>
- <property name="ws.dir" location="ws"/>
<property name="testclasses.dir" location="classes/test"/>
<property name="testsrc.dir" location="test-src"/>
@@ -48,19 +47,18 @@
<fileset dir="${httpunit.dir}/jars" includes="*.jar"/>
</path>
- <!-- ================================================ -->
- <!-- deploy the Beehive runtime JARs into WEB-INF/lib -->
- <!-- ================================================ -->
-
+ <!-- ================================================== -->
+ <!-- deploy the Beehive framework JARs into WEB-INF/lib -->
+ <!-- ================================================== -->
<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://db.apache.org/derby/derby_downloads.html"/>
+ message="Unable to locate ${derby.jar}. Please download Derby from http://db.apache.org/derby/derby_downloads.html and set the derby.jar property in build.properties."/>
<copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
- <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar"/>
+ <copy todir="${build.dir}/WEB-INF/lib" file="${jdbc-control.jar}"/>
<deploy-netui webappDir="${build.dir}"/>
</target>
@@ -123,24 +121,8 @@
</target>
<!-- =========================================== -->
- <!-- deploy targets - move the app to the server -->
- <!-- =========================================== -->
- <target name="deploy" description="Deploy the webapp to a running server">
- <deploy-webapp webappDir="${build.dir}" contextPath="${context.path}"/>
- </target>
-
- <target name="undeploy" description="Undeploy the webapp from a running server">
- <undeploy-webapp contextPath="${context.path}"/>
- </target>
-
- <target name="redeploy" description="Redeploy the webapp on a running server">
- <redeploy-webapp contextPath="${context.path}"/>
- </target>
-
- <!-- =========================================== -->
<!-- create a compressed WAR file for deployment -->
<!-- =========================================== -->
-
<target name="war" description="Build a compressed WAR file that can be deployed to an application container">
<property name="archive.dir" location="${basedir}"/>
@@ -155,7 +137,6 @@
<!-- =========================================== -->
<!-- build / run HTTPUnit tests -->
<!-- =========================================== -->
-
<target name="test.build" depends="ensure.httpunit" description="Build the HTTPUnit tests for the petstore">
<mkdir dir="${testclasses.dir}"/>
<javac srcdir="${testsrc.dir}"