You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/05/23 10:45:13 UTC
svn commit: r177943 [1/2] - in /incubator/beehive/trunk: ./ netui/ant/
samples/netui-jsf/WEB-INF/src/bundles/ samples/netui-jsf/WEB-INF/src/jsf/
samples/netui-jsf/WEB-INF/src/org/ samples/netui-jsf/WEB-INF/src/org/apache/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physiciansFlow/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/
samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/
samples/netui-jsf/jsf/ samples/netui-jsf/jsf/physiciansFlow/
samples/netui-jsf/resources/template/ samples/netui-samples/
samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/
samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/
samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/
samples/netui-samples/loginexample/
samples/netui-samples/loginexample/loginflow/
samples/netui-samples/loginexample/protectedflow/
samples/netui-samples/loginexample/start/
samples/netui-samples/ui/datagrid/ samples/netui-samples/validation/
Author: rich
Date: Mon May 23 01:45:09 2005
New Revision: 177943
URL: http://svn.apache.org/viewcvs?rev=177943&view=rev
Log:
Samples work:
- Added a login/shared-flow/nested-page-flow example in the netui-samples app.
- Reworked the Validation example in the netui-samples app.
- Fixed a properties file reference in the Data Grid example (netui-samples app).
- Repackaging, source headers, and general fixup of the NetUI/JSF sample app.
- Removed the "netui-imports.xml" reference from distribution.xml -- this was added during my previous samples checkin.
tests: drt in trunk, bvt in netui, bvt.myfaces and bvt.jsf-ri in netui/test/webapps/jsf (WinXP)
BB: self (linux) (including run.tests against the distributions)
Added:
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/
- copied from r171359, incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/
- copied from r171359, incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/bundles/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/messages.properties
- copied, changed from r171359, incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/messages.properties
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/
- copied from r171359, incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java (with props)
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java (with props)
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties (with props)
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/
incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/
incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/
incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/start/
incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java (with props)
incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp (with props)
Removed:
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/bundles/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/messages.properties
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physiciansFlow/
incubator/beehive/trunk/samples/netui-samples/validation/error.jsp
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/AddressData.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/PhysicianData.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/Physician.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/messages.properties
incubator/beehive/trunk/samples/netui-jsf/jsf/Controller.java
incubator/beehive/trunk/samples/netui-jsf/jsf/error.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/home.java
incubator/beehive/trunk/samples/netui-jsf/jsf/home.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/Controller.java
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.java
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.java
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.java
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp
incubator/beehive/trunk/samples/netui-samples/index.jsp
incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp
incubator/beehive/trunk/samples/netui-samples/validation/Controller.java
incubator/beehive/trunk/samples/netui-samples/validation/index.jsp
incubator/beehive/trunk/samples/netui-samples/validation/success.jsp
Modified: incubator/beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Mon May 23 01:45:09 2005
@@ -36,6 +36,9 @@
<property name="webservice.runtime" value="axis"/>
<property name="servlet.runtime" value="tomcat"/>
+ <!-- TODO: move the MyFaces jars up into trunk/external -->
+ <property name="myfaces.dir" location="${beehive.home}/netui/external/jsf/myfaces-1.0.9/lib"/>
+
<!-- ======================================================================== -->
<!-- Common Beehive paths -->
<!-- ======================================================================== -->
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Mon May 23 01:45:09 2005
@@ -32,7 +32,6 @@
<project name="Beehive/Distribution" default="usage" basedir=".">
<import file="beehive-imports.xml"/>
- <import file="netui/netui-imports.xml"/>
<import file="ant/axis-import.xml"/>
<property name="dist.src.name" value="${dist.name}-src"/>
Modified: incubator/beehive/trunk/netui/ant/netui.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Mon May 23 01:45:09 2005
@@ -32,7 +32,6 @@
struts11.dir=${struts.dir}/legacy/jakarta-struts-1.1-lib
struts12.dir=${struts.dir}
tomcat.lib.dir=${netui.home}/external/tomcat
-myfaces.dir=${netui.home}/external/jsf/myfaces-1.0.9/lib
myfaces.jar=${myfaces.dir}/myfaces.jar
jsf-api.jar=${myfaces.dir}/myfaces-jsf-api.jar
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java Mon May 23 01:45:09 2005
@@ -1,4 +1,21 @@
-package jsf;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf;
import java.io.IOException;
@@ -16,15 +33,15 @@
public class SharedFlow
extends SharedFlowController
{
- private boolean commentsPreference = true;
+ private boolean notesPreference = true;
- public void setCommentsPreference(boolean value)
+ public void setNotesPreference(boolean value)
{
- this.commentsPreference = value;
+ this.notesPreference = value;
}
- public boolean getCommentsPreference()
+ public boolean getNotesPreference()
{
- return this.commentsPreference;
+ return this.notesPreference;
}
}
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/AddressData.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/AddressData.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/AddressData.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/AddressData.java Mon May 23 01:45:09 2005
@@ -1,4 +1,21 @@
-package jsf.data;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf.data;
public class AddressData
{
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/PhysicianData.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/PhysicianData.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/PhysicianData.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/data/PhysicianData.java Mon May 23 01:45:09 2005
@@ -1,4 +1,21 @@
-package jsf.data;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf.data;
import java.io.Serializable;
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/Physician.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/Physician.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/Physician.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/Physician.java Mon May 23 01:45:09 2005
@@ -1,7 +1,24 @@
-package jsf.physician;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf.physician;
-import jsf.data.AddressData;
-import jsf.data.PhysicianData;
+import org.apache.beehive.samples.netui.jsf.data.AddressData;
+import org.apache.beehive.samples.netui.jsf.data.PhysicianData;
import java.io.Serializable;
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java Mon May 23 01:45:09 2005
@@ -1,4 +1,21 @@
-package jsf.physician;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf.physician;
import java.util.ArrayList;
@@ -26,7 +43,7 @@
addPhysician(new Physician("Ear", "male", "Bill", "Later"));
addPhysician(new Physician("Nose", "female", "Pay", "Now"));
addPhysician(new Physician("Nose", "female", "Sue", "Mee"));
- addPhysician(new Physician("Ear", "female", "Noah", "charge"));
+ addPhysician(new Physician("Ear", "female", "Noah", "Charge"));
addPhysician(new Physician("Ear", "female", "Coe", "Pay"));
addPhysician(new Physician("Throat", "female", "Fran", "Tic"));
addPhysician(new Physician("Ear", "male", "Carl", "Later"));
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java Mon May 23 01:45:09 2005
@@ -1,4 +1,21 @@
-package jsf.physician;
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.jsf.physician;
import java.util.ArrayList;
import java.util.Collections;
Copied: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/messages.properties (from r171359, incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/messages.properties)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/messages.properties?p2=incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/messages.properties&p1=incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/messages.properties&r1=171359&r2=177943&rev=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/messages.properties Mon May 23 01:45:09 2005
@@ -1,10 +1,10 @@
welcome=Welcome to Your Health Care Home Page
-intro=The jsfMedWeb sample application demonstrates the integration of Java Server Faces with Page Flows.
+intro=The netui-jsf sample application demonstrates the integration of Java Server Faces with Beehive Page Flow.
-homePageComments=Comments are included at the bottom of each page. You can hide/show these comments \
+homePageNotes=Notes are included at the bottom of each page. You can hide/show these notes \
using the radio buttons below. Changing this preference sets a value in the shared flow. \
-Pages in other Page Flows bind to this shared value to determine if comments should be rendered.
+Pages in other Page Flows bind to this shared value to determine if notes should be rendered.
-commentsPreferenceLabel=Comments on Each Page
+notesPreferenceLabel=Notes on Each Page
-physicianSearchLinkText=Get started: Locate a physician in your area
\ No newline at end of file
+physicianSearchLinkText=Get started: Locate a physician in your area
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/messages.properties?rev=177943&r1=171359&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/org/apache/beehive/samples/netui/resources/jsf/physiciansFlow/messages.properties Mon May 23 01:45:09 2005
@@ -26,42 +26,42 @@
hospitalsColumnLabel=Affiliations
bioHeading=Biography
-// explanatory comments
-commentsHeading=Comments
+// explanatory notes
+notesHeading=Notes
-searchPageCommentOne=The search button demonstrates how you can pass a form \
+searchPageNoteOne=The search button demonstrates how you can pass a form \
bean to a Page Flow action after handling the command in the backing file. \
In this case a command handler in the backing file is called to check the value \
the user has set for the results format. The annotation on the command handler \
has attributes to specify the Page Flow action to call and the bean to pass to the action.
-searchPageCommentTwo=The "detail" links in the results table show that you can raise a Page Flow action directly. \
+searchPageNoteTwo=The "detail" links in the results table show that you can raise a Page Flow action directly. \
In this case a request parameter is passed to identify the selected row.
-searchPageCommentThree=Another approach is to get the data for a single row directly from \
+searchPageNoteThree=Another approach is to get the data for a single row directly from \
the JSF Data Model (the action "physicianDetailJSFStyle" in physiciansFlow.Controller demonstrates how this is done).
-searchPageCommentFour=The page also shows some JSF specific features. \
+searchPageNoteFour=The page also shows some JSF specific features. \
Clicking either of the "Physician Type" radio buttons generates a value change event; \
the ValueChangeListener in the backing file toggles the enabled value of the "Specialist Type" menu.
-searchPageCommentFive=The results table binds to a JFS DataModel exposed as a Page Flow property \
+searchPageNoteFive=The results table binds to a JSF DataModel exposed as a Page Flow property \
and a JSF dataTable tag is used to display the results. \
Sorting is an intra page event so the sorting links call command handler actions in the backing file \
rather than Page Flow actions.
-physicianDetailPageCommentOne=The links at the top of the page call Page Flow actions (don't forget \
+physicianDetailPageNoteOne=The links at the top of the page call Page Flow actions (don't forget \
to put commandLinks into an <h:form>).
-physicianDetailPageCommentTwo=The send mail link demonstrates how to pass a form bean directly to a Page Flow \
+physicianDetailPageNoteTwo=The send mail link demonstrates how to pass a form bean directly to a Page Flow \
action. The attribute tag nested in the command tag provides the necessary name value pair.
but note that the form bean must be declared in the backing file. The code below also shows how \
actionOutputs are used to pass values on to the next page.
-physicianDetailPageCommentThree=The list of hospitals is handled with a jstl "forEach" tag. \
+physicianDetailPageNoteThree=The list of hospitals is handled with a jstl "forEach" tag. \
The JSF "verbatim" tag is used to make sure the jstl output is rendered correctly.
-detailedResultsPageCommentOne=This page uses a JSF dataTable tag around a JSF panelGrid to display the list of results.
+detailedResultsPageNoteOne=This page uses a JSF dataTable tag around a JSF panelGrid to display the list of results.
-mailConfirmationPageCommentOne=No comments
+mailConfirmationPageNoteOne=No notes
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/Controller.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/Controller.java Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+/*
+ * 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:$
+ */
package jsf;
import javax.servlet.http.HttpSession;
@@ -12,7 +29,7 @@
@Jpf.SimpleAction(name="locatePhysician", path="/jsf/physiciansFlow/Controller.jpf")
},
sharedFlowRefs={
- @Jpf.SharedFlowRef(name="shared", type=jsf.SharedFlow.class)
+ @Jpf.SharedFlowRef(name="shared", type=org.apache.beehive.samples.netui.jsf.SharedFlow.class)
}
)
public class Controller
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/error.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/error.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/error.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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-html-1.0" prefix="netui"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/home.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/home.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/home.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/home.java Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+/*
+ * 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:$
+ */
package jsf;
import org.apache.beehive.netui.pageflow.FacesBackingBean;
@@ -8,6 +25,8 @@
import javax.faces.model.SelectItem;
import javax.faces.event.ValueChangeEvent;
+import org.apache.beehive.samples.netui.jsf.SharedFlow;
+
/**
* This is the backing bean for JSF page "home.faces" (home.jsp).
@@ -19,62 +38,62 @@
SharedFlow sharedFlow;
/**
- * Get the current commentsPreference
+ * Get the current notesPreference
*/
protected void onCreate()
{
- boolean pref = sharedFlow.getCommentsPreference();
+ boolean pref = sharedFlow.getNotesPreference();
if (pref == false)
- setCommentsPreference("hide");
+ setNotesPreference("hide");
else
- setCommentsPreference("show");
+ setNotesPreference("show");
}
protected FacesContext getFacesContext() {
return FacesContext.getCurrentInstance();
}
- private String commentsPreference = "show";
+ private String notesPreference = "show";
- public String getCommentsPreference()
+ public String getNotesPreference()
{
- return this.commentsPreference;
+ return this.notesPreference;
}
- public void setCommentsPreference(String value)
+ public void setNotesPreference(String value)
{
- this.commentsPreference = value;
+ this.notesPreference = value;
}
/**
- * Comments preference options
+ * Notes preference options
*/
- private SelectItem[] commentsPreferenceOptions = {
+ private SelectItem[] notesPreferenceOptions = {
new SelectItem("hide", "Hide"),
new SelectItem("show", "Show")
};
- public SelectItem[] getCommentsPreferenceOptions()
+ public SelectItem[] getNotesPreferenceOptions()
{
- return this.commentsPreferenceOptions;
+ return this.notesPreferenceOptions;
}
/**
- * Handler for comments preference
+ * Handler for notes preference
*/
- public void commentsPreferenceChange(ValueChangeEvent vce)
+ public void notesPreferenceChange(ValueChangeEvent vce)
{
// get the new value from the component
if (vce.getNewValue().equals("hide"))
{
- setCommentsPreference("hide");
- sharedFlow.setCommentsPreference(false);
+ setNotesPreference("hide");
+ sharedFlow.setNotesPreference(false);
}
else
{
- setCommentsPreference("show");
- sharedFlow.setCommentsPreference(true);
+ setNotesPreference("show");
+ sharedFlow.setNotesPreference(true);
}
}
}
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/home.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/home.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/home.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/home.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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:$
+--%>
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core" %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html" %>
<html>
@@ -6,7 +23,7 @@
</head>
<body>
<f:view>
- <f:loadBundle var="msgs" basename="jsf.messages" />
+ <f:loadBundle var="msgs" basename="org.apache.beehive.samples.netui.resources.jsf.messages" />
<h:form>
<!-- heading -->
<h:panelGrid columns="1" style="margin-bottom: 15px" >
@@ -22,7 +39,7 @@
<h:panelGrid cellspacing="20" columns="1" width="50%" style="margin-bottom: 15px; border: 1px solid blue; background-color: EEF3FB">
<f:attribute name="align" value="center"/>
<h:outputText value="#{msgs.intro}" />
- <h:outputText value="#{msgs.homePageComments}" />
+ <h:outputText value="#{msgs.homePageNotes}" />
</h:panelGrid>
<!-- link to physicians page flow -->
@@ -34,9 +51,9 @@
<!-- preferences -->
<h:panelGrid columns="1" style="border: solid 1px blue" cellpadding="5">
<f:attribute name="align" value="center"/>
- <h:outputLabel value="#{msgs.commentsPreferenceLabel}" for="commentsPreference" styleClass="widgetLabel" />
- <h:selectOneRadio value="#{backing.commentsPreference}" id="commentsPreference" immediate="true" valueChangeListener="#{backing.commentsPreferenceChange}" layout="pageDirection" >
- <f:selectItems value="#{backing.commentsPreferenceOptions}" id="commentsPreferenceOptions" />
+ <h:outputLabel value="#{msgs.notesPreferenceLabel}" for="notesPreference" styleClass="widgetLabel" />
+ <h:selectOneRadio value="#{backing.notesPreference}" id="notesPreference" immediate="true" valueChangeListener="#{backing.notesPreferenceChange}" layout="pageDirection" >
+ <f:selectItems value="#{backing.notesPreferenceOptions}" id="notesPreferenceOptions" />
</h:selectOneRadio>
</h:panelGrid>
</h:form>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/Controller.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/Controller.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/Controller.java Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+/*
+ * 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:$
+ */
package jsf.physiciansFlow;
import javax.faces.model.DataModel;
@@ -10,15 +27,15 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.util.type.TypeUtils;
-import jsf.physician.Physician;
-import jsf.physician.PhysicianSession;
+import org.apache.beehive.samples.netui.jsf.physician.Physician;
+import org.apache.beehive.samples.netui.jsf.physician.PhysicianSession;
/**
* This page flow controller for the physicians page flow.
*/
@Jpf.Controller(
sharedFlowRefs={
- @Jpf.SharedFlowRef(name="shared", type=jsf.SharedFlow.class)
+ @Jpf.SharedFlowRef(name="shared", type=org.apache.beehive.samples.netui.jsf.SharedFlow.class)
}
)
public class Controller
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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 prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
@@ -14,7 +31,7 @@
</head>
<body>
<f:view>
- <f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
+ <f:loadBundle var="msgs" basename="org.apache.beehive.samples.netui.resources.jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
<h:panelGrid cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue">
@@ -41,11 +58,11 @@
</h:panelGrid>
</h:form>
- <!-- explanatory comment block -->
- <h:panelGrid width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <!-- explanatory notes block -->
+ <h:panelGrid width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.notesPreference}">
<f:attribute name="align" value="center"/>
- <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
- <h:outputText value="#{msgs.mailConfirmationPageCommentOne}"/>
+ <h:outputText value="#{msgs.notesHeading}" style="font-weight: bold"/>
+ <h:outputText value="#{msgs.mailConfirmationPageNoteOne}"/>
</h:panelGrid>
</f:view>
</body>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.java Mon May 23 01:45:09 2005
@@ -1,10 +1,27 @@
+/*
+ * 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:$
+ */
package jsf.physiciansFlow;
import org.apache.beehive.netui.pageflow.FacesBackingBean;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import jsf.physiciansFlow.Controller.MailMessageForm;
-import jsf.physician.Physician;
+import org.apache.beehive.samples.netui.jsf.physician.Physician;
/**
* This is the backing bean for JSF page "physicianDetail.faces" (physicianDetail.jsp).
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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 prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
@@ -12,7 +29,7 @@
</head>
<body>
<f:view>
- <f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
+ <f:loadBundle var="msgs" basename="org.apache.beehive.samples.netui.resources.jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
<h:panelGrid columns="2" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
@@ -21,11 +38,6 @@
<f:attribute name="align" value="left"/>
<h:commandLink action="shared.home" value="Home" />
</h:panelGrid>
-
- <h:panelGrid>
- <f:attribute name="align" value="right"/>
- <h:commandLink action="physicianSearch" value="Return to Search" />
- </h:panelGrid>
</h:panelGrid>
<!-- physician details -->
@@ -81,17 +93,23 @@
</h:commandButton>
</h:panelGrid>
</h:panelGrid>
+
</h:form>
- <!-- explanatory comment block -->
- <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <h:panelGrid>
+ <f:attribute name="align" value="center"/>
+ <h:commandLink action="physicianSearch" value="Return to Search" />
+ </h:panelGrid>
+
+ <!-- explanatory notes block -->
+ <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.notesPreference}">
<f:attribute name="align" value="center"/>
- <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
+ <h:outputText value="#{msgs.notesHeading}" style="font-weight: bold"/>
- <h:outputText value="#{msgs.physicianDetailPageCommentOne}"/>
+ <h:outputText value="#{msgs.physicianDetailPageNoteOne}"/>
- <h:outputText value="#{msgs.physicianDetailPageCommentTwo}"/>
+ <h:outputText value="#{msgs.physicianDetailPageNoteTwo}"/>
<f:verbatim>
<pre>
<h:commandLink action="submitMailMessage" value="Send Mail" tabindex="1" />
@@ -102,7 +120,7 @@
</pre>
</f:verbatim>
- <h:outputText value="#{msgs.physicianDetailPageCommentThree}"/>
+ <h:outputText value="#{msgs.physicianDetailPageNoteThree}"/>
</h:panelGrid>
</f:view>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.java Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+/*
+ * 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:$
+ */
package jsf.physiciansFlow;
import org.apache.beehive.netui.pageflow.FacesBackingBean;
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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 prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
@@ -10,7 +27,7 @@
</head>
<body>
<f:view>
- <f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
+ <f:loadBundle var="msgs" basename="org.apache.beehive.samples.netui.resources.jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
<h:panelGrid columns="2" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
@@ -19,11 +36,6 @@
<f:attribute name="align" value="left"/>
<h:commandLink action="shared.home" value="Home" />
</h:panelGrid>
-
- <h:panelGrid>
- <f:attribute name="align" value="right"/>
- <h:commandLink action="physicianSearch" value="Return to Search" />
- </h:panelGrid>
</h:panelGrid>
<!-- message to user -->
@@ -68,13 +80,18 @@
<h:inputTextarea value="#{physician.bio}" cols="40" rows="10" disabled="false"/>
</h:panelGrid>
</h:column>
- </h:dataTable>
+ </h:dataTable>
+
+ <h:panelGrid>
+ <f:attribute name="align" value="center"/>
+ <h:commandLink action="physicianSearch" value="Return to Search" />
+ </h:panelGrid>
- <!-- explanatory comment block -->
- <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <!-- explanatory notes block -->
+ <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.notesPreference}">
<f:attribute name="align" value="center"/>
- <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold" />
- <h:outputText value="#{msgs.detailedResultsPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.notesHeading}" style="font-weight: bold" />
+ <h:outputText value="#{msgs.detailedResultsPageNoteOne}" rendered="#{sharedFlow.shared.notesPreference}" />
</h:panelGrid>
</f:view>
</body>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.java?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.java (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.java Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+/*
+ * 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:$
+ */
package jsf.physiciansFlow;
import javax.faces.component.UIComponent;
@@ -13,7 +30,7 @@
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import jsf.physician.Physician;
+import org.apache.beehive.samples.netui.jsf.physician.Physician;
import jsf.physiciansFlow.Controller.PhysicianSearchForm;
/**
@@ -73,7 +90,7 @@
return FacesContext.getCurrentInstance();
}
- // get the current commentsPreference
+ // get the current notesPreference
protected void onCreate()
{
criteria = new Physician();
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp Mon May 23 01:45:09 2005
@@ -1,3 +1,20 @@
+<%--
+ 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://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
@@ -9,7 +26,7 @@
</head>
<body>
<f:view>
- <f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
+ <f:loadBundle var="msgs" basename="org.apache.beehive.samples.netui.resources.jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
<h:panelGrid columns="1" cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
@@ -105,11 +122,11 @@
</h:dataTable>
</h:form>
- <!-- explanatory comment block -->
- <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
- <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
+ <!-- explanatory notes block -->
+ <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.notesPreference}">
+ <h:outputText value="#{msgs.notesHeading}" style="font-weight: bold"/>
- <h:outputText value="#{msgs.searchPageCommentOne}"/>
+ <h:outputText value="#{msgs.searchPageNoteOne}"/>
<f:verbatim>
<pre>
@Jpf.CommandHandler(
@@ -122,7 +139,7 @@
</f:verbatim>
- <h:outputText value="#{msgs.searchPageCommentTwo}"/>
+ <h:outputText value="#{msgs.searchPageNoteTwo}"/>
<f:verbatim>
<pre>
<h:commandLink value="#{msgs.detailLabel}" action="physicianDetail" >
@@ -132,11 +149,11 @@
</f:verbatim>
- <h:outputText value="#{msgs.searchPageCommentThree}"/>
+ <h:outputText value="#{msgs.searchPageNoteThree}"/>
- <h:outputText value="#{msgs.searchPageCommentFour}"/>
+ <h:outputText value="#{msgs.searchPageNoteFour}"/>
- <h:outputText value="#{msgs.searchPageCommentFive}"/>
+ <h:outputText value="#{msgs.searchPageNoteFive}"/>
</h:panelGrid>
</f:view>
Modified: incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp Mon May 23 01:45:09 2005
@@ -22,7 +22,7 @@
<%@ 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>
Added: 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=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java (added)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java Mon May 23 01:45:09 2005
@@ -0,0 +1,72 @@
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.loginexample;
+
+import org.apache.beehive.netui.pageflow.handler.*;
+
+import javax.security.auth.login.LoginException;
+import java.security.Principal;
+import javax.servlet.http.*;
+
+public class ExampleLoginHandler
+ extends BaseHandler
+ implements LoginHandler
+{
+ private static class UserPrincipal
+ implements Principal
+ {
+ public String getName()
+ {
+ return "good";
+ }
+ }
+
+ public void login( FlowControllerHandlerContext context, String username, String password )
+ throws LoginException
+ {
+ if ( username.equals( "good" ) && password.equals( "good" ) )
+ {
+ getSession( context ).setAttribute( "_principal", new UserPrincipal() );
+ }
+ else
+ {
+ throw new LoginException( username );
+ }
+ }
+
+ public void logout( FlowControllerHandlerContext context, boolean invalidateSessions )
+ {
+ getSession( context ).removeAttribute( "_principal" );
+ }
+
+ public boolean isUserInRole( FlowControllerHandlerContext context, String roleName )
+ {
+ return false;
+ }
+
+ public Principal getUserPrincipal( FlowControllerHandlerContext context )
+ {
+ return ( Principal ) getSession( context ).getAttribute( "_principal" );
+ }
+
+ private static HttpSession getSession( FlowControllerHandlerContext context )
+ {
+ assert context.getRequest() instanceof HttpServletRequest;
+ return ( ( HttpServletRequest ) context.getRequest() ).getSession();
+ }
+}
Propchange: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java (added)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java Mon May 23 01:45:09 2005
@@ -0,0 +1,48 @@
+/*
+ * 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:$
+ */
+package org.apache.beehive.samples.netui.loginexample;
+
+import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+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),
+ @Jpf.SimpleAction(name="loginSuccess", navigateTo=Jpf.NavigateTo.previousAction)
+ },
+ catches={
+ @Jpf.Catch(type=NotLoggedInException.class, path="/loginexample/loginflow/Controller.jpf")
+ }
+)
+public class SharedFlow
+ extends SharedFlowController
+{
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="success", navigateTo=Jpf.NavigateTo.currentPage)
+ }
+ )
+ public Forward logout()
+ {
+ logout( false );
+ return new Forward( "success" );
+ }
+}
Propchange: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/SharedFlow.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties (added)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties Mon May 23 01:45:09 2005
@@ -0,0 +1,5 @@
+# Messages for page flow /loginexample/login/Controller.jpf
+
+displaynames.username=The username
+displaynames.password=The password
+javax.security.auth.login.LoginException=Login failed.
Propchange: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/loginexample/login/messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties (added)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties Mon May 23 01:45:09 2005
@@ -0,0 +1,7 @@
+displayname.value=The value
+displayname.confirmvalue=The confirmation value
+errors.nomatch=The value and confirmation value do not match.
+errors.toolong=The extra rule requires that the value be no more than four characters long.
+
+error.prefix=<span style="color:red">
+error.suffix=</span>
Propchange: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/resources/validation/messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/samples/netui-samples/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/index.jsp?rev=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/index.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/index.jsp Mon May 23 01:45:09 2005
@@ -27,21 +27,26 @@
The following samples demonstrate a variety of Beehive NetUI features:
</p>
<dl>
- <dt><netui:anchor href="validation/Controller.jpf" value="Validation"/></dt>
- <dd>This sample demonstrates the declarative validation model.</dd>
- </dl>
- <dl>
<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 <netui-data:dataGrid> tag.</dd>
</dl>
<dl>
- <dt><netui:anchor href="ui/tree/Controller.jpf" value="Tree"/></dt>
- <dd>Demonstrates how to use <netui:tree> and related tags.</dd>
+ <dt><netui:anchor href="loginexample/start/Controller.jpf" value="Login"/></dt>
+ <dd>Demonstrates defining your own LoginHandler, as well as nested page flows and shared
+ flows.</dd>
</dl>
<dl>
<dt><netui:anchor href="ui/popup/Controller.jpf" value="Popup Window"/></dt>
<dd>Demonstrates popup window implemented by a nested page flow.</dd>
+ </dl>
+ <dl>
+ <dt><netui:anchor href="ui/tree/Controller.jpf" value="Tree"/></dt>
+ <dd>Demonstrates how to use <netui:tree> and related tags.</dd>
+ </dl>
+ <dl>
+ <dt><netui:anchor href="validation/Controller.jpf" value="Validation"/></dt>
+ <dd>This sample demonstrates the declarative validation model.</dd>
</dl>
</netui-template:section>
</netui-template:template>
Added: 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=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java Mon May 23 01:45:09 2005
@@ -0,0 +1,91 @@
+/*
+ * 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:$
+ */
+package loginexample.loginflow;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.*;
+
+import javax.security.auth.login.LoginException;
+
+@Jpf.Controller(
+ nested=true,
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(name="cancel", returnAction="shared.loginCancel")
+ },
+ catches={
+ @Jpf.Catch(type=LoginException.class, path="index.jsp")
+ },
+ messageBundles={
+ @Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.netui.loginexample.login.messages")
+ }
+)
+public class Controller extends PageFlowController
+{
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="success", returnAction="shared.loginSuccess")
+ },
+ validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
+ )
+ public Forward login( LoginForm form )
+ throws LoginException
+ {
+ // This ultimately calls login on org.apache.beehive.samples.netui.login.ExampleLoginHandler.
+ login( form.getUsername(), form.getPassword() );
+ return new Forward( "success" );
+ }
+
+ public static class LoginForm implements java.io.Serializable
+ {
+ private String _username;
+ private String _password;
+
+ @Jpf.ValidatableProperty(
+ // We could have also used the 'displayName' attribute -- a hardcoded string or a
+ // JSP 2.0-style expression.
+ displayNameKey="displaynames.username",
+ validateRequired=@Jpf.ValidateRequired(),
+ validateMinLength=@Jpf.ValidateMinLength(chars=4)
+ )
+ public String getUsername()
+ {
+ return _username;
+ }
+
+ public void setUsername( String username )
+ {
+ _username = username;
+ }
+
+ @Jpf.ValidatableProperty(
+ displayNameKey="displaynames.password",
+ validateRequired=@Jpf.ValidateRequired(),
+ validateMinLength=@Jpf.ValidateMinLength(chars=4)
+ )
+ public String getPassword()
+ {
+ return _password;
+ }
+
+ public void setPassword( String password )
+ {
+ _password = password;
+ }
+ }
+}
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp Mon May 23 01:45:09 2005
@@ -0,0 +1,38 @@
+<%--
+ 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 prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ 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="samTitle" value="Login Example - Login Flow"/>
+
+ <netui-template:section name="main">
+ Login failed.
+
+ <br/>
+ <br/>
+ <netui:anchor action="cancel">cancel</netui:anchor>
+ <br/>
+ <netui:anchor action="begin">try again</netui:anchor>
+ </netui-template:section>
+
+</netui-template:template>
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/failure.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp Mon May 23 01:45:09 2005
@@ -0,0 +1,57 @@
+<%--
+ 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 prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ 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="samTitle" value="Login Example - Login Flow"/>
+
+ <netui-template:section name="main">
+ <i>In this example, the only valid login is username 'good', password 'good'.</i>
+ <br/>
+ <br/>
+
+ <span style="color:red;">
+ <netui:error key="javax.security.auth.login.LoginException"/>
+ </span>
+
+ <netui:form action="login">
+ <table>
+ <tr>
+ <td>username:</td>
+ <td><netui:textBox dataSource="actionForm.username"/></td>
+ <td><span style="color:red;"><netui:error key="username"/></span></td>
+ </tr>
+ <tr>
+ <td>password:</td>
+ <td><netui:textBox dataSource="actionForm.password" password="true"/></td>
+ <td><span style="color:red;"><netui:error key="password"/></span></td>
+ </tr>
+ </table>
+
+ <br/>
+ <netui:button value="submit"/>
+ <netui:button value="cancel" action="cancel"/>
+ </netui:form>
+ </netui-template:section>
+
+</netui-template:template>
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/loginflow/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java Mon May 23 01:45:09 2005
@@ -0,0 +1,33 @@
+/*
+ * 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:$
+ */
+package loginexample.protectedflow;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.*;
+
+@Jpf.Controller(
+ nested=true,
+ loginRequired=true, // just in case someone hits this directly -- unused in the scenario
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(name="done", returnAction="protectedFlowDone")
+ }
+)
+public class Controller extends PageFlowController
+{
+}
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp Mon May 23 01:45:09 2005
@@ -0,0 +1,34 @@
+<%--
+ 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 prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ 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="samTitle" value="Login Example - Protected Page Flow"/>
+
+ <netui-template:section name="main">
+ If you got here, then you're logged in.
+ <br/>
+ <netui:anchor action="done">done</netui:anchor>
+ </netui-template:section>
+
+</netui-template:template>
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/protectedflow/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java Mon May 23 01:45:09 2005
@@ -0,0 +1,38 @@
+/*
+ * 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:$
+ */
+package loginexample.start;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.*;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(name="goProtectedFlow", path="/loginexample/protectedflow/Controller.jpf", loginRequired=true),
+ @Jpf.SimpleAction(name="protectedFlowDone", navigateTo=Jpf.NavigateTo.currentPage)
+ },
+ sharedFlowRefs={
+ // This declares a shared flow that will be used by this page flow. Note that you can also
+ // declare shared flows to be used by *all* page flows, using the
+ // <default-shared-flow-refs> element in WEB-INF/beehive-netui-config.xml.
+ @Jpf.SharedFlowRef(name="shared", type=org.apache.beehive.samples.netui.loginexample.SharedFlow.class)
+ }
+)
+public class Controller extends PageFlowController
+{
+}
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/start/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp?rev=177943&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp (added)
+++ incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp Mon May 23 01:45:09 2005
@@ -0,0 +1,80 @@
+<%--
+ 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 prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ 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="samTitle" value="Login Example - Start"/>
+
+ <netui-template:section name="main">
+ This example demonstrates the following features:
+ <ul>
+ <li>Plugging in your own LoginHandler</li>
+ <li>Using shared flows for common actions and exception handlers</li>
+ <li>Using nested page flows</li>
+ </ul>
+
+ Some notes:
+ <ul>
+ <li>
+ All login-related behavior (current user, login, logout, etc.) is defined by
+ <code>org.apache.beehive.samples.netui.loginexample.ExampleLoginHandler</code>, which
+ is registered as the login handler in WEB-INF/beehive-netui-config.xml. This overrides the
+ default behavior, which is to use the current Servlet container's login mechanism.
+ </li>
+ <li>
+ When you click 'go to a protected flow', a <code>NotLoggedInException</code> will be
+ thrown, because the 'goProtectedFlow' action is marked with <code>loginRequired=true</code>,
+ and you are not currently logged in.
+ </li>
+ <li>
+ The current page flow does not handle <code>NotLoggedInException</code>, but its referenced
+ shared flow (<code>org.apache.beehive.samples.netui.loginexample.SharedFlow</code>) does.
+ The shared flow forwards to the Login nested page flow
+ (/loginexample/loginflow/Controller.jpf).
+ </li>
+ <li>
+ There are two possible <strong>return actions</strong> from the Login nested page flow:
+ 'shared.loginSuccess' or 'shared.loginCancel'. Take a look at each action, defined in
+ <code>org.apache.beehive.samples.netui.loginexample.SharedFlow</code>. The 'loginSuccess'
+ action <strong>re-runs the original target action</strong>, which was 'goProtectedFlow'. Now
+ that you're logged in, the action will succeed. The 'loginCancel' action just takes you back
+ to the original page you were on.
+ </li>
+ <li>
+ If you've logged in successfully, you can hit 'go to a protected flow' again -- this time it
+ will succeed.
+ </li>
+ <li>
+ Note that the current page flow (or any other page flow) knows <i>nothing</i> about the Login
+ page flow. It only has to mark its protected actions with <code>loginRequired=true</code>.
+ The shared flow and the Login flow take care of the rest.
+ </li>
+ </ul>
+
+ <br/>
+ <netui:anchor action="goProtectedFlow">go to a protected page flow</netui:anchor>
+ <br/>
+ <netui:anchor action="shared.logout">log out</netui:anchor>
+ </netui-template:section>
+
+</netui-template:template>
Propchange: incubator/beehive/trunk/samples/netui-samples/loginexample/start/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
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=177943&r1=177942&r2=177943&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/ui/datagrid/index.jsp Mon May 23 01:45:09 2005
@@ -25,11 +25,11 @@
<netui-template:section name="main">
<!--
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 'resouceBundlePath' attribute references the file WEB-INF/src/org/apache/beehive/samples/netui/resources/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"
+ resourceBundlePath="org.apache.beehive.samples.netui.resources.datagrid.grid"
styleClassPrefix="gridStyle">
<netui-data:configurePager pageSize="3" pagerFormat="prevNext" pageAction="begin.do"/>
<netui-data:caption>Pets Available</netui-data:caption>