[jboss-cvs] jboss-seam/examples/dvdstore/resources/WEB-INF ...
Gavin King
gavin.king at jboss.com
Thu Nov 2 13:26:04 EST 2006
User: gavin
Date: 06/11/02 13:26:04
Modified: examples/dvdstore/resources/WEB-INF faces-config.xml
web.xml
Added: examples/dvdstore/resources/WEB-INF navigation.xml
Log:
use seam resource bundle
split out navrules
Revision Changes Path
1.11 +1 -72 jboss-seam/examples/dvdstore/resources/WEB-INF/faces-config.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: faces-config.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/resources/WEB-INF/faces-config.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- faces-config.xml 30 Jun 2006 02:51:19 -0000 1.10
+++ faces-config.xml 2 Nov 2006 18:26:03 -0000 1.11
@@ -1,16 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
-
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
<faces-config>
- <application>
- <message-bundle>messages</message-bundle>
- <locale-config>
- <default-locale>en_US</default-locale>
- <supported-locale>en</supported-locale>
- </locale-config>
- </application>
<application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
@@ -20,68 +13,4 @@
<phase-listener>org.jboss.seam.jsf.SeamExtendedManagedPersistencePhaseListener</phase-listener>
</lifecycle>
- <navigation-rule>
- <navigation-case>
- <from-outcome>home</from-outcome>
- <to-view-id>/home.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>browse</from-outcome>
- <to-view-id>/browse.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>checkout</from-outcome>
- <to-view-id>/checkout.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>showorders</from-outcome>
- <to-view-id>/showorders.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>newcustomer</from-outcome>
- <to-view-id>/newuser/account.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>logout</from-outcome>
- <to-view-id>/home.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>ship</from-outcome>
- <to-view-id>/admin/ship.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>accept</from-outcome>
- <to-view-id>/admin/accept.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>admin</from-outcome>
- <to-view-id>/admin/admin.xhtml</to-view-id>
- <redirect />
- </navigation-case>
- </navigation-rule>
-
- <!-- temp workaround for facelets/myfaces bug -->
- <navigation-rule>
- <navigation-case>
- <from-action>#{pooledTask.assignToCurrentActor}</from-action>
- <from-outcome>taskAssignedToActor</from-outcome>
- <to-view-id>/admin/admin.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
</faces-config>
1.14 +5 -0 jboss-seam/examples/dvdstore/resources/WEB-INF/web.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: web.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/resources/WEB-INF/web.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- web.xml 12 Oct 2006 02:43:40 -0000 1.13
+++ web.xml 2 Nov 2006 18:26:04 -0000 1.14
@@ -5,6 +5,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/navigation.xml</param-value>
+ </context-param>
+
<listener>
<listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
</listener>
1.1 date: 2006/11/02 18:26:04; author: gavin; state: Exp;jboss-seam/examples/dvdstore/resources/WEB-INF/navigation.xml
Index: navigation.xml
===================================================================
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
<navigation-rule>
<navigation-case>
<from-outcome>home</from-outcome>
<to-view-id>/home.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>browse</from-outcome>
<to-view-id>/browse.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>checkout</from-outcome>
<to-view-id>/checkout.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>showorders</from-outcome>
<to-view-id>/showorders.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>newcustomer</from-outcome>
<to-view-id>/newuser/account.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>logout</from-outcome>
<to-view-id>/home.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>ship</from-outcome>
<to-view-id>/admin/ship.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>accept</from-outcome>
<to-view-id>/admin/accept.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>admin</from-outcome>
<to-view-id>/admin/admin.xhtml</to-view-id>
<redirect />
</navigation-case>
</navigation-rule>
<!-- temp workaround for facelets/myfaces bug -->
<navigation-rule>
<navigation-case>
<from-action>#{pooledTask.assignToCurrentActor}</from-action>
<from-outcome>taskAssignedToActor</from-outcome>
<to-view-id>/admin/admin.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
More information about the jboss-cvs-commits
mailing list