svn commit: r169348 - in /incubator/beehive/trunk/samples/petstoreWeb: README build-dist.xml build.xml web/checkout/confirm.jsp web/shop/category.jsp

[ek...@apache.org]

Author: ekoneil
Date: Mon May  9 12:15:53 2005
New Revision: 169348

URL: http://svn.apache.org/viewcvs?rev=169348&view=rev
Log:
PetstoreWeb fixes from Scott Semyan.

- fix HTML generated by the JSPs.  We're picking up a strict XML parser now and need to adjust the JSPs to account for this
- few build tweaks for usability
- README fix

BB: self
DRT: petstoreWeb pass


Modified:
    incubator/beehive/trunk/samples/petstoreWeb/README
    incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
    incubator/beehive/trunk/samples/petstoreWeb/build.xml
    incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp
    incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp

Modified: incubator/beehive/trunk/samples/petstoreWeb/README
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/README?rev=169348&r1=169347&r2=169348&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/README (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/README Mon May  9 12:15:53 2005
@@ -36,7 +36,9 @@
 
    Download: http://incubator.apache.org/derby/derby_downloads.html
 
-Copy derby.jar to the samples/petstoreWeb/lib directory.
+Once Derby has been downloaded, set the "derby.jar" property in build.properties
+so that derby.jar can be located by the build file and copied to the webapp's 
+WEB-INF/lib directory.
    
 5) Specifying the Derby database location
 

Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=169348&r1=169347&r2=169348&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml Mon May  9 12:15:53 2005
@@ -55,7 +55,7 @@
     <!-- build - build the webapp                  -->
     <!-- ========================================= -->
 
-    <target name="deploy-beehive" description="Copy the Beehive webapp rutime into the petstoreWeb webapp">
+    <target name="deploy-beehive" description="Copy the Beehive rutime into the petstoreWeb webapp">
         <mkdir dir="${build.dir}"/>
 
         <available file="${derby.jar}" property="derby.present"/>
@@ -152,7 +152,8 @@
         <mkdir dir="${testclasses.dir}"/>
         <javac srcdir="${testsrc.dir}" 
                destdir="${testclasses.dir}" 
-               classpathref="webapptest.classpath"/>
+               classpathref="webapptest.classpath"
+               debug="true"/>
     </target>
 
     <target name="test.clean" description="Clean the HTTPUnit tests for the petstore">

Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=169348&r1=169347&r2=169348&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Mon May  9 12:15:53 2005
@@ -176,7 +176,8 @@
         <mkdir dir="${testclasses.dir}"/>
         <javac srcdir="${testsrc.dir}" 
                destdir="${testclasses.dir}" 
-               classpathref="webapptest.classpath"/>
+               classpathref="webapptest.classpath"
+               debug="true"/>
     </target>
 
     <target name="test.clean" description="Clean the HTTPUnit tests for the petstore">

Modified: incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp?rev=169348&r1=169347&r2=169348&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp Mon May  9 12:15:53 2005
@@ -15,9 +15,7 @@
       <center>
       <netui:span styleClass="boldlabel" value="${bundle.view.confirmMessage}"/>
       </center>
-      <p>
       <beehive-petstore:orderSummary />
-      <p>
       <center>
       <netui:anchor action="viewCreateOrder" value="<< ${bundle.view.buttonPrevious}" />&nbsp;&nbsp;
 	  <netui:anchor action="confirm" value="${bundle.view.buttonContinue} >>"/>

Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp?rev=169348&r1=169347&r2=169348&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp Mon May  9 12:15:53 2005
@@ -17,7 +17,6 @@
 
     <netui-template:section name="body">
     <netui:errors/>
-    <p>
     <center>
     <netui:span styleClass="boldlabel" value="${pageInput.category.name}"/>
     <br/>
@@ -44,6 +43,5 @@
         </netui-data:repeater>
     </table>
 		</center>
-    </p>
     </netui-template:section>
 </netui-template:template>