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/21 23:52:37 UTC

svn commit: r171260 - in /incubator/beehive/trunk/samples/netui-samples: ./ WEB-INF/src/bundles/ WEB-INF/src/datagrid/ WEB-INF/src/org/apache/beehive/samples/netui/resources/ WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/ resources/template/ ui/datagrid/ validation/

Author: ekoneil
Date: Sat May 21 14:52:37 2005
New Revision: 171260

URL: http://svn.apache.org/viewcvs?rev=171260&view=rev
Log:
Some cleanup in netui-samples. 

- move the src/datagrid and src/bundles sources into src/org/apache/beehive/samples/netui
- fixup paths in JSPs related to the above
- various other cleanup

BB: self
DRT: none / build.dist pass


Added:
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/
      - copied from r171254, incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/bundles/
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/
      - copied from r171254, incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/datagrid/
Removed:
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/bundles/
    incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/datagrid/
Modified:
    incubator/beehive/trunk/samples/netui-samples/Controller.java
    incubator/beehive/trunk/samples/netui-samples/index.jsp
    incubator/beehive/trunk/samples/netui-samples/resources/template/template.jsp
    incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp
    incubator/beehive/trunk/samples/netui-samples/validation/Controller.java

Modified: incubator/beehive/trunk/samples/netui-samples/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/Controller.java?rev=171260&r1=171259&r2=171260&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/Controller.java Sat May 21 14:52:37 2005
@@ -34,18 +34,4 @@
 {
     @Jpf.SharedFlowField(name="shared")
     private shared.SharedFlow sharedFlow;
-
-    /**
-     * Callback that is invoked when this controller instance is created.
-     */
-    protected void onCreate()
-    {
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is destroyed.
-     */
-    protected void onDestroy(HttpSession session)
-    {
-    }
 }

Modified: incubator/beehive/trunk/samples/netui-samples/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/index.jsp?rev=171260&r1=171259&r2=171260&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/index.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/index.jsp Sat May 21 14:52:37 2005
@@ -23,23 +23,24 @@
 <netui-template:template templatePage="/resources/template/template.jsp">
   <netui-template:setAttribute name="samTitle" value="Home Page"/>
   <netui-template:section name="main">
-  <p>The following samples demonstrate a variety of individual Page Flow features.
+  <p>
+  The following samples demonstrate a variety of Beehive NetUI features:
   </p>
     <dl>
-      <dt><a href="validation/Controller.jpf">validation</a></dt>
+      <dt><netui:anchor href="validation/Controller.jpf" value="Validation"/></dt>
       <dd>This sample demonstrates the declarative validation model.</dd>
     </dl>
     <dl>
-      <dt><a href="ui/datagrid/Controller.jpf">data grid</a></dt>
+      <dt><netui:anchor href="ui/datagrid/Controller.jpf" value="Data Grid"/></dt>
       <dd>Demonstrates how to render a data set (in this case, an array of objects) 
         as an HTML table using the &lt;netui-data:dataGrid> tag.</dd>
     </dl>
     <dl>
-      <dt><a href="ui/tree/Controller.jpf">tree</a></dt>
+      <dt><netui:anchor href="ui/tree/Controller.jpf" value="Tree"/></dt>
       <dd>Demonstrates how to use &lt;netui:tree> and related tags.</dd>
     </dl>
     <dl>
-      <dt><a href="ui/popup/Controller.jpf">popup window</a></dt>
+      <dt><netui:anchor href="ui/popup/Controller.jpf" value="Popup Window"/></dt>
       <dd>Demonstrates popup window implemented by a nested page flow.</dd>
     </dl>
   </netui-template:section>

Modified: incubator/beehive/trunk/samples/netui-samples/resources/template/template.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/resources/template/template.jsp?rev=171260&r1=171259&r2=171260&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/resources/template/template.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/resources/template/template.jsp Sat May 21 14:52:37 2005
@@ -20,9 +20,8 @@
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
 
-<netui-data:declareBundle bundlePath="bundles.site" name="site"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.netui.resources.site" name="site"/>
 
 <netui:html>
     <head>

Modified: incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp?rev=171260&r1=171259&r2=171260&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp Sat May 21 14:52:37 2005
@@ -24,29 +24,27 @@
   <netui-template:setAttribute name="samTitle" value="Data Grid"/>
   <netui-template:section name="main">
     <!--
-      The 'dataSource' attribute points to the 'pets' member variable in the class 'datagrid/Controller.jpf' 
-      The 'resouceBundlePath' attribute points to the file WEB-INF/src/datagrid/grid.properties 
-      The 'styleClassPrefix' attribute points to the CSS styles defined in the file resource/css/style.css
+      The 'dataSource' attribute references the 'pets' member variable in the class 'datagrid/Controller.jpf' 
+      The 'resouceBundlePath' attribute references the file WEB-INF/src/org/apache/beehive/samples/netui/datagrid/grid.properties 
+      The 'styleClassPrefix' attribute references the CSS styles defined in the file resource/css/style.css
     -->
-    <netui-data:dataGrid  
-      name="petGrid" 
-      dataSource="pageInput.petList"
-      resourceBundlePath="datagrid.grid"
-      styleClassPrefix="gridStyle" >
+    <netui-data:dataGrid name="petGrid" dataSource="pageInput.petList"
+                         resourceBundlePath="datagrid.grid"
+                         styleClassPrefix="gridStyle">
     <netui-data:configurePager pageSize="3" pagerFormat="prevNext" pageAction="begin.do"/>
         <netui-data:caption>Pets Available</netui-data:caption>
         <netui-data:header>
-            <netui-data:headerCell headerText="Pet ID Number" />
+            <netui-data:headerCell headerText="Pet ID Number"/>
             <netui-data:headerCell headerText="Name"/>
             <netui-data:headerCell headerText="Description"/>
             <netui-data:headerCell headerText="Price"/>
         </netui-data:header>
         <netui-data:rows>
-            <netui-data:spanCell value="${container.item.petID}" />
-            <netui-data:spanCell value="${container.item.name}" />
+            <netui-data:spanCell value="${container.item.petID}"/>
+            <netui-data:spanCell value="${container.item.name}"/>
             <netui-data:spanCell value="${container.item.description}"/>
             <netui-data:spanCell value="${container.item.price}"/>
         </netui-data:rows>
     </netui-data:dataGrid>
   </netui-template:section>
-</netui-template:template>
\ No newline at end of file
+</netui-template:template>

Modified: incubator/beehive/trunk/samples/netui-samples/validation/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/validation/Controller.java?rev=171260&r1=171259&r2=171260&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/validation/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/validation/Controller.java Sat May 21 14:52:37 2005
@@ -17,10 +17,10 @@
  */
 package validation;
 
+import java.io.Serializable;
+
 import org.apache.beehive.netui.pageflow.*;
 import org.apache.beehive.netui.pageflow.annotations.*;
-
-import java.io.Serializable;
 
 @Jpf.Controller(
     simpleActions = {@Jpf.SimpleAction(name="begin",path="index.jsp")},