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/09/06 19:00:09 UTC
svn commit: r279038 - in /beehive/trunk/samples/netui-samples: WEB-INF/
WEB-INF/tags/data/ actioninterceptors/ actioninterceptors/interceptme/
actioninterceptors/nested/ basicNesting/main/ exceptions/ lifecycle/base/
lifecycle/longlived/ lifecycle/norm...
Author: ekoneil
Date: Tue Sep 6 09:59:44 2005
New Revision: 279038
URL: http://svn.apache.org/viewcvs?rev=279038&view=rev
Log:
Cleanup in the NetUI samples to:
- remove an unused .css file
- remove this .css file from the site template
- add the site template to the basic data grid samples
- add the copyright header to a few files that were missing it
- remove some unsed imports from various .java files
BB: self
Test: build.dist pass / samples run
Removed:
beehive/trunk/samples/netui-samples/resources/css/
beehive/trunk/samples/netui-samples/ui/cellrepeater/Controller.java
Modified:
beehive/trunk/samples/netui-samples/WEB-INF/tags/data/petdata.tag
beehive/trunk/samples/netui-samples/WEB-INF/web.xml
beehive/trunk/samples/netui-samples/actioninterceptors/Controller.java
beehive/trunk/samples/netui-samples/actioninterceptors/interceptme/Controller.java
beehive/trunk/samples/netui-samples/actioninterceptors/nested/Controller.java
beehive/trunk/samples/netui-samples/basicNesting/main/MainFlow.java
beehive/trunk/samples/netui-samples/exceptions/Controller.java
beehive/trunk/samples/netui-samples/lifecycle/base/BasePageFlow.java
beehive/trunk/samples/netui-samples/lifecycle/longlived/LongLivedPageFlow.java
beehive/trunk/samples/netui-samples/lifecycle/normal/NormalPageFlow.java
beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp
beehive/trunk/samples/netui-samples/nesting/Controller.java
beehive/trunk/samples/netui-samples/nesting/chooseairport/ChooseAirport.java
beehive/trunk/samples/netui-samples/resources/template/template.jsp
beehive/trunk/samples/netui-samples/templateactions/MainFlow.java
beehive/trunk/samples/netui-samples/templateactions/flow1/Flow1.java
beehive/trunk/samples/netui-samples/templateactions/flow2/Flow2.java
beehive/trunk/samples/netui-samples/templateactions/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/tiles/MainFlow.java
beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java
beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java
beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-pager.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-renderpagertag.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-fpnl-pager.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-implicit-objects.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-jumptopage.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css-foo.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-formatter.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-header.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-no-styles.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-style.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/Controller.jpf
beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/detail.jsp
beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/master.jsp
beehive/trunk/samples/netui-samples/ui/formintagfile/Controller.java
beehive/trunk/samples/netui-samples/ui/tree/Controller.java
beehive/trunk/samples/netui-samples/validation/Controller.java
Modified: beehive/trunk/samples/netui-samples/WEB-INF/tags/data/petdata.tag
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/tags/data/petdata.tag?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/tags/data/petdata.tag (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/tags/data/petdata.tag Tue Sep 6 09:59:44 2005
@@ -1,3 +1,20 @@
+<%--
+ Copyright 2005 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ --%>
<%@ tag body-content="empty" %>
<%@ tag import="java.util.Date"%>
<%@ tag import="org.apache.beehive.samples.netui.beans.PetType"%>
Modified: beehive/trunk/samples/netui-samples/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/web.xml?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/web.xml Tue Sep 6 09:59:44 2005
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <display-name>Beehive Web Application</display-name>
+ <display-name>Beehive NetUI Samples Web Application</display-name>
<!-- Filter to perform Page Flow operations when JSPs are hit directly. -->
<filter>
Modified: beehive/trunk/samples/netui-samples/actioninterceptors/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/actioninterceptors/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/actioninterceptors/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/actioninterceptors/Controller.java Tue Sep 6 09:59:44 2005
@@ -17,12 +17,8 @@
*/
package actioninterceptors;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
-
/**
* Demonstration of Page Flow action interceptors.
Modified: beehive/trunk/samples/netui-samples/actioninterceptors/interceptme/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/actioninterceptors/interceptme/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/actioninterceptors/interceptme/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/actioninterceptors/interceptme/Controller.java Tue Sep 6 09:59:44 2005
@@ -17,10 +17,7 @@
*/
package actioninterceptors.interceptme;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
Modified: beehive/trunk/samples/netui-samples/actioninterceptors/nested/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/actioninterceptors/nested/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/actioninterceptors/nested/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/actioninterceptors/nested/Controller.java Tue Sep 6 09:59:44 2005
@@ -17,10 +17,7 @@
*/
package actioninterceptors.nested;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
Modified: beehive/trunk/samples/netui-samples/basicNesting/main/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/basicNesting/main/MainFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/basicNesting/main/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/basicNesting/main/MainFlow.java Tue Sep 6 09:59:44 2005
@@ -18,7 +18,6 @@
package basicNesting.main;
import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@Jpf.Controller(
Modified: beehive/trunk/samples/netui-samples/exceptions/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/exceptions/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/exceptions/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/exceptions/Controller.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package exceptions;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
Modified: beehive/trunk/samples/netui-samples/lifecycle/base/BasePageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/lifecycle/base/BasePageFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/lifecycle/base/BasePageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/lifecycle/base/BasePageFlow.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package lifecycle.base;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
Modified: beehive/trunk/samples/netui-samples/lifecycle/longlived/LongLivedPageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/lifecycle/longlived/LongLivedPageFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/lifecycle/longlived/LongLivedPageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/lifecycle/longlived/LongLivedPageFlow.java Tue Sep 6 09:59:44 2005
@@ -17,14 +17,9 @@
*/
package lifecycle.longlived;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import lifecycle.base.BasePageFlow;
-
/**
* This is a "long-lived" page flow. It is not "destroyed" (released) when you hit another page
Modified: beehive/trunk/samples/netui-samples/lifecycle/normal/NormalPageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/lifecycle/normal/NormalPageFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/lifecycle/normal/NormalPageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/lifecycle/normal/NormalPageFlow.java Tue Sep 6 09:59:44 2005
@@ -17,14 +17,9 @@
*/
package lifecycle.normal;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import lifecycle.base.BasePageFlow;
-
/**
* This page flow simply inherits everything from BaseFlow, which contains an action for
Modified: beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp Tue Sep 6 09:59:44 2005
@@ -20,7 +20,6 @@
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
-
<netui-template:template templatePage="/resources/template/template.jsp">
<netui-template:setAttribute name="sampleTitle" value="Login Example - Protected Page Flow"/>
Modified: beehive/trunk/samples/netui-samples/nesting/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/nesting/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/nesting/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/nesting/Controller.java Tue Sep 6 09:59:44 2005
@@ -43,8 +43,14 @@
// This property ("yourName") is used in the JSPs to show that this page flow's state is
// restored when you return from the nested flow.
private String _yourName;
- public String getYourName() { return _yourName; }
- public void setYourName(String yourName) { _yourName = yourName; }
+
+ public String getYourName() {
+ return _yourName;
+ }
+
+ public void setYourName(String yourName) {
+ _yourName = yourName;
+ }
@Jpf.Action(
forwards={
Modified: beehive/trunk/samples/netui-samples/nesting/chooseairport/ChooseAirport.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/nesting/chooseairport/ChooseAirport.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/nesting/chooseairport/ChooseAirport.java (original)
+++ beehive/trunk/samples/netui-samples/nesting/chooseairport/ChooseAirport.java Tue Sep 6 09:59:44 2005
@@ -17,14 +17,13 @@
*/
package nesting.chooseairport;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import java.io.Serializable;
import java.util.Iterator;
import java.util.ArrayList;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
@Jpf.Controller(
nested=true,
Modified: beehive/trunk/samples/netui-samples/resources/template/template.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/resources/template/template.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/resources/template/template.jsp (original)
+++ beehive/trunk/samples/netui-samples/resources/template/template.jsp Tue Sep 6 09:59:44 2005
@@ -28,7 +28,6 @@
<title>
${bundle.site.browserTitle} -- <netui-template:attribute name="sampleTitle" defaultValue="Sample"/>
</title>
- <link rel="stylesheet" href="${pageContext.request.contextPath}/resources/css/style.css" type="text/css"/>
</head>
<netui:body>
<div>
Modified: beehive/trunk/samples/netui-samples/templateactions/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/templateactions/MainFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/templateactions/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/templateactions/MainFlow.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package templateactions;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/templateactions/flow1/Flow1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/templateactions/flow1/Flow1.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/templateactions/flow1/Flow1.java (original)
+++ beehive/trunk/samples/netui-samples/templateactions/flow1/Flow1.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package templateactions.flow1;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/templateactions/flow2/Flow2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/templateactions/flow2/Flow2.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/templateactions/flow2/Flow2.java (original)
+++ beehive/trunk/samples/netui-samples/templateactions/flow2/Flow2.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package templateactions.flow2;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/templateactions/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/templateactions/shared/SharedFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/templateactions/shared/SharedFlow.java (original)
+++ beehive/trunk/samples/netui-samples/templateactions/shared/SharedFlow.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package templateactions.shared;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.SharedFlowController;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/tiles/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/tiles/MainFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/tiles/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/tiles/MainFlow.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package tiles;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java (original)
+++ beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package tiles.flow1;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java (original)
+++ beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java Tue Sep 6 09:59:44 2005
@@ -17,8 +17,6 @@
*/
package tiles.flow2;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java (original)
+++ beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java Tue Sep 6 09:59:44 2005
@@ -17,10 +17,7 @@
*/
package tiles.shared;
-import java.io.Serializable;
-
import org.apache.beehive.netui.pageflow.SharedFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@Jpf.Controller(
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-pager.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-pager.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-pager.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-pager.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Simple Data Grid"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -39,5 +36,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-renderpagertag.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-renderpagertag.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-renderpagertag.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-default-renderpagertag.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid using the Render Pager Tag"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -42,5 +39,5 @@
<tr><td colspan="4"><netui-data:renderPager/></td></tr>
</netui-data:footer>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-fpnl-pager.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-fpnl-pager.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-fpnl-pager.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-fpnl-pager.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with First/Previous Next/Last Pager"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -39,5 +36,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-implicit-objects.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-implicit-objects.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-implicit-objects.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-implicit-objects.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Binding to Data Grid Implicit Objects"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -53,5 +50,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-jumptopage.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-jumptopage.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-jumptopage.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-pager-jumptopage.jsp Tue Sep 6 09:59:44 2005
@@ -18,16 +18,13 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ 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 prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<netui:html>
- <head>
- <title>Data Grid with Jump To Page Pager</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Data Grid with Jump To Page Pager</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with Jump-to-Page Pager"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -76,5 +73,5 @@
</td>
</netui-data:footer>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
\ No newline at end of file
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css-foo.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css-foo.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css-foo.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css-foo.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid using CSS with Style Prefix"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -38,5 +35,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-css.jsp Tue Sep 6 09:59:44 2005
@@ -18,15 +18,12 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ 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 prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid using CSS"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -38,5 +35,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-formatter.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-formatter.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-formatter.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-formatter.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with Cell Formatting"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -42,5 +39,5 @@
</netui-data:spanCell>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-header.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-header.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-header.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-header.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with Header"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -44,5 +41,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-no-styles.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-no-styles.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-no-styles.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-no-styles.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with no Style Classes"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -38,5 +35,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-style.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-style.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-style.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic-with-style.jsp Tue Sep 6 09:59:44 2005
@@ -17,16 +17,13 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid with Style Attribute"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -37,5 +34,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/basic/basic.jsp Tue Sep 6 09:59:44 2005
@@ -1,15 +1,29 @@
+<%--
+ Copyright 2004-2005 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Basic Data Grid"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -21,5 +35,5 @@
<netui-data:spanCell value="${container.item.price}"/>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp Tue Sep 6 09:59:44 2005
@@ -17,27 +17,24 @@
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Feature Samples</b><br/>
- <netui:anchor href="basic/basic.jsp">Basic</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-header.jsp">Basic with Header</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-formatter.jsp">Basic with Formatter</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-style.jsp">Basic with Style</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-css.jsp">Basic with CSS</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-css-foo.jsp">Basic with CSS Named foo</netui:anchor><br/>
- <netui:anchor href="basic/basic-with-no-styles.jsp">Basic with No Styles</netui:anchor><br/>
- <netui:anchor href="basic/basic-default-pager.jsp">Basic with Default Pager</netui:anchor><br/>
- <netui:anchor href="basic/basic-fpnl-pager.jsp">Basic with FPNL Pager</netui:anchor><br/>
- <netui:anchor href="basic/basic-pager-implicit-objects.jsp">Basic with Implicit Object Binding</netui:anchor><br/>
- <netui:anchor href="basic/basic-default-renderpagertag.jsp">Basic with Render Pager Tag</netui:anchor><br/>
- <netui:anchor href="masterdetail/master.jsp">Master / Detail</netui:anchor><br/>
- <netui:anchor href="basic/basic-pager-jumptopage.jsp">Custom Pager -- Jump To Page</netui:anchor><br/>
- </netui:body>
-</netui:html>
\ No newline at end of file
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid Feature Samples"/>
+ <netui-template:section name="main">
+ <netui:anchor href="basic/basic.jsp">Basic</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-header.jsp">Basic with Header</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-formatter.jsp">Basic with Formatter</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-style.jsp">Basic with Style</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-css.jsp">Basic with CSS</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-css-foo.jsp">Basic with CSS Named foo</netui:anchor><br/>
+ <netui:anchor href="basic/basic-with-no-styles.jsp">Basic with No Styles</netui:anchor><br/>
+ <netui:anchor href="basic/basic-default-pager.jsp">Basic with Default Pager</netui:anchor><br/>
+ <netui:anchor href="basic/basic-fpnl-pager.jsp">Basic with FPNL Pager</netui:anchor><br/>
+ <netui:anchor href="basic/basic-pager-implicit-objects.jsp">Basic with Implicit Object Binding</netui:anchor><br/>
+ <netui:anchor href="basic/basic-default-renderpagertag.jsp">Basic with Render Pager Tag</netui:anchor><br/>
+ <netui:anchor href="masterdetail/master.jsp">Master / Detail</netui:anchor><br/>
+ <netui:anchor href="basic/basic-pager-jumptopage.jsp">Custom Pager -- Jump To Page</netui:anchor><br/>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/Controller.jpf?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/Controller.jpf (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/Controller.jpf Tue Sep 6 09:59:44 2005
@@ -24,7 +24,7 @@
/**
*/
@Jpf.Controller(forwards={
- @Jpf.Forward(name="index", path="matser.jsp"),
+ @Jpf.Forward(name="master", path="matser.jsp"),
@Jpf.Forward(name="detail", path="detail.jsp")
})
public class Controller
@@ -32,7 +32,7 @@
@Jpf.Action()
protected Forward begin() {
- return new Forward("index");
+ return new Forward("master");
}
@Jpf.Action()
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/detail.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/detail.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/detail.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/detail.jsp Tue Sep 6 09:59:44 2005
@@ -19,11 +19,10 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ 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"%>
-<netui:html>
- <head>
- <title>Data Grid Web</title>
- <netui:base/>
- </head>
- <netui:body>
- </netui:body>
-</netui:html>
\ No newline at end of file
+
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid Detail Page"/>
+ <netui-template:section name="main">
+ Details for Pet with Pet ID: ${param.petId}
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/master.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/master.jsp?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/master.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/datagrid/masterdetail/master.jsp Tue Sep 6 09:59:44 2005
@@ -20,13 +20,9 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib prefix="sampledata" tagdir="/WEB-INF/tags/data" %>
-<netui:html>
- <head>
- <title>Simple Data Grid</title>
- <netui:base/>
- </head>
- <netui:body>
- <b>Simple Data Grid</b>
+<netui-template:template templatePage="/resources/template/template.jsp">
+ <netui-template:setAttribute name="sampleTitle" value="Data Grid Master Page"/>
+ <netui-template:section name="main">
<sampledata:petdata/>
<br/>
<br/>
@@ -36,9 +32,9 @@
<netui-data:spanCell value="${container.item.description}"/>
<netui-data:spanCell value="${container.item.price}"/>
<netui-data:anchorCell value="Details" action="details">
- <netui:parameter name="petid" value="${container.item.petId}"/>
+ <netui:parameter name="petId" value="${container.item.petId}"/>
</netui-data:anchorCell>
</netui-data:rows>
</netui-data:dataGrid>
- </netui:body>
-</netui:html>
+ </netui-template:section>
+</netui-template:template>
\ No newline at end of file
Modified: beehive/trunk/samples/netui-samples/ui/formintagfile/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/formintagfile/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/formintagfile/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/ui/formintagfile/Controller.java Tue Sep 6 09:59:44 2005
@@ -22,7 +22,6 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
/**
*/
Modified: beehive/trunk/samples/netui-samples/ui/tree/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/tree/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/tree/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/ui/tree/Controller.java Tue Sep 6 09:59:44 2005
@@ -17,24 +17,22 @@
*/
package ui.tree;
-import javax.servlet.http.HttpSession;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.tags.tree.TreeElement;
@Jpf.Controller()
-public class Controller extends PageFlowController
-{
+public class Controller
+ extends PageFlowController {
+
private TreeElement _root;
- public TreeElement getRoot()
- {
+ public TreeElement getRoot() {
return _root;
}
- public void setRoot(TreeElement tree)
- {
+
+ public void setRoot(TreeElement tree) {
_root = tree;
}
Modified: beehive/trunk/samples/netui-samples/validation/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/validation/Controller.java?rev=279038&r1=279037&r2=279038&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/validation/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/validation/Controller.java Tue Sep 6 09:59:44 2005
@@ -23,7 +23,6 @@
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
-
/**
* Demonstration of Page Flow declarative field validation.
*/