Merge pull request #12113 from b3log/1.4.0-dev

Fix #12107

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.10.1.19, May 10, 2016
+    Version: 3.11.1.19, May 16, 2016
     Author: <a href="http://88250.b3log.org">Liang Ding</a>
     Author: <a href="http://www.annpeter.cn">Ann Peter</a>
 -->
@@ -112,7 +112,7 @@
         <slf4j.version>1.7.5</slf4j.version>
 
         <jsoup.version>1.9.1</jsoup.version>
-        <markdownpapers-core.version>1.4.2</markdownpapers-core.version>
+        <pegdown.version>1.6.0</pegdown.version>
         <qiniu.version>7.0.4.1</qiniu.version>
         <jetty.version>9.2.13.v20150730</jetty.version>
         <commons-cli.version>1.3.1</commons-cli.version>
@@ -182,9 +182,9 @@
         </dependency>
             
         <dependency>
-            <groupId>org.tautua.markdownpapers</groupId>
-            <artifactId>markdownpapers-core</artifactId>
-            <version>${markdownpapers-core.version}</version>
+            <groupId>org.pegdown</groupId>
+            <artifactId>pegdown</artifactId>
+            <version>${pegdown.version}</version>
         </dependency>
         
         <dependency>

src/main/java/org/b3log/solo/util/Markdowns.java

@@ -15,27 +15,24 @@
  */
 package org.b3log.solo.util;
 
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import org.b3log.latke.logging.Level;
+import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.util.Strings;
-import org.tautua.markdownpapers.Markdown;
-import org.tautua.markdownpapers.parser.ParseException;
-
+import org.pegdown.Extensions;
+import org.pegdown.PegDownProcessor;
 
 /**
  * <a href="http://en.wikipedia.org/wiki/Markdown">Markdown</a> utilities.
- * 
- * <p>Uses the <a href="http://markdown.tautua.org/">MarkdownPapers</a> as the converter.</p>
+ *
+ * <p>
+ * Uses the <a href="http://markdown.tautua.org/">MarkdownPapers</a> as the converter.</p>
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.1, Feb 8, 2013
+ * @version 2.0.0.1, May 16, 2016
  * @since 0.4.5
  */
 public final class Markdowns {
-    
+
     /**
      * Logger.
      */
@@ -43,32 +40,29 @@ public final class Markdowns {
 
     /**
      * Converts the specified markdown text to HTML.
-     * 
+     *
      * @param markdownText the specified markdown text
-     * @return converted HTML, returns {@code null} if the specified markdown text is "" or {@code null}, returns "Markdown error" if 
-     * exception
+     * @return converted HTML, returns {@code null} if the specified markdown text is "" or {@code null}, returns
+     * "Markdown error" if exception
      */
     public static String toHTML(final String markdownText) {
         if (Strings.isEmptyOrNull(markdownText)) {
-            return null;
+            return "";
         }
 
-        final StringWriter writer = new StringWriter();
-        final Markdown markdown = new Markdown();
+        final PegDownProcessor pegDownProcessor = new PegDownProcessor(Extensions.ALL, 5000);
+        String ret = pegDownProcessor.markdownToHtml(markdownText);
 
-        try {
-            markdown.transform(new StringReader(markdownText), writer);
-        } catch (final ParseException e) {
-            LOGGER.log(Level.ERROR, "Markdown error", e);
-            
-            return "Markdown error";
+        if (!StringUtils.startsWith(ret, "<p>")) {
+            ret = "<p>" + ret + "</p>";
         }
-        
-        return writer.toString();
+
+        return ret;
     }
 
     /**
      * Private constructor.
      */
-    private Markdowns() {}
+    private Markdowns() {
+    }
 }

src/main/resources/latke.properties

@@ -24,7 +24,7 @@
 # Browser visit protocol
 serverScheme=http
 # Browser visit domain name
-serverHost=192.168.20.8
+serverHost=localhost
 # Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT!
 serverPort=8080
 

src/main/resources/local.properties

@@ -21,20 +21,20 @@
 #
 
 #### H2 runtime ####
-#runtimeDatabase=H2
-#jdbc.username=root
-#jdbc.password=
-#jdbc.driver=org.h2.Driver
-#jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
-#jdbc.pool=h2
-
-#### MySQL runtime ####
-runtimeDatabase=MYSQL
+runtimeDatabase=H2
 jdbc.username=root
 jdbc.password=
-jdbc.driver=com.mysql.jdbc.Driver
-jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
-jdbc.pool=druid
+jdbc.driver=org.h2.Driver
+jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
+jdbc.pool=h2
+
+#### MySQL runtime ####
+#runtimeDatabase=MYSQL
+#jdbc.username=root
+#jdbc.password=
+#jdbc.driver=com.mysql.jdbc.Driver
+#jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
+#jdbc.pool=druid
 
 # The minConnCnt MUST larger or equal to 3
 jdbc.minConnCnt=5