[jboss-cvs] jboss-seam/examples/wiki/resources/WEB-INF ...
Christian Bauer
christian.bauer at jboss.com
Wed Feb 28 13:25:07 EST 2007
User: cbauer
Date: 07/02/28 13:25:07
Modified: examples/wiki/resources/WEB-INF faces-config.xml
pages.xml components.xml web.xml
Log:
Basic file attachment/image embedding support
Revision Changes Path
1.3 +8 -0 jboss-seam/examples/wiki/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/wiki/resources/WEB-INF/faces-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- faces-config.xml 21 Feb 2007 16:24:10 -0000 1.2
+++ faces-config.xml 28 Feb 2007 18:25:07 -0000 1.3
@@ -26,6 +26,14 @@
<property-name>brokenLinkStyleClass</property-name>
<property-class>java.lang.String</property-class>
</property>
+ <property>
+ <property-name>attachmentLinkStyleClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>inlineLinkStyleClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
</component>
<!-- Seam transaction management -->
1.8 +49 -0 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pages.xml 27 Feb 2007 13:21:44 -0000 1.7
+++ pages.xml 28 Feb 2007 18:25:07 -0000 1.8
@@ -59,6 +59,17 @@
<param name="nodeId" value="#{currentDirectory.id}"/>
</redirect>
</navigation>
+
+ <navigation>
+ <rule if-outcome="uploadFile">
+ <begin-conversation nested="true" flush-mode="MANUAL"/>
+ <redirect view-id="/fileEdit.xhtml">
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
+ </redirect>
+ </rule>
+ </navigation>
+
+
</page>
<page view-id="/dirDisplay.xhtml" action="#{browser.prepare}">
@@ -86,6 +97,20 @@
<param name="parentDirId" value="#{currentDirectory.id}"/>
</redirect>
</rule>
+ <rule if-outcome="uploadFile">
+ <begin-conversation flush-mode="MANUAL"/>
+ <redirect view-id="/fileEdit.xhtml">
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
+ </redirect>
+ </rule>
+ <rule if-outcome="editFile">
+ <begin-conversation flush-mode="MANUAL"/>
+ <redirect view-id="/fileEdit.xhtml">
+ <param name="fileId" value="#{param.fileId}"/>
+ <param name="parentDirId" value="#{currentDirectory.id}"/>
+ </redirect>
+ </rule>
+
</navigation>
</page>
@@ -111,6 +136,30 @@
</page>
+ <page view-id="/fileEdit.xhtml" login-required="false" no-conversation-view-id="/dirDisplay.xhtml">
+ <description>Edit File '#{fileHome.instance.name}'</description>
+
+ <navigation from-action="#{fileHome.remove}">
+ <rule>
+ <end-conversation/>
+ <redirect view-id="/dirDisplay.xhtml">
+ <param name="nodeId" value="#{parentDirectory.id}"/>
+ </redirect>
+ </rule>
+ </navigation>
+
+ <!-- TODO: bug in file upload rendering vs. redirect, http://jira.jboss.com/jira/browse/JBSEAM-948 -->
+ <navigation from-action="#{fileHome.persist}">
+ <rule>
+ <end-conversation/>
+ <redirect view-id="/dirDisplay.xhtml">
+ <param name="nodeId" value="#{parentDirectory.id}"/>
+ </redirect>
+ </rule>
+ </navigation>
+
+ </page>
+
<page view-id="/userAccount.xhtml" no-conversation-view-id="/message.xhtml">
<description>Managing Member Account '#{userHome.instance.username}'</description>
</page>
1.7 +7 -2 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- components.xml 28 Feb 2007 06:18:49 -0000 1.6
+++ components.xml 28 Feb 2007 18:25:07 -0000 1.7
@@ -31,8 +31,12 @@
<mail:mail-session host="mail.bluewin.ch" port="25"/>
+ <web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/>
+
<!-- ##### END OF WIKI USER CONFIGURATION ##### -->
+ <!-- Seam settings -->
+
<core:init debug="false" jndi-pattern="@jndiPattern@"/>
<core:manager concurrent-request-timeout="500"
@@ -56,8 +60,9 @@
</drools:rule-files>
</drools:rule-base>
- <!-- Misc application settings -->
+ <web:context-filter url-pattern="/files/*"/>
<factory name="themePath" value="#{facesContext.externalContext.request.contextPath}/themes/#{globalPrefs.themeName}"/>
+
</components>
1.7 +11 -0 jboss-seam/examples/wiki/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/wiki/resources/WEB-INF/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- web.xml 22 Feb 2007 11:52:25 -0000 1.6
+++ web.xml 28 Feb 2007 18:25:07 -0000 1.7
@@ -85,4 +85,15 @@
<role-name>NONE</role-name>
</auth-constraint>
</security-constraint>
+
+ <!-- File Servlet -->
+ <servlet>
+ <servlet-name>File Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.wiki.core.ui.FileServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>File Servlet</servlet-name>
+ <url-pattern>/files/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
More information about the jboss-cvs-commits
mailing list