[jboss-cvs] JBossBlog SVN: r295 - in trunk: src/action/org/jboss/blog/session/configuration and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-04-29 05:48:29 -0400 (Tue, 29 Apr 2008)
New Revision: 295

Modified:
   trunk/blog.iml
   trunk/src/action/org/jboss/blog/session/configuration/ConfigurationManager.java
   trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java
   trunk/src/tools/org/jboss/blog/tools/StringTools.java
Log:


Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml	2008-04-28 12:59:58 UTC (rev 294)
+++ trunk/blog.iml	2008-04-29 09:48:29 UTC (rev 295)
@@ -540,6 +540,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/log4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: trunk/src/action/org/jboss/blog/session/configuration/ConfigurationManager.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/configuration/ConfigurationManager.java	2008-04-28 12:59:58 UTC (rev 294)
+++ trunk/src/action/org/jboss/blog/session/configuration/ConfigurationManager.java	2008-04-29 09:48:29 UTC (rev 295)
@@ -34,8 +34,8 @@
 
     private Configuration initNewConfiguration() {
         Configuration conf = new Configuration();
-        conf.setConnectionTimeout(5000);
-        conf.setReadTimeout(3000);
+        conf.setConnectionTimeout(10000);
+        conf.setReadTimeout(6000);
         conf.setUpdateInterval(900);
 
         return conf;

Modified: trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java	2008-04-28 12:59:58 UTC (rev 294)
+++ trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java	2008-04-29 09:48:29 UTC (rev 295)
@@ -102,7 +102,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 2);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 2, false);
 
         // Check
         verify(mockFeedsService);
@@ -123,7 +123,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 10);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 10, false);
 
         // Check
         verify(mockFeedsService);
@@ -147,7 +147,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed2, 0, 2);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed2, 0, 2, false);
 
         // Check
         verify(mockFeedsService);

Modified: trunk/src/tools/org/jboss/blog/tools/StringTools.java
===================================================================
--- trunk/src/tools/org/jboss/blog/tools/StringTools.java	2008-04-28 12:59:58 UTC (rev 294)
+++ trunk/src/tools/org/jboss/blog/tools/StringTools.java	2008-04-29 09:48:29 UTC (rev 295)
@@ -2,13 +2,22 @@
 
 import au.id.jericho.lib.html.Source;
 import org.htmlcleaner.HtmlCleaner;
+import org.xml.sax.SAXException;
+import org.xml.sax.InputSource;
+import org.apache.log4j.Logger;
 
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
+import java.io.StringReader;
 
 /**
  * @author Adam Warski (adam at warski dot org)
  */
 public class StringTools {
+    private final static Logger log = Logger.getLogger(StringTools.class);
+
     public static boolean isEmpty(String s) {
         return s == null || "".equals(s);
     }
@@ -65,15 +74,52 @@
         return source.getTextExtractor().toString();
     }
 
+    public static boolean isValidXml(String html) {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setValidating(false);
+        factory.setNamespaceAware(true);
+
+        DocumentBuilder builder;
+        try {
+            builder = factory.newDocumentBuilder();
+        } catch (ParserConfigurationException e) {
+            log.error(e);
+            return false;
+        }
+
+        try {
+            builder.parse(new InputSource(new StringReader(html)));
+            return true;
+        } catch (SAXException e) {
+            return false;
+        } catch (IOException e) {
+            log.error(e);
+            return false;
+        }
+    }
+
+    public static void main(String[] args) {
+        System.out.println(isValidXml("<div></div>"));
+    }
+
     public static String fixHtml(String html) {
         if (isEmpty(html)) {
             return html;
         }
 
-        HtmlCleaner cleaner = new HtmlCleaner("<div>" + html + "</div>");
+        String htmlToCheck = "<div>" + html  + "</div>";
+
+        if (isValidXml(htmlToCheck)) {
+            return html;
+        }
+
+        HtmlCleaner cleaner = new HtmlCleaner(htmlToCheck);
         try {
             cleaner.setOmitHtmlEnvelope(true);
             cleaner.setOmitXmlDeclaration(true);
+            cleaner.setRecognizeUnicodeChars(false);
+            cleaner.setTranslateSpecialEntities(false);
+            cleaner.setAdvancedXmlEscape(true);
             cleaner.clean();
 
             String ret = cleaner.getXmlAsString().trim();