[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Mon Apr 2 14:25:06 EDT 2007
User: cbauer
Date: 07/04/02 14:25:06
Modified: examples/wiki/src/etc/WEB-INF pages.xml web.xml
components.xml urlrewrite.xml
Log:
Totally overengineered but definitely cool system/user/instance wiki preferences architecture
Revision Changes Path
1.7 +40 -7 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pages.xml 21 Mar 2007 01:24:50 -0000 1.6
+++ pages.xml 2 Apr 2007 18:25:06 -0000 1.7
@@ -4,6 +4,10 @@
<pages login-view-id="/loginRequired.xhtml"
no-conversation-view-id="/dirDisplay.xhtml">
+ <page view-id="/test.xhtml" action="#{browser.prepare}">
+ <param name="nodeId" value="#{browser.nodeId}"/>
+ </page>
+
<page view-id="/display.xhtml" action="#{browser.prepare}">
<param name="nodeId" value="#{browser.nodeId}"/>
@@ -168,17 +172,29 @@
</page>
<page view-id="/userAccount.xhtml">
- <description>Managing Member Account '#{userHome.instance.username}'</description>
+ <description>Managing Member Account</description>
</page>
<page view-id="/userProfile.xhtml">
- <description>Managing Member Profile '#{userHome.instance.username}'</description>
+ <description>Managing Member Profile</description>
</page>
<page view-id="/userPrefs.xhtml">
- <description>Managing Member Preferences '#{userHome.instance.username}'</description>
+ <description>Managing Member Preferences</description>
</page>
<page view-id="/userList.xhtml">
<description>Searching Members (Results: #{userSearch.rowCount})</description>
</page>
+ <page view-id="/adminHome.xhtml">
+ <restrict>#{s:hasPermission('User', 'isAdmin', currentUser)}</restrict>
+ <description>Administration: Home</description>
+ </page>
+ <page view-id="/adminRoles.xhtml">
+ <restrict>#{s:hasPermission('User', 'isAdmin', currentUser)}</restrict>
+ <description>Administration: Roles</description>
+ </page>
+ <page view-id="/adminPrefs.xhtml">
+ <restrict>#{s:hasPermission('User', 'isAdmin', currentUser)}</restrict>
+ <description>Administration: Preferences</description>
+ </page>
<page view-id="/userHome.xhtml" action="#{browser.redirectToCurrentUserHome()}"/>
<!-- Global actions -->
@@ -223,18 +239,37 @@
<param name="userId" value="#{currentUser.id}"/>
</redirect>
</rule>
+
<rule if-outcome="editPreferences">
<begin-conversation join="true" flush-mode="MANUAL"/>
<redirect view-id="/userPrefs.xhtml">
- <param name="userId" value="#{currentUser.id}"/>
+ <param name="userId" value="#{userHome.instance.id}"/>
+ <param name="visibility" value="#{'USER'}"/>
</redirect>
</rule>
+
<rule if-outcome="listUsers">
<!-- TODO: I don't want to join, I want a new parallel root conversation: http://jira.jboss.com/jira/browse/JBSEAM-944 -->
<begin-conversation join="true" flush-mode="MANUAL"/>
<redirect view-id="/userList.xhtml"/>
</rule>
+ <rule if-outcome="adminHome">
+ <!-- TODO: I don't want to join, I want a new parallel root conversation: http://jira.jboss.com/jira/browse/JBSEAM-944 -->
+ <begin-conversation join="true" flush-mode="MANUAL"/>
+ <redirect view-id="/adminHome.xhtml"/>
+ </rule>
+ <rule if-outcome="adminRoles">
+ <begin-conversation join="true" flush-mode="MANUAL"/>
+ <redirect view-id="/adminRoles.xhtml"/>
+ </rule>
+ <rule if-outcome="adminPrefs">
+ <begin-conversation join="true" flush-mode="MANUAL"/>
+ <redirect view-id="/adminPrefs.xhtml">
+ <param name="visibility" value="#{'SYSTEM'}"/>
+ </redirect>
+ </rule>
+
<rule if-outcome="error">
<redirect view-id="/message.xhtml">
<message severity="ERROR">An unrecoverable error occured!</message>
@@ -266,11 +301,9 @@
gets an error message. -->
<page view-id="/loginRequired.xhtml" action="#{browser.redirectToLastBrowsedPageWithConversation}"/>
- <page view-id="/permissionError.xhtml" action="#{browser.redirectToLastBrowsedPageWithConversation}"/>
-
<exception class="org.jboss.seam.security.AuthorizationException">
<end-conversation/>
- <redirect view-id="/permissionError.xhtml">
+ <redirect view-id="/message.xhtml">
<message severity="WARN">Access Denied: #{org.jboss.seam.handledException.message}</message>
</redirect>
</exception>
1.4 +72 -71 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- web.xml 18 Mar 2007 15:44:39 -0000 1.3
+++ web.xml 2 Apr 2007 18:25:06 -0000 1.4
@@ -7,7 +7,6 @@
<!-- Ajax4jsf (must come first!) -->
<filter>
- <display-name>Ajax4jsf Filter</display-name>
<filter-name>ajax4jsf</filter-name>
<filter-class>org.ajax4jsf.Filter</filter-class>
</filter>
@@ -15,6 +14,9 @@
<filter-mapping>
<filter-name>ajax4jsf</filter-name>
<url-pattern>*.seam</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
</filter-mapping>
<context-param>
@@ -53,25 +55,6 @@
<url-pattern>/seam/resource/*</url-pattern>
</servlet-mapping>
- <!-- URL Rewrite -->
-
- <filter>
- <filter-name>UrlRewriteFilter</filter-name>
- <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
- <init-param>
- <param-name>logLevel</param-name>
- <param-value>WARN</param-value>
- </init-param>
- <init-param>
- <param-name>statusEnabled</param-name>
- <param-value>false</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>UrlRewriteFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<!-- MyFaces -->
<listener>
@@ -134,5 +117,23 @@
<session-timeout>10</session-timeout>
</session-config>
+ <!-- URL Rewrite -->
+
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ <init-param>
+ <param-name>logLevel</param-name>
+ <param-value>WARN</param-value>
+ </init-param>
+ <init-param>
+ <param-name>statusEnabled</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
</web-app>
1.7 +1 -17 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- components.xml 20 Mar 2007 18:40:32 -0000 1.6
+++ components.xml 2 Apr 2007 18:25:06 -0000 1.7
@@ -16,22 +16,6 @@
<!-- ##### WIKI USER CONFIGURATION ##### -->
- <component name="globalPrefs" class="org.jboss.seam.wiki.core.model.GlobalPreferences"
- scope="application" auto-create="true">
-
- <property name="baseURL">http://www.seamframework.org/wiki</property>
- <property name="defaultURLRendering">WIKILINK</property>
- <property name="permlinkSuffix">.html</property>
- <property name="defaultDocumentId">10</property>
- <property name="memberAreaId">2</property>
- <property name="themeName">default</property>
- <property name="newUserInRole">member</property>
- <property name="passwordRegex">^[0-9A-Za-z]{6,15}</property>
- <property name="activationCodeSalt">MySecretSalt123</property>
- <property name="defaultNewRevisionForEditedDocument">true</property>
-
- </component>
-
<mail:mail-session host="mail.bluewin.ch" port="25"/>
<web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/>
@@ -100,6 +84,6 @@
<web:context-filter url-pattern="/files/*"/>
<factory name="themePath" scope="APPLICATION"
- value="#{facesContext.externalContext.request.contextPath}/themes/#{globalPrefs.themeName}"/>
+ value="#{facesContext.externalContext.request.contextPath}/themes/#{wikiPreferences.themeName}"/>
</components>
\ No newline at end of file
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- urlrewrite.xml 7 Mar 2007 18:37:34 -0000 1.1
+++ urlrewrite.xml 2 Apr 2007 18:25:06 -0000 1.2
@@ -11,7 +11,7 @@
<urlrewrite>
<rule>
- <from>^/([0-9]+)\.html$</from>
+ <from>^/([0-9]+)\.[a-zA-z]+$</from>
<to last="true">/display.seam?nodeId=$1</to>
</rule>
More information about the jboss-cvs-commits
mailing list