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/24 17:31:53 UTC
svn commit: r178190 - in /incubator/beehive/trunk/samples/netui-samples: ./
WEB-INF/src/org/apache/beehive/samples/controls/pets/
WEB-INF/src/org/apache/beehive/samples/netui/beans/
WEB-INF/src/org/apache/beehive/samples/netui/loginexample/
WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/
WEB-INF/src/org/apache/beehive/samples/netui/resources/
WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/
WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/
WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/
WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/
loginexample/loginflow/ loginexample/protectedflow/ ui/datagrid/ ui/popup/
ui/popup/getcolor/ ui/tree/ validation/
Author: ekoneil
Date: Tue May 24 08:31:52 2005
New Revision: 178190
URL: http://svn.apache.org/viewcvs?rev=178190&view=rev
Log:
Cleanup in the netui-samples application.
- expand imports
- remove unused error JSP files
- etc...
BB: self
DRT: build.dist pass
Removed:
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/
incubator/beehive/trunk/samples/netui-samples/ui/datagrid/error.jsp
Modified:
incubator/beehive/trunk/samples/netui-samples/Controller.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/Pets.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/beans/PetType.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/BaseFlow.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/grid.properties
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/messages.properties
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/messages.properties
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/site.properties
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties
incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java
incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java
incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java
incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.java
incubator/beehive/trunk/samples/netui-samples/ui/popup/getcolor/GetColorController.java
incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java
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=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/Controller.java Tue May 24 08:31:52 2005
@@ -15,9 +15,7 @@
*
* $Header:$
*/
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/Pets.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/Pets.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/Pets.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/Pets.java Tue May 24 08:31:52 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.samples.controls.pets;
-import org.apache.beehive.controls.api.bean.*;
+import org.apache.beehive.controls.api.bean.ControlInterface;
import org.apache.beehive.samples.netui.beans.PetType;
@ControlInterface
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java Tue May 24 08:31:52 2005
@@ -17,8 +17,8 @@
*/
package org.apache.beehive.samples.controls.pets;
-import org.apache.beehive.controls.api.bean.*;
import org.apache.beehive.samples.netui.beans.PetType;
+import org.apache.beehive.controls.api.bean.ControlImplementation;
@ControlImplementation(isTransient=true)
public class PetsImpl implements Pets
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/beans/PetType.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/beans/PetType.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/beans/PetType.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/beans/PetType.java Tue May 24 08:31:52 2005
@@ -17,25 +17,54 @@
*/
package org.apache.beehive.samples.netui.beans;
-public class PetType
-{
+/**
+ * Simple JavaBean representing a Pet.
+ */
+public class PetType {
- private int petID;
- private String name;
- private String description;
- private double price;
+ private int _petId;
+ private String _name;
+ private String _description;
+ private double _price;
public PetType() {}
public PetType(int petID, String name, String description, double price) {
- this.petID= petID;
- this.name = name;
- this.description = description;
- this.price = price;
+ _petId= petID;
+ _name = name;
+ _description = description;
+ _price = price;
}
- public int getPetID() {return petID;}
- public String getName() {return name;}
- public String getDescription() {return description;}
- public double getPrice() {return price;}
+ public int getPetID() {
+ return _petId;
+ }
+
+ public void setPetId(int petId) {
+ _petId = petId;
+ }
+
+ public String getName() {
+ return _name;
+ }
+
+ public void setName(String name) {
+ _name = name;
+ }
+
+ public String getDescription() {
+ return _description;
+ }
+
+ public void setDescription(String description) {
+ _description = description;
+ }
+
+ public double getPrice() {
+ return _price;
+ }
+
+ public void setPrice(double price) {
+ _price = price;
+ }
}
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/BaseFlow.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/BaseFlow.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/BaseFlow.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/BaseFlow.java Tue May 24 08:31:52 2005
@@ -22,7 +22,6 @@
import org.apache.beehive.netui.pageflow.NotLoggedInException;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
@Jpf.Controller(
simpleActions={
@Jpf.SimpleAction(name="loginCancel", navigateTo=Jpf.NavigateTo.currentPage),
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java Tue May 24 08:31:52 2005
@@ -17,11 +17,14 @@
*/
package org.apache.beehive.samples.netui.loginexample;
-import org.apache.beehive.netui.pageflow.handler.*;
-
import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.security.Principal;
-import javax.servlet.http.*;
+
+import org.apache.beehive.netui.pageflow.handler.BaseHandler;
+import org.apache.beehive.netui.pageflow.handler.LoginHandler;
+import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext;
public class ExampleLoginHandler
extends BaseHandler
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/grid.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/grid.properties?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/grid.properties (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/datagrid/grid.properties Tue May 24 08:31:52 2005
@@ -1,3 +1,5 @@
+# Messages for the ui/datagrid sample
+
datagrid.resource.path=resources/images
datagrid.msg.nodata=No data to display
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/messages.properties?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/loginexample/messages.properties Tue May 24 08:31:52 2005
@@ -1,4 +1,4 @@
-# Messages for page flow /loginexample/login/Controller.jpf
+# Messages for page flow /loginexample/login/Controller.java
displaynames.username=The username
displaynames.password=The password
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/messages.properties?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/popup/messages.properties Tue May 24 08:31:52 2005
@@ -1,4 +1,4 @@
-# Messages for page flow /ui/popup/Controller.jpf
+# Messages for page flow /ui/popup/Controller.java
errors.nameRequired=You must enter your name.
errors.colorRequired=The Color is required. Click the button to choose a color.
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/site.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/site.properties?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/site.properties (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/site.properties Tue May 24 08:31:52 2005
@@ -1,2 +1,3 @@
+# Webapp messages
browserTitle=Beehive Page Flow Feature Samples
welcome=Welcome to the Page Flow Feature Samples
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties Tue May 24 08:31:52 2005
@@ -1,3 +1,5 @@
+# Messages for the /validation/Controller.java example
+
displayname.value=The value
displayname.confirmvalue=The confirmation value
errors.nomatch=The value and confirmation value do not match.
Modified: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java Tue May 24 08:31:52 2005
@@ -17,10 +17,11 @@
*/
package loginexample.loginflow;
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
-
import javax.security.auth.login.LoginException;
+
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
@Jpf.Controller(
nested=true,
Modified: incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java Tue May 24 08:31:52 2005
@@ -17,8 +17,8 @@
*/
package loginexample.protectedflow;
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.PageFlowController;
@Jpf.Controller(
nested=true,
Modified: incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java Tue May 24 08:31:52 2005
@@ -17,18 +17,17 @@
*/
package ui.datagrid;
-import javax.servlet.http.HttpSession;
-
+import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.samples.controls.pets.Pets;
@Jpf.Controller
-public class Controller extends PageFlowController
-{
+public class Controller
+ extends PageFlowController {
+
@Control
private Pets _pets;
@@ -43,19 +42,4 @@
f.addActionOutput("petList", _pets.getPetList());
return f;
}
-
- /**
- * 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/ui/popup/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.java Tue May 24 08:31:52 2005
@@ -17,7 +17,7 @@
*/
package ui.popup;
-import javax.servlet.http.HttpSession;
+import java.io.Serializable;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
@@ -65,7 +65,8 @@
public static class SubmitForm
- {
+ implements Serializable {
+
private String _name;
private String _address;
private String _city;
Modified: incubator/beehive/trunk/samples/netui-samples/ui/popup/getcolor/GetColorController.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/ui/popup/getcolor/GetColorController.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/popup/getcolor/GetColorController.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/popup/getcolor/GetColorController.java Tue May 24 08:31:52 2005
@@ -17,7 +17,6 @@
*/
package ui.popup.getcolor;
-import javax.servlet.http.HttpSession;
import java.io.Serializable;
import org.apache.beehive.netui.pageflow.Forward;
Modified: incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java Tue May 24 08:31:52 2005
@@ -17,18 +17,12 @@
*/
package ui.tree;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.tags.tree.TreeHelpers;
-import org.apache.beehive.netui.tags.tree.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
-
-import javax.servlet.ServletRequest;
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
@@ -85,20 +79,6 @@
protected Forward selectTree() {
Forward success = new Forward("success");
return success;
- }
-
- /**
- * 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/validation/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/validation/Controller.java?rev=178190&r1=178189&r2=178190&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/validation/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-samples/validation/Controller.java Tue May 24 08:31:52 2005
@@ -19,8 +19,10 @@
import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+
@Jpf.Controller(
simpleActions={