[jboss-cvs] jboss-seam/examples/wiki/resources/WEB-INF ...
Christian Bauer
christian.bauer at jboss.com
Fri Feb 16 11:26:45 EST 2007
User: cbauer
Date: 07/02/16 11:26:45
Modified: examples/wiki/resources/WEB-INF pages.xml components.xml
urlrewrite.xml
Log:
Fixed the Wiki, basics work now
Revision Changes Path
1.2 +20 -44 jboss-seam/examples/wiki/resources/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/resources/WEB-INF/pages.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pages.xml 1 Feb 2007 07:08:27 -0000 1.1
+++ pages.xml 16 Feb 2007 16:26:45 -0000 1.2
@@ -3,7 +3,7 @@
<pages>
- <page view-id="/doc/browse.xhtml" action="#{browser.prepareAndCapture()}">
+ <page view-id="/display.xhtml" action="#{browser.prepare()}">
<param name="nodeId" value="#{browser.nodeId}"/>
<navigation>
@@ -11,68 +11,49 @@
<render view-id="/docDisplay.xhtml"/>
</rule>
<rule>
- <render view-id="/dirBrowser.xhtml"/>
+ <render view-id="/dirDisplay.xhtml"/>
</rule>
</navigation>
-
</page>
- <page view-id="/doc/edit.xhtml" action="#{browser.prepare()}">
+ <page view-id="/docDisplay.xhtml" action="#{browser.prepare()}">
<param name="nodeId" value="#{browser.nodeId}"/>
- <navigation>
- <redirect view-id="/docEdit.xhtml">
- <param name="docId" value="#{currentDocument.id}"/>
- <param name="parentDirId" value="#{currentDirectory.id}"/>
- </redirect>
- </navigation>
- </page>
-
- <!--
- <page view-id="/docDisplay.xhtml" action="#{documentBrowser.prepare()}">
- <param name="docId" value="#{documentBrowser.docId}"/>
<navigation>
- <rule if-outcome="browseDir" if="#{!empty currentDirectory}">
- <redirect view-id="/dirBrowser.xhtml">
- <param name="dirId" value="#{currentDirectory.id}"/>
- </redirect>
- </rule>
- <rule if-outcome="browseDir">
- <redirect view-id="/dirBrowser.xhtml"/>
- </rule>
<rule if-outcome="createDoc">
<redirect view-id="/docEdit.xhtml">
- <param name="dirId" value="#{currentDirectory.id}"/>
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
<rule if-outcome="editDoc">
<redirect view-id="/docEdit.xhtml">
- <param name="dirId" value="#{currentDirectory.id}"/>
<param name="docId" value="#{currentDocument.id}"/>
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
+ <rule if-outcome="browseDir">
+ <render view-id="/dirDisplay.xhtml"/>
+ </rule>
</navigation>
</page>
<page view-id="/docEdit.xhtml">
-
<navigation from-action="#{documentHome.remove}">
<end-conversation/>
- <redirect view-id="/dirBrowser.xhtml">
- <param name="dirId" value="#{currentDirectory.id}"/>
+ <redirect view-id="/display.xhtml">
+ <param name="nodeId" value="#{currentDirectory.id}"/>
</redirect>
</navigation>
-
</page>
- <page view-id="/dirBrowser.xhtml" action="#{directoryBrowser.prepare()}">
- <param name="dirId" value="#{directoryBrowser.dirId}" converterId="javax.faces.Long"/>
+ <page view-id="/dirDisplay.xhtml" action="#{browser.prepare()}">
+ <param name="nodeId" value="#{browser.nodeId}"/>
<navigation>
<rule if-outcome="createDir">
<redirect view-id="/dirEdit.xhtml">
- <param name="parentDirectoryId" value="#{currentDirectory.id}"/>
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
<rule if-outcome="editDir">
@@ -82,13 +63,7 @@
</rule>
<rule if-outcome="createDoc">
<redirect view-id="/docEdit.xhtml">
- <param name="dirId" value="#{currentDirectory.id}"/>
- </redirect>
- </rule>
- <rule if-outcome="editDoc">
- <redirect view-id="/docEdit.xhtml">
- <param name="docId" value="#{param.docId}"/>
- <param name="dirId" value="#{currentDirectory.id}"/>
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
</navigation>
@@ -100,18 +75,19 @@
<navigation from-action="#{directoryHome.remove}">
<rule if="#{!empty directoryHome.parentDirectory}">
<end-conversation/>
- <redirect view-id="/dirBrowser.xhtml">
- <param name="dirId" value="#{directoryHome.parentDirectory.id}"/>
+ <redirect view-id="/dirDisplay.xhtml">
+ <param name="nodeId" value="#{directoryHome.parentDirectory.id}"/>
</redirect>
</rule>
<rule>
<end-conversation/>
- <redirect view-id="/dirBrowser.xhtml"/>
+ <redirect view-id="/dirDisplay.xhtml">
+ <param name="nodeId" value="#{wikiRoot.id}"/>
+ </redirect>
</rule>
</navigation>
</page>
--->
</pages>
1.2 +15 -17 jboss-seam/examples/wiki/resources/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/resources/WEB-INF/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- components.xml 1 Feb 2007 07:08:27 -0000 1.1
+++ components.xml 16 Feb 2007 16:26:45 -0000 1.2
@@ -6,33 +6,31 @@
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
+ <core:init debug="false" jndi-pattern="@jndiPattern@"/>
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
conversation-id-parameter="cid"
conversation-is-long-running-parameter="clr"/>
- <!-- See Node.java -->
- <core:filter name="onlyMenuItemsFilter">
- <core:name>Node.onlyMenuItems</core:name>
- </core:filter>
-
<core:managed-persistence-context name="entityManager"
persistence-unit-jndi-name="java:/wikiEntityManagerFactory"/>
- <core:managed-persistence-context name="filteringMenuItemsEntityManager"
- persistence-unit-jndi-name="java:/wikiEntityManagerFactory">
- </core:managed-persistence-context>
-
<core:ejb installed="@embeddedEjb@"/>
- <!-- For use with jBPM pageflow or process management -->
- <!--
- <core:jbpm>
- <core:process-definitions></core:process-definitions>
- <core:pageflow-definitions></core:pageflow-definitions>
- </core:jbpm>
- -->
+ <!-- ##### WIKI CONFIGURATION ##### -->
+
+ <component name="globalPrefs" class="org.jboss.seam.wiki.core.prefs.GlobalPreferences"
+ scope="application" auto-create="true">
+
+ <property name="defaultURLRendering">WIKILINK</property>
+ <property name="permlinkSuffix">.html</property>
+ <property name="themeName">default</property>
+
+ </component>
+
+ <!-- ##### END OF CONFIGURATION ##### -->
+
+ <factory name="themePath" value="#{facesContext.externalContext.request.contextPath}/themes/#{globalPrefs.themeName}"/>
</components>
\ No newline at end of file
1.2 +7 -24 jboss-seam/examples/wiki/resources/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/resources/WEB-INF/urlrewrite.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- urlrewrite.xml 1 Feb 2007 07:08:27 -0000 1.1
+++ urlrewrite.xml 16 Feb 2007 16:26:45 -0000 1.2
@@ -12,15 +12,18 @@
<rule>
<from>^/([0-9]+)\.html$</from>
- <to last="true">/doc/browse.seam?nodeId=$1</to>
+ <to last="true">/display.seam?nodeId=$1</to>
+ </rule>
+
+ <rule>
+ <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)$</from>
+ <to last="true">/display.seam?areaName=$1</to>
</rule>
-<!--
<rule>
<from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)$</from>
- <to type="redirect">/wiki/docDisplay.seam?dirName=$1&docName=$2</to>
+ <to last="true">/display.seam?areaName=$1&nodeName=$2</to>
</rule>
--->
<!--
@@ -71,26 +74,6 @@
eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older
browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4.
-
-CoWiki:
-
- <IfModule mod_env.c>
- SetEnv COWIKI_URL_REWRITE On
- RewriteRule ^([0-9]+)\.html$ index.php?node=$1&%{QUERY_STRING}
- RewriteRule ^([0-9]+)\.([0-9]+)\.html$ index.php?node=$1&comid=$2%{QUERY_STRING}
- </IfModule>
-
- #
- # Handle WikiWord URLs
- #
- RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&docname=$2&%{QUERY_STRING}
- RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&%{QUERY_STRING}
-
-
-
-
-
-
-->
</urlrewrite>
More information about the jboss-cvs-commits
mailing list