[jboss-svn-commits] JBL Code SVN: r26547 - in labs/jbossforums/branches/forums120P27: forums/src/main/org/jboss/portlet/forums/feeds and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 15 05:39:03 EDT 2009
Author: sviluppatorefico
Date: 2009-05-15 05:39:03 -0400 (Fri, 15 May 2009)
New Revision: 26547
Added:
labs/jbossforums/branches/forums120P27/thirdparty/jakarta-commons/lib/commons-lang-2.1.jar
Modified:
labs/jbossforums/branches/forums120P27/.classpath
labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java
labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/forums120P27/tools/etc/buildfragments/libraries.ent
Log:
fixed bug on RSS Feeds. Feed was not formatted in html code. see JBFORUMS-286
Modified: labs/jbossforums/branches/forums120P27/.classpath
===================================================================
--- labs/jbossforums/branches/forums120P27/.classpath 2009-05-15 09:35:58 UTC (rev 26546)
+++ labs/jbossforums/branches/forums120P27/.classpath 2009-05-15 09:39:03 UTC (rev 26547)
@@ -42,5 +42,6 @@
<classpathentry kind="lib" path="thirdparty/jboss-hibernate/lib/hibernate-commons-annotations.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-myfaces/lib/tomahawk.jar"/>
<classpathentry kind="lib" path="thirdparty/portlet/lib/portlet-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jakarta-commons/lib/commons-lang-2.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java
===================================================================
--- labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java 2009-05-15 09:35:58 UTC (rev 26546)
+++ labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java 2009-05-15 09:39:03 UTC (rev 26547)
@@ -37,6 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.transaction.TransactionManager;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
import org.hibernate.TransactionException;
import org.jboss.portal.common.transaction.TransactionManagerProvider;
@@ -49,7 +50,6 @@
import org.jboss.portlet.forums.model.Topic;
import org.jboss.portlet.forums.ui.Constants;
import org.jboss.portlet.forums.ui.ForumsJSFPortlet;
-import org.jboss.portlet.forums.ui.PortalUtil;
import com.sun.syndication.feed.synd.SyndContent;
import com.sun.syndication.feed.synd.SyndContentImpl;
@@ -314,8 +314,11 @@
entry.setPublishedDate(post.getCreateDate());
description = new SyndContentImpl();
description.setType("text/html");
- description.setValue(PortalUtil.formatMessage(post.getMessage()
- .getText(), post.getMessage().getHTMLEnabled()));
+
+ String text = post.getMessage()
+ .getText();
+ description.setValue(post.getMessage().getHTMLEnabled() ?
+ StringEscapeUtils.escapeHtml(text) : text);
entry.setDescription(description);
return entry;
Modified: labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
===================================================================
--- labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java 2009-05-15 09:35:58 UTC (rev 26546)
+++ labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java 2009-05-15 09:39:03 UTC (rev 26547)
@@ -46,7 +46,7 @@
@Field(index=Index.TOKENIZED)
private String text = "";
private boolean BBCodeEnabled = true;
- private boolean HTMLEnabled = false;
+ private boolean HTMLEnabled = true;
private boolean smiliesEnabled = false;
private boolean signatureEnabled = true;
Modified: labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2009-05-15 09:35:58 UTC (rev 26546)
+++ labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2009-05-15 09:39:03 UTC (rev 26547)
@@ -22,19 +22,16 @@
******************************************************************************/
package org.jboss.portlet.forums.ui;
-import java.io.StringWriter;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import java.util.ResourceBundle;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.naming.InitialContext;
@@ -44,7 +41,6 @@
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
import org.jboss.portal.core.modules.ModuleConstants;
@@ -54,9 +50,6 @@
import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portlet.forums.ForumsConstants;
import org.jboss.portlet.forums.feeds.FeedConstants;
-import org.jboss.portlet.forums.format.render.bbcodehtml.ToHTMLConfig;
-import org.jboss.portlet.forums.format.render.bbcodehtml.ToHTMLRenderer;
-import org.jboss.portlet.forums.format.util.CLLoader;
import org.jboss.portlet.forums.helper.TempFileBinding;
import org.jboss.portlet.forums.impl.MessageImpl;
import org.jboss.portlet.forums.impl.PollImpl;
@@ -76,34 +69,11 @@
*/
public class PortalUtil
{
- private static CLLoader loader = new CLLoader("template");
private static Logger log = Logger.getLogger(PortalUtil.class);
private static SimpleDateFormat sdfForLastLoginDate;
- private static User user = new User()
- {
- public Object getId()
- {
- return null;
- }
-
- public void updatePassword(String string)
- {
- }
-
- public boolean validatePassword(String string)
- {
- return false;
- }
-
- public String getUserName()
- {
- return null;
- }
- };
-
private static User userNA = new User()
{
{
@@ -654,112 +624,11 @@
return poster;
}
-
- /**
- * Method used for parsing bbcode and return properly formated text of
- * message.
- *
- * @return
- */
- public static String formatMessage(String text, boolean allowHTML)
- {
- try
- {
- Object req = FacesContext.getCurrentInstance().getExternalContext()
- .getRequest();
-
- if (allowHTML)
- {
- getToHTMLRenderer(req).getConfig().setFilterMode(
- ToHTMLConfig.FILTER_MODE_ALWAYS_PRINT);
- getToHTMLRenderer(req).getConfig().setOuputMode(
- ToHTMLConfig.OUTPUT_MODE_REMOVE);
- getToHTMLRenderer(req).getConfig().setMaxTextWidth(
- Integer.MAX_VALUE);
- } else
- {
- getToHTMLRenderer(req).getConfig().setFilterMode(
- ToHTMLConfig.FILTER_MODE_NEVER_PRINT);
- getToHTMLRenderer(req).getConfig().setOuputMode(
- ToHTMLConfig.OUTPUT_MODE_REMOVE);
- getToHTMLRenderer(req).getConfig().setMaxTextWidth(
- Integer.MAX_VALUE);
- }
- return formatTitle(req, text);
- } catch (Exception e)
- {
- // Now if something goes wrong it just returns message with bbcode.
- return text;
- }
-
- }
-
/**
*
- * @param text
* @return
*/
- public static String formatTitle(Object req, String text)
- {
-
- StringWriter stringWriter = new StringWriter();
- getToHTMLRenderer(req).setWriter(stringWriter);
- getToHTMLRenderer(req).render(text.toCharArray(), 0, text.length());
- getToHTMLRenderer(req).getConfig().setMaxTextWidth(Integer.MAX_VALUE);
- return stringWriter.toString();
-
- }
-
- /**
- *
- * @return
- */
- private static ToHTMLRenderer getToHTMLRenderer(Object req)
- {
- ToHTMLRenderer renderer = null;
- PortletRequest porReq = null;
- HttpServletRequest serReq = null;
- if (req instanceof PortletRequest)
- {
- porReq = (PortletRequest) req;
- renderer = (ToHTMLRenderer) porReq.getPortletSession()
- .getAttribute("RENDERER");
- } else
- {
- serReq = (HttpServletRequest) req;
- // TODO: GETTING RENDERER FROM APPLICATION SCOPE ATTRIBUTE
- }
- if (renderer == null)
- {
-
- // Getting ResourceBundle with current Locale
- FacesContext ctx = FacesContext.getCurrentInstance();
- UIViewRoot uiRoot = ctx.getViewRoot();
- Locale locale = uiRoot.getLocale();
- ClassLoader ldr = Thread.currentThread().getContextClassLoader();
- ResourceBundle bundle = ResourceBundle.getBundle("ResourceJSF",
- locale, ldr);
-
- // Create the HTMLRenderer for BBCode
- ToHTMLConfig config = new ToHTMLConfig();
- config.setLoader(loader);
- renderer = new ToHTMLRenderer(config, bundle);
- if (porReq != null)
- {
- porReq.getPortletSession().setAttribute("RENDERER", renderer);
- } else if (serReq != null)
- {
- // TODO: SETTING RENDERER IN APPLICATION SCOPE ATTRIBUTE
- }
- }
- return renderer;
- }
-
- /**
- *
- * @return
- */
public static Poll createPoll()
{
Poll poll = new PollImpl();
Added: labs/jbossforums/branches/forums120P27/thirdparty/jakarta-commons/lib/commons-lang-2.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums120P27/thirdparty/jakarta-commons/lib/commons-lang-2.1.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossforums/branches/forums120P27/tools/etc/buildfragments/libraries.ent
===================================================================
--- labs/jbossforums/branches/forums120P27/tools/etc/buildfragments/libraries.ent 2009-05-15 09:35:58 UTC (rev 26546)
+++ labs/jbossforums/branches/forums120P27/tools/etc/buildfragments/libraries.ent 2009-05-15 09:39:03 UTC (rev 26547)
@@ -219,7 +219,7 @@
<property name="jakarta.commons.root" value="${project.thirdparty}/jakarta-commons"/>
<property name="jakarta.commons.lib" value="${jakarta.commons.root}/lib"/>
<path id="jakarta.commons.classpath">
- <filelist dir="${commons.lib}" files="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar,commons-el.jar"/>
+ <filelist dir="${jakarta.commons.lib}" files="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar,commons-el.jar,commons-lang-2.1.jar"/>
</path>
<!-- Sun portlet -->
More information about the jboss-svn-commits
mailing list