[jboss-svn-commits] JBL Code SVN: r10644 - in labs/jbossforums/branches/forums101P24/forums: src/main/org/jboss/portlet/forums/ui and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 30 10:52:04 EDT 2007
Author: dejp
Date: 2007-03-30 10:52:04 -0400 (Fri, 30 Mar 2007)
New Revision: 10644
Modified:
labs/jbossforums/branches/forums101P24/forums/build.xml
labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
JBFORUMS-200
Modified: labs/jbossforums/branches/forums101P24/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/build.xml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/build.xml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -211,7 +211,8 @@
<copy todir="${build.resources}/portal-forums-ear">
<fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
- <fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+ <!--fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/-->
+ <fileset dir="${apache.myfaces.lib}" includes="tomahawk.jar"/>
</copy>
<jar jarfile="${build.lib}/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
Modified: labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java 2007-03-30 14:52:04 UTC (rev 10644)
@@ -367,9 +367,10 @@
super.doView(request,response);
}
- catch(Throwable t)
+ catch(Exception e)
{
- throw new PortletException(t);
+ e.printStackTrace();
+ throw new PortletException(e);
}
}
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/application.xml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -4,19 +4,19 @@
<module>
<java>portal-forums-ui.jar</java>
</module>
- <module>
+ <!--module>
<java>jsf-facelets.jar</java>
- </module>
- <module>
+ </module-->
+ <!--module>
<java>el-api.jar</java>
</module>
<module>
<java>el-ri.jar</java>
- </module>
- <!--<module>
+ </module-->
+ <!--module>
<java>tomahawk.jar</java>
- </module>
- <module>
+ </module-->
+ <!--module>
<java>myfaces-impl.jar</java>
</module>
<module>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-app>
- <loader-repository>
+ <!--loader-repository>
forums.jboss.com:loader=jboss-forums-sar
<loader-repository-config>
java2ParentDelegation=false
</loader-repository-config>
- </loader-repository>
+ </loader-repository-->
<module>
<java>portal-forums-ui.jar</java>
</module>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -590,7 +590,7 @@
<tr>
<td class="nonewpostRow" colspan="6">
<h3>
- ${resource.No_topics_post_one}
+ <h:outputText value="#{resource['No_topics_post_one']}" escape="false" />
</h3>
</td>
</tr>
@@ -839,45 +839,46 @@
<!-- post new topics link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://newTopic">
- ${resource.Rules_post_can}
+ <h:outputText value="#{resource['Rules_post_can']}" escape="false" />
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_post_cannot}
+ <h:outputText value="#{resource['Rules_post_cannot']}" escape="false" />
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
- <br />
+ <br/>
<!-- manage poll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://managePoll">
- ${resource.Rules_poll_can}
+ <h:outputText value="#{resource['Rules_post_can']}" escape="false" />
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_poll_cannot}
+ <h:outputText value="#{resource['Rules_poll_cannot']}" escape="false" />
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
- <br />
+ <br/>
<!-- votePoll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://votePoll">
- ${resource.Rules_vote_can}
+ <h:outputText value="#{resource['Rules_vote_can']}" escape="false" />
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_vote_cannot}
+ <h:outputText value="#{resource['Rules_vote_cannot']}" escape="false" />
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
- <br />
+ <br/>
<!-- moderate forum link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
- ${resource.Rules_moderate_0}${resource.Rules_moderate_2}
+ <h:outputText value="#{resource['Rules_moderate_0']}" escape="false" /><h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- ${resource.Rules_moderate_1}${resource.Rules_moderate_2}
+ <h:outputText value="#{resource['Rules_moderate_1']}" escape="false" /><h:outputText value="#{resource['Rules_moderate_2']}" escape="false" />
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
+ <br/>
</div>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(editPost.message,false)}
+ <h:outputText value="#{forums:formatMessage(editPost.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(newTopic.message,false)}
+ <h:outputText value="#{forums:formatMessage(newTopic.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -48,7 +48,7 @@
<tr>
<td>
<span class="postbody">
- #{forums:formatMessage(replyTopic.message,false)}
+ <h:outputText value="#{forums:formatMessage(replyTopic.message,false)}" escape="false" />
</span>
</td>
</tr>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2007-03-30 14:35:08 UTC (rev 10643)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2007-03-30 14:52:04 UTC (rev 10644)
@@ -423,7 +423,8 @@
<td class="forumpostcontent">
<p>
- #{forums:formatMessage(postrow.message.text,false)}
+ <h:outputText value="#{forums:formatMessage(postrow.message.text,false)}" escape="false" />
+
<c:if test="${forums:nullIfEmptyString(postrow.poster.user.signature) ne null}">
<br /><br />
${postrow.poster.user.signature}
More information about the jboss-svn-commits
mailing list