svn commit: r168403 - in /incubator/beehive/trunk/samples/petstoreWeb: WEB-INF/ build.xml src/webappRoot/ src/webappRoot/SharedFlow.java web/webappRoot/

[ek...@apache.org]

Author: ekoneil
Date: Thu May  5 13:55:25 2005
New Revision: 168403

URL: http://svn.apache.org/viewcvs?rev=168403&view=rev
Log:
Few more petstoreWeb build changes.

- move web/webappRoot/SharedFlow.jpfs into src/webappRoot/ShaerdFlow.jpfs; this really should be in the org.apache.beehive.samples.petstore package...
- delete the (unused) petstoreWeb/WEB-INF/ directory
- cleanup build.xml to reference the derby.jar checked into external/lib

BB: self
DRT: none


Added:
    incubator/beehive/trunk/samples/petstoreWeb/src/webappRoot/
      - copied from r168392, incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/
    incubator/beehive/trunk/samples/petstoreWeb/src/webappRoot/SharedFlow.java
      - copied unchanged from r168402, incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
Removed:
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/
    incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/
Modified:
    incubator/beehive/trunk/samples/petstoreWeb/build.xml

Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=168403&r1=168402&r2=168403&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Thu May  5 13:55:25 2005
@@ -22,6 +22,7 @@
 
     <import file="../../beehive-imports.xml"/>
     <import file="${beehive.home}/ant/beehive-tools.xml"/>
+    <property file="build.properties"/>
 
     <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
     <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
@@ -47,6 +48,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"/>
+
+        <copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
+
         <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/controlhaus/jdbc/trunk/build/dist/jdbc-control.jar"/>
 
         <deploy-netui webappDir="${build.dir}"/>
@@ -54,9 +61,6 @@
     </target>
 
     <target name="build" description="Build the webapp">
-        <available file="${lib.dir}/derby.jar" property="derby.present"/>
-        <fail unless="derby.present" message="Unable to locate ${lib.dir}/derby.jar.  Please download Derby from"/>
-
         <copy todir="${build.dir}/">
             <fileset dir="${web.dir}">
                 <exclude name="**/*.java"/>