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/05 22:47:25 UTC

svn commit: r168401 - in /incubator/beehive/trunk: distribution.xml samples/petstoreWeb/build.xml samples/petstoreWeb/web/auth/Controller.jpf samples/petstoreWeb/web/checkout/Controller.jpf samples/petstoreWeb/web/shop/Controller.jpf samples/petstoreWeb/web/webappRoot/SharedFlow.jpfs

Author: ekoneil
Date: Thu May  5 13:47:24 2005
New Revision: 168401

URL: http://svn.apache.org/viewcvs?rev=168401&view=rev
Log:
petstoreWeb fixes.

Somehow, these JPFs came back...deleting them.

Also adding a check to see if derby.jar can be resolved by petstoreWeb.

BB: self
DRT: none


Removed:
    incubator/beehive/trunk/samples/petstoreWeb/web/auth/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/web/checkout/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/web/shop/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.jpfs
Modified:
    incubator/beehive/trunk/distribution.xml
    incubator/beehive/trunk/samples/petstoreWeb/build.xml

Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=168401&r1=168400&r2=168401&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu May  5 13:47:24 2005
@@ -443,6 +443,7 @@
         <copy todir="${dist.dir}/samples/petstoreWeb" failOnError="true">
             <fileset dir="samples/petstoreWeb">
                 <exclude name="build"/>
+                <exclude name="lib"/>
                 <exclude name="build-dist.xml"/>
                 <exclude name="build-dist.properties"/>
                 <exclude name="build.xml"/>

Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=168401&r1=168400&r2=168401&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Thu May  5 13:47:24 2005
@@ -30,6 +30,7 @@
     <property name="build.dir" location="build"/>
     <property name="web.dir" location="web"/>
     <property name="src.dir" location="src"/>
+    <property name="lib.dir" location="lib"/>
   
     <!-- ========================================= -->
     <!-- build - build the webapp                  -->
@@ -53,6 +54,9 @@
     </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"/>