[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Fri Aug 17 09:00:30 EDT 2007
User: cbauer
Date: 07/08/17 09:00:30
Modified: examples/wiki/src/etc/WEB-INF pages.xml web.xml
urlrewrite.xml
Log:
Major refactoring of core data schema and some new features
Revision Changes Path
1.21 +18 -3 jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pages.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- pages.xml 26 Jun 2007 23:04:10 -0000 1.20
+++ pages.xml 17 Aug 2007 13:00:30 -0000 1.21
@@ -12,6 +12,7 @@
<!-- End any pending long-running conversation that was propagated into his view -->
<end-conversation/>
+ <!-- These are the "start pages", outcomes of browser.prepare() and various request parameters -->
<navigation>
<rule if-outcome="search">
<redirect view-id="/search.xhtml">
@@ -36,6 +37,7 @@
<navigation>
<rule if-outcome="createDoc">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/docEdit.xhtml">
<param name="parentDirId" value="#{currentDirectory.id}"/>
@@ -43,6 +45,7 @@
</rule>
<rule if-outcome="editDoc">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/docEdit.xhtml">
<param name="nodeId" value="#{currentDocument.id}"/>
@@ -51,13 +54,15 @@
</rule>
<rule if-outcome="showHistory">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
- <out name="currentNode" value="#{currentDocument}"/>
- <redirect view-id="/docHistory.xhtml"/>
+ <redirect view-id="/docHistory.xhtml">
+ <param name="nodeId" value="#{currentDocument.id}"/>
+ </redirect>
</rule>
<rule if-outcome="browseDir">
- <render view-id="/dirDisplay.xhtml"/>
+ <redirect view-id="/dirDisplay.xhtml"/>
</rule>
</navigation>
@@ -108,12 +113,14 @@
<navigation>
<rule if-outcome="createDir">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/dirEdit.xhtml">
<param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
<rule if-outcome="editDir">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/dirEdit.xhtml">
<param name="nodeId" value="#{currentDirectory.id}"/>
@@ -121,18 +128,21 @@
</redirect>
</rule>
<rule if-outcome="createDoc">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/docEdit.xhtml">
<param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
<rule if-outcome="uploadFile">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/fileEdit.xhtml">
<param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
<rule if-outcome="editFile">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/fileEdit.xhtml">
<param name="nodeId" value="#{param.fileId}"/>
@@ -240,18 +250,21 @@
</rule>
<rule if-outcome="register">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/userRegister.xhtml">
<param name="lastConversationId" value="#{param.lastConversationId}"/>
</redirect>
</rule>
<rule if-outcome="listUsers">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/userList.xhtml">
<param name="lastConversationId" value="#{param.lastConversationId}"/>
</redirect>
</rule>
<rule if-outcome="editUser">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/userHome.xhtml">
<param name="lastConversationId" value="#{param.lastConversationId}"/>
@@ -260,6 +273,7 @@
</rule>
<rule if-outcome="adminHome">
+ <raise-event type="NodeBrowser.prepare"/>
<begin-conversation flush-mode="MANUAL"/>
<redirect view-id="/adminHome.xhtml">
<param name="lastConversationId" value="#{param.lastConversationId}"/>
@@ -268,6 +282,7 @@
<!-- 'Find' postback starts a new root conversation, see /search.xhtml -->
<rule if-outcome="search">
+ <raise-event type="NodeBrowser.prepare"/>
<redirect view-id="/search.xhtml">
<param name="conversationPropagation" value="#{'none'}"/>
<param name="lastConversationId" value="#{conversation.id}"/>
1.17 +0 -1 jboss-seam/examples/wiki/src/etc/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/wiki/src/etc/WEB-INF/web.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- web.xml 16 Jul 2007 06:45:56 -0000 1.16
+++ web.xml 17 Aug 2007 13:00:30 -0000 1.17
@@ -112,5 +112,4 @@
<session-timeout>180</session-timeout>
</session-config>
-
</web-app>
1.4 +5 -0 jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: urlrewrite.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- urlrewrite.xml 12 Jun 2007 12:50:38 -0000 1.3
+++ urlrewrite.xml 17 Aug 2007 13:00:30 -0000 1.4
@@ -25,6 +25,11 @@
<to last="true">/display.seam?areaName=$1&nodeName=$2</to>
</rule>
+ <rule>
+ <from>^/$</from>
+ <to>/display.seam</to>
+ </rule>
+
<!--
INSTALLATION
More information about the jboss-cvs-commits
mailing list