merge

README.md

-# [Solo](https://github.com/b3log/solo) [![Build Status](https://img.shields.io/travis/b3log/solo.svg?style=flat)](https://travis-ci.org/b3log/solo) [![Coverage Status](https://img.shields.io/coveralls/b3log/b3log-solo.svg?style=flat)](https://coveralls.io/r/b3log/b3log-solo)  [![Apache License](http://img.shields.io/badge/license-apache2-orange.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](http://img.shields.io/badge/download-~5K-blue.svg?style=flat)](http://pan.baidu.com/share/link?shareid=541735&uk=3255126224)
+# [Solo](https://github.com/b3log/solo) [![Build Status](https://img.shields.io/travis/b3log/solo.svg?style=flat)](https://travis-ci.org/b3log/solo) [![Coverage Status](https://img.shields.io/coveralls/b3log/solo.svg?style=flat)](https://coveralls.io/github/b3log/solo?branch=master)  [![Apache License](http://img.shields.io/badge/license-apache2-orange.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](http://img.shields.io/badge/download-~5K-blue.svg?style=flat)](http://pan.baidu.com/share/link?shareid=541735&uk=3255126224)
 
 <img src="https://cloud.githubusercontent.com/assets/873584/6817919/72ffdb5c-d2e2-11e4-8be8-37ac1b08ff81.jpg"  width="96%" />
 

src/main/java/org/b3log/solo/plugin/list/ListHandler.java

@@ -64,7 +64,7 @@ public class ListHandler extends AbstractEventListener<JSONObject> {
 
         final StringBuilder listBuilder = new StringBuilder();
 
-        listBuilder.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + Latkes.getStaticPath() + "/plugins/list/style.css\" />");
+        listBuilder.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + Latkes.getStaticServePath() + "/plugins/list/style.css\" />");
 
         final Elements hs = doc.select("h1, h2, h3, h4, h5");
 

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

@@ -15,23 +15,20 @@
  */
 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 {
@@ -45,30 +42,27 @@ 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

src/test/java/org/b3log/solo/util/MarkdownsTestCase.java

@@ -29,7 +29,7 @@ import org.testng.Assert;
  * {@link org.b3log.solo.util.Markdowns} test case.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.2, May 16, 2013
+ * @version 1.0.1.2, May 18, 2016
  * @since 0.4.5
  */
 public final class MarkdownsTestCase {
@@ -44,7 +44,7 @@ public final class MarkdownsTestCase {
         String markdownText = "";
         String html = Markdowns.toHTML(markdownText);
 
-        Assert.assertNull(html);
+        Assert.assertEquals(html, "");
 
         markdownText = "# Solo Markdown Editor";
         html = Markdowns.toHTML(markdownText);