[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:28 EST 2007
User: cbauer
Date: 07/12/18 23:29:28
Modified: examples/wiki/src/etc/WEB-INF pages.xml web.xml
urlrewrite.xml components.xml
Log:
Major rewrite of the most of the application
Revision Changes Path
1.32 +83 -62 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- pages.xml 12 Oct 2007 16:31:27 -0000 1.31
+++ pages.xml 19 Dec 2007 04:29:28 -0000 1.32
@@ -11,11 +11,9 @@
<action execute="#{wikiRequestResolver.resolve}"/>
<navigation>
<rule if-outcome="docDisplay">
- <raise-event type="DocumentHome.init"/>
<render view-id="/docDisplay_#{skin}.xhtml"/>
</rule>
<rule if-outcome="dirDisplay">
- <raise-event type="DirectoryHome.init"/>
<render view-id="/dirDisplay_#{skin}.xhtml"/>
</rule>
</navigation>
@@ -23,45 +21,39 @@
<page view-id="/docDisplay*">
<param name="documentId" value="#{documentHome.nodeId}"/>
- <action execute="#{documentHome.init}"/>
<navigation>
- <rule if-outcome="missingParameters">
- <end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
+ <rule if-outcome="redirectToDocument">
+ <redirect view-id="/wiki.xhtml">
+ <param name="nodeId" value="#{documentHome.instance.id}"/>
+ </redirect>
</rule>
</navigation>
</page>
<page view-id="/docHistory*" no-conversation-view-id="/wiki.xhtml">
- <param name="nodeId" value="#{nodeHistory.nodeId}"/>
- <param name="historicalNodeId" value = "#{nodeHistory.historicalNodeId}"/>
- <action execute="#{nodeHistory.init}"/>
+ <param name="fileId" value="#{documentHistory.fileId}"/>
+ <param name="historicalFileId" value = "#{documentHistory.historicalFileId}"/>
+ <action execute="#{documentHistory.init}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
<rule if-outcome="exit">
<end-conversation before-redirect="true"/>
<redirect view-id="/docDisplay_#{skin}.xhtml">
- <param name="documentId" value="#{nodeHistory.currentNode.id}"/>
+ <param name="documentId" value="#{documentHistory.currentFile.id}"/>
</redirect>
</rule>
<rule if-outcome="purgedHistory">
<end-conversation before-redirect="true"/>
<redirect view-id="/wiki.xhtml">
- <param name="nodeId" value="#{nodeHistory.currentNode.id}"/>
- <param name="message" value="purgedHistory"/>
+ <param name="nodeId" value="#{documentHistory.currentFile.id}"/>
+ <param name="message" value="lacewiki.msg.docHistory.PurgedHistory"/>
</redirect>
</rule>
- <rule if-outcome="missingParameters">
- <end-conversation/>
- <redirect view-id="/message.xhtml">
- <message severity="ERROR">No request parameters specified.</message>
- </redirect>
- </rule>
<rule if-outcome="rollback">
<redirect view-id="/docEdit_#{skin}.xhtml">
- <param name="documentId" value="#{nodeHistory.currentNode.id}"/>
- <param name="parentDirectoryId" value="#{nodeHistory.currentNode.parent.id}"/>
+ <param name="documentId" value="#{documentHistory.currentFile.id}"/>
+ <param name="parentDirectoryId" value="#{documentHistory.currentFile.parent.id}"/>
</redirect>
</rule>
</navigation>
@@ -69,15 +61,11 @@
<page view-id="/docEdit*" no-conversation-view-id="/wiki.xhtml">
<param name="documentId" value="#{documentHome.nodeId}"/>
- <param name="parentDirectoryId" value="#{documentHome.parentDirectoryId}"/>
- <action execute="#{documentHome.init}"/>
+ <param name="parentDirectoryId" value="#{documentHome.parentNodeId}"/>
+ <action execute="#{documentHome.setEdit(true)}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
- <rule if-outcome="missingParameters">
- <end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
- </rule>
<rule if-outcome="exitManaged">
<end-conversation before-redirect="true"/>
<redirect view-id="/docDisplay_#{skin}"/>
@@ -85,13 +73,13 @@
<rule if-outcome="exitUnmanaged">
<end-conversation before-redirect="true"/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{documentHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{documentHome.parentNodeId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{documentHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{documentHome.parentNodeId}"/>
</redirect>
</rule>
</navigation>
@@ -99,26 +87,15 @@
<page view-id="/dirDisplay*">
<param name="directoryId" value="#{directoryHome.nodeId}"/>
- <action execute="#{directoryHome.init}"/>
- <navigation>
- <rule if-outcome="missingParameters">
- <end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
- </rule>
- </navigation>
</page>
<page view-id="/dirEdit*" no-conversation-view-id="/wiki.xhtml">
<param name="directoryId" value="#{directoryHome.nodeId}"/>
- <param name="parentDirectoryId" value="#{directoryHome.parentDirectoryId}"/>
- <action execute="#{directoryHome.init}"/>
+ <param name="parentDirectoryId" value="#{directoryHome.parentNodeId}"/>
+ <action execute="#{directoryHome.setEdit(true)}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
- <rule if-outcome="missingParameters">
- <end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
- </rule>
<rule if-outcome="exitManaged">
<end-conversation before-redirect="true"/>
<redirect view-id="/dirDisplay_#{skin}.xhtml"/>
@@ -126,46 +103,66 @@
<rule if-outcome="exitUnmanaged">
<end-conversation before-redirect="true"/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{directoryHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{directoryHome.parentNodeId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{directoryHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{directoryHome.parentNodeId}"/>
</redirect>
</rule>
</navigation>
</page>
- <page view-id="/fileEdit*" no-conversation-view-id="/wiki.xhtml">
- <param name="fileId" value="#{fileHome.nodeId}"/>
- <param name="parentDirectoryId" value="#{fileHome.parentDirectoryId}"/>
- <action execute="#{fileHome.init}"/>
+ <page view-id="/uploadCreate*" no-conversation-view-id="/wiki.xhtml">
+ <param name="parentDirectoryId" value="#{uploader.parentDirectoryId}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
- <rule if-outcome="missingParameters">
+ <rule if-outcome="exit">
<end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
+ <param name="directoryId" value="#{uploader.parentDirectoryId}"/>
+ </redirect>
+ </rule>
+ <rule if-outcome="WikiUpload">
+ <redirect view-id="/uploadEdit_#{skin}.xhtml">
+ <param name="parentDirectoryId" value="#{uploader.parentDirectoryId}"/>
+ </redirect>
+ </rule>
+ <rule if-outcome="WikiUploadImage">
+ <redirect view-id="/uploadEdit_#{skin}.xhtml">
+ <param name="parentDirectoryId" value="#{uploader.parentDirectoryId}"/>
+ </redirect>
</rule>
+ </navigation>
+ </page>
+
+ <page view-id="/uploadEdit*" no-conversation-view-id="/wiki.xhtml">
+ <param name="uploadId" value="#{uploadHome.nodeId}"/>
+ <param name="parentDirectoryId" value="#{uploadHome.parentNodeId}"/>
+ <action execute="#{uploadHome.setEdit(true)}"/>
+ <begin-conversation flush-mode="MANUAL" join="true"/>
+
+ <navigation>
<rule if-outcome="exit">
<end-conversation before-redirect="true"/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{fileHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{uploadHome.parentNodeId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
<redirect view-id="/dirDisplay_#{skin}.xhtml">
- <param name="directoryId" value="#{fileHome.parentDirectoryId}"/>
+ <param name="directoryId" value="#{uploadHome.parentNodeId}"/>
</redirect>
</rule>
</navigation>
</page>
<page view-id="/tagDisplay*">
- <param name="tag" value="#{tagHome.tag}"/>
+ <param name="tag" value="#{tagQuery.tag}"/>
</page>
<page view-id="/search*">
@@ -215,6 +212,10 @@
</navigation>
</page>
+ <page view-id="/userInfo*">
+ <param name="userId" value="#{userHome.userId}"/>
+ </page>
+
<page view-id="/userList*">
<begin-conversation flush-mode="MANUAL" join="true"/>
</page>
@@ -273,10 +274,13 @@
? messages['lacewiki.label.dirEdit.EditDirectory']
: messages['lacewiki.label.dirEdit.CreateDirectory']}</description>
</page>
- <page view-id="/fileEdit_d.xhtml">
- <description>#{fileHome.idDefined
- ? messages['lacewiki.label.fileEdit.EditFile']
- : messages['lacewiki.label.fileEdit.UploadFile']}</description>
+ <page view-id="/uploadCreate_d.xhtml">
+ <description>#{messages['lacewiki.label.upload.UploadFile']}</description>
+ </page>
+ <page view-id="/uploadEdit_d.xhtml">
+ <description>#{uploadHome.idDefined
+ ? messages['lacewiki.label.uploadEdit.EditFile']
+ : messages['lacewiki.label.uploadEdit.UploadFile']}</description>
</page>
<page view-id="/search_d.xhtml">
<description>#{messages['lacewiki.label.search.Search']} (#{messages['lacewiki.label.search.Results']}: #{wikiSearch.searchResult.size})</description>
@@ -310,10 +314,13 @@
? messages['lacewiki.label.dirEdit.EditDirectory']
: messages['lacewiki.label.dirEdit.CreateDirectory']}</description>
</page>
- <page view-id="/fileEdit_m.xhtml">
- <description>#{fileHome.idDefined
- ? messages['lacewiki.label.fileEdit.EditFile']
- : messages['lacewiki.label.fileEdit.UploadFile']}</description>
+ <page view-id="/uploadCreate_m.xhtml">
+ <description>#{messages['lacewiki.label.upload.UploadFile']}</description>
+ </page>
+ <page view-id="/uploadEdit_m.xhtml">
+ <description>#{uploadHome.idDefined
+ ? messages['lacewiki.label.uploadEdit.EditFile']
+ : messages['lacewiki.label.uploadEdit.UploadFile']}</description>
</page>
<page view-id="/search_m.xhtml">
<description>#{messages['lacewiki.label.search.Search']} (#{messages['lacewiki.label.search.Results']}: #{wikiSearch.searchResult.size})</description>
@@ -334,6 +341,20 @@
</page>
+
+
+
+ <page view-id="/test.xhtml">
+ <param name="foo" value="#{testBean.foo}"/>
+ </page>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/message.xhtml">
+ <message>Your session has timed out, please try again</message>
+ </redirect>
+ </exception>
+
+ <!--
<exception class="org.jboss.seam.framework.EntityNotFoundException">
<end-conversation/>
<http-error error-code="404"/>
@@ -347,11 +368,11 @@
</exception>
<exception class="javax.persistence.OptimisticLockException">
- <end-conversation/>
<redirect view-id="/message.xhtml">
- <message severity="ERROR">#{messages['lacewiki.msg.OptimisticLockError']}</message>
+ <message>An error occured.</message>
</redirect>
</exception>
+-->
<!-- This breaks unit tests...
<exception>
1.22 +0 -0 jboss-seam/examples/wiki/src/etc/WEB-INF/web.xml
(In the diff below, changes in quantity of whitespace are not shown.)
1.13 +0 -3 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- urlrewrite.xml 1 Oct 2007 19:08:03 -0000 1.12
+++ urlrewrite.xml 19 Dec 2007 04:29:28 -0000 1.13
@@ -22,9 +22,6 @@
<from>.*</from>
<condition next="or" name="user-agent">Windows CE</condition>
<condition next="or" name="user-agent">SonyEricsson</condition>
- <!-- iPhone looks better with regular skin
- <condition next="or" name="user-agent">iPhone</condition>
- -->
<condition name="user-agent">BlackBerry</condition>
<set type="session" name="skin">m</set>
</rule>
1.33 +4 -1 jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: components.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- components.xml 14 Nov 2007 10:55:25 -0000 1.32
+++ components.xml 19 Dec 2007 04:29:28 -0000 1.33
@@ -86,7 +86,7 @@
</component>
<component name="nestedSetNodeWrapperRestrictedEntityConverter" scope="CONVERSATION" precedence="20"
- class="org.jboss.seam.wiki.core.nestedset.NestedSetNodeWrapperEntityConverter">
+ class="org.jboss.seam.wiki.core.nestedset.ui.NestedSetNodeWrapperEntityConverter">
<property name="entityManager">#{restrictedEntityManager}</property>
</component>
@@ -131,4 +131,7 @@
<factory name="skin" scope="SESSION" value="d"/>
+ <factory name="sessionTimeoutSeconds" scope="SESSION"
+ value="#{facesContext.externalContext.getSession(true).getMaxInactiveInterval()}"/>
+
</components>
More information about the jboss-cvs-commits
mailing list