Fixed #269

core/src/main/java/org/b3log/solo/SoloServletListener.java

@@ -30,7 +30,6 @@ import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.plugin.PluginManager;
 import org.b3log.latke.plugin.ViewLoadEventHandler;
-import org.b3log.latke.repository.RepositoryException;
 import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.servlet.AbstractServletListener;
 import org.b3log.latke.util.Requests;
@@ -50,7 +49,6 @@ import org.b3log.solo.model.Preference;
 import org.b3log.solo.model.Skin;
 import org.b3log.solo.repository.PreferenceRepository;
 import org.b3log.solo.repository.impl.PreferenceRepositoryImpl;
-import org.b3log.solo.repository.impl.UserRepositoryImpl;
 import org.b3log.solo.service.PreferenceMgmtService;
 import org.b3log.solo.service.StatisticMgmtService;
 import org.b3log.solo.util.Skins;
@@ -61,7 +59,7 @@ import org.json.JSONObject;
  * B3log Solo servlet listener.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.9.9, Apr 26, 2013
+ * @version 1.1.0.0, Jun 28, 2013
  * @since 0.3.1
  */
 public final class SoloServletListener extends AbstractServletListener {
@@ -96,6 +94,11 @@ public final class SoloServletListener extends AbstractServletListener {
      */
     public static final String B3LOG_SYMPHONY_SERVE_PATH;
 
+    /**
+     * Bean manager.
+     */
+    private LatkeBeanManager beanManager;
+
     static {
         final ResourceBundle b3log = ResourceBundle.getBundle("b3log");
 
@@ -107,12 +110,14 @@ public final class SoloServletListener extends AbstractServletListener {
     public void contextInitialized(final ServletContextEvent servletContextEvent) {
         super.contextInitialized(servletContextEvent);
 
+        beanManager = Lifecycle.getBeanManager();
+
         Stopwatchs.start("Context Initialized");
 
         // Default to skin "ease", loads from preference later
         Skins.setDirectoryForTemplateLoading("ease");
 
-        final PreferenceRepository preferenceRepository = new PreferenceRepositoryImpl();
+        final PreferenceRepository preferenceRepository = beanManager.getReference(PreferenceRepositoryImpl.class);
 
         final Transaction transaction = preferenceRepository.beginTransaction();
 
@@ -137,7 +142,7 @@ public final class SoloServletListener extends AbstractServletListener {
         LOGGER.info("Initialized the context");
 
         Stopwatchs.end();
-        LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()});
+        LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat());
     }
 
     @Override
@@ -168,10 +173,9 @@ public final class SoloServletListener extends AbstractServletListener {
             // Gets the session of this request
             final HttpSession session = httpServletRequest.getSession();
 
-            LOGGER.log(Level.DEBUG, "Gets a session[id={0}, remoteAddr={1}, User-Agent={2}, isNew={3}]", new Object[] {
-                session.getId(), httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew()});
+            LOGGER.log(Level.DEBUG, "Gets a session[id={0}, remoteAddr={1}, User-Agent={2}, isNew={3}]", session.getId(),
+                httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew());
             // Online visitor count
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
             final StatisticMgmtService statisticMgmtService = beanManager.getReference(StatisticMgmtService.class);
 
             statisticMgmtService.onlineVisitorCount(httpServletRequest);
@@ -184,7 +188,7 @@ public final class SoloServletListener extends AbstractServletListener {
     public void requestDestroyed(final ServletRequestEvent servletRequestEvent) {
         Stopwatchs.end();
 
-        LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()});
+        LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat());
         Stopwatchs.release();
 
         super.requestDestroyed(servletRequestEvent);
@@ -210,7 +214,7 @@ public final class SoloServletListener extends AbstractServletListener {
 
         LOGGER.info("Loading preference....");
 
-        final PreferenceRepository preferenceRepository = new PreferenceRepositoryImpl();
+        final PreferenceRepository preferenceRepository = beanManager.getReference(PreferenceRepositoryImpl.class);
         JSONObject preference;
 
         try {
@@ -220,7 +224,9 @@ public final class SoloServletListener extends AbstractServletListener {
                 return;
             }
 
-            new PreferenceMgmtService().loadSkins(preference);
+            final PreferenceMgmtService preferenceMgmtService = beanManager.getReference(PreferenceMgmtService.class);
+
+            preferenceMgmtService.loadSkins(preference);
 
             final boolean pageCacheEnabled = preference.getBoolean(Preference.PAGE_CACHE_ENABLED);
 
@@ -234,23 +240,6 @@ public final class SoloServletListener extends AbstractServletListener {
         Stopwatchs.end();
     }
 
-    /**
-     * Determines Solo had been initialized.
-     *
-     * @return {@code true} if it had been initialized, {@code false} otherwise
-     */
-    // XXX: to find a better way (isInited)?
-    public static boolean isInited() {
-        try {
-            final JSONObject admin = new UserRepositoryImpl().getAdmin();
-
-            return null != admin;
-        } catch (final RepositoryException e) {
-            LOGGER.log(Level.WARN, "B3log Solo has not been initialized");
-            return false;
-        }
-    }
-
     /**
      * Register event processors.
      */
@@ -293,7 +282,7 @@ public final class SoloServletListener extends AbstractServletListener {
      */
     private void resolveSkinDir(final HttpServletRequest httpServletRequest) {
         try {
-            final PreferenceRepository preferenceRepository = new PreferenceRepositoryImpl();
+            final PreferenceRepository preferenceRepository = beanManager.getReference(PreferenceRepositoryImpl.class);
             final JSONObject preference = preferenceRepository.get(Preference.PREFERENCE);
 
             if (null == preference) { // Did not initialize yet

core/src/main/java/org/b3log/solo/filter/InitCheckFilter.java

@@ -35,7 +35,7 @@ import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.servlet.HTTPRequestContext;
 import org.b3log.latke.servlet.HTTPRequestDispatcher;
 import org.b3log.latke.servlet.HTTPRequestMethod;
-import org.b3log.solo.SoloServletListener;
+import org.b3log.solo.service.InitService;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.json.JSONObject;
 
@@ -44,7 +44,7 @@ import org.json.JSONObject;
  * Checks initialization filter.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.9, May 17, 2012
+ * @version 1.0.1.0, Jun 28, 2013
  * @since 0.3.1
  */
 public final class InitCheckFilter implements Filter {
@@ -81,8 +81,11 @@ public final class InitCheckFilter implements Filter {
             return;
         }
 
+        final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
+        final InitService initService = beanManager.getReference(InitService.class);
+        
         try {
-            if (SoloServletListener.isInited()) {
+            if (initService.isInited()) {
                 chain.doFilter(request, response);
 
                 return;
@@ -95,7 +98,6 @@ public final class InitCheckFilter implements Filter {
                 return;
             }
 
-            final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
             final PreferenceQueryService preferenceQueryService = beanManager.getReference(PreferenceQueryService.class);
 
             LOGGER.debug("Try to get preference to confirm whether the preference exixts");

core/src/main/java/org/b3log/solo/processor/ArticleProcessor.java

@@ -353,7 +353,7 @@ public final class ArticleProcessor {
         String content;
 
         try {
-            content = articleQueryService.getArticleContent(articleId);
+            content = articleQueryService.getArticleContent(request, articleId);
         } catch (final ServiceException e) {
             LOGGER.log(Level.ERROR, "Can not get article content", e);
             return;

core/src/main/java/org/b3log/solo/processor/InitProcessor.java

@@ -52,7 +52,7 @@ import org.json.JSONObject;
  * B3log Solo initialization service.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.5, Sep 6, 2012
+ * @version 1.0.0.6, Jun 28, 2013
  * @since 0.4.0
  */
 @RequestProcessor
@@ -92,7 +92,7 @@ public final class InitProcessor {
     @RequestProcessing(value = "/init", method = HTTPRequestMethod.GET)
     public void showInit(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response)
         throws Exception {
-        if (SoloServletListener.isInited()) {
+        if (initService.isInited()) {
             response.sendRedirect("/");
 
             return;
@@ -136,7 +136,7 @@ public final class InitProcessor {
     @RequestProcessing(value = "/init", method = HTTPRequestMethod.POST)
     public void initB3logSolo(final HTTPRequestContext context, final HttpServletRequest request,
         final HttpServletResponse response) throws Exception {
-        if (SoloServletListener.isInited()) {
+        if (initService.isInited()) {
             response.sendRedirect("/");
 
             return;

core/src/main/java/org/b3log/solo/service/ArticleQueryService.java

@@ -33,6 +33,7 @@ import org.b3log.latke.logging.Logger;
 import org.b3log.latke.model.Pagination;
 import org.b3log.latke.model.User;
 import org.b3log.latke.repository.*;
+import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
 import org.b3log.latke.user.UserService;
@@ -128,6 +129,12 @@ public final class ArticleQueryService {
     @Inject
     private StatisticQueryService statisticQueryService;
 
+    /**
+     * Language service.
+     */
+    @Inject
+    private LangPropsService langPropsService;
+
     /**
      * Can the current user access an article specified by the given article id?
      *
@@ -178,6 +185,10 @@ public final class ArticleQueryService {
             return false;
         }
 
+        if (null == request) {
+            return true;
+        }
+
         final HttpSession session = request.getSession(false);
 
         if (null != session) {
@@ -920,11 +931,12 @@ public final class ArticleQueryService {
      * Invoking this method dose not effect on article view count.
      * </p>
      * 
+     * @param request the specified HTTP servlet request
      * @param articleId the specified article id
      * @return article contents, returns {@code null} if not found
      * @throws ServiceException service exception 
      */
-    public String getArticleContent(final String articleId) throws ServiceException {
+    public String getArticleContent(final HttpServletRequest request, final String articleId) throws ServiceException {
         if (Strings.isEmptyOrNull(articleId)) {
             return null;
         }
@@ -936,8 +948,12 @@ public final class ArticleQueryService {
                 return null;
             }
 
+            if (needViewPwd(request, article)) {
+                final String content = langPropsService.get("articleContentPwd");
+
+                article.put(ARTICLE_CONTENT, content);
+            } else if ("CodeMirror-Markdown".equals(article.optString(ARTICLE_EDITOR_TYPE))) {
                 // Markdown to HTML for content and abstract
-            if ("CodeMirror-Markdown".equals(article.optString(ARTICLE_EDITOR_TYPE))) {
                 Stopwatchs.start("Get Article Content [Markdown]");
                 final String content = article.optString(ARTICLE_CONTENT);
 

core/src/main/java/org/b3log/solo/service/InitService.java

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * B3log Solo initialization service.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.1.6, May 17, 2013
+ * @version 1.0.1.7, Jun 28, 2013
  * @since 0.4.0
  */
 @Service
@@ -141,6 +141,23 @@ public final class InitService {
     @Inject
     private LangPropsService langPropsService;
 
+    /**
+     * Determines Solo had been initialized.
+     *
+     * @return {@code true} if it had been initialized, {@code false} otherwise
+     */
+    // XXX: to find a better way (isInited)?
+    public boolean isInited() {
+        try {
+            final JSONObject admin = userRepository.getAdmin();
+
+            return null != admin;
+        } catch (final RepositoryException e) {
+            LOGGER.log(Level.WARN, "B3log Solo has not been initialized");
+            return false;
+        }
+    }
+
     /**
      * Initializes B3log Solo.
      * 
@@ -172,7 +189,7 @@ public final class InitService {
      * @throws ServiceException service exception
      */
     public void init(final JSONObject requestJSONObject) throws ServiceException {
-        if (SoloServletListener.isInited()) {
+        if (isInited()) {
             return;
         }
 

core/src/main/java/org/b3log/solo/service/StatisticMgmtService.java

@@ -344,7 +344,7 @@ public final class StatisticMgmtService {
      * 
      * @param request the specified request
      */
-    public static void onlineVisitorCount(final HttpServletRequest request) {
+    public void onlineVisitorCount(final HttpServletRequest request) {
         final String remoteAddr = Requests.getRemoteAddr(request);
 
         LOGGER.log(Level.DEBUG, "Current request [IP={0}]", remoteAddr);

core/src/test/java/org/b3log/solo/service/ArticleQueryServiceTestCase.java

@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
  * {@link ArticleQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Sep 11, 2012
+ * @version 1.0.0.2, Jun 28, 2013
  */
 @Test(suiteName = "service")
 public class ArticleQueryServiceTestCase extends AbstractTestCase {
@@ -120,7 +120,7 @@ public class ArticleQueryServiceTestCase extends AbstractTestCase {
 
         final String articleId = articles.get(0).getString(Keys.OBJECT_ID);
 
-        Assert.assertNotNull(articleQueryService.getArticleContent(articleId));
+        Assert.assertNotNull(articleQueryService.getArticleContent(null, articleId));
     }
 
     /**

war/src/main/resources/lang_en_US.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo language configurations(en_US).
-# Version: 2.1.0.9, May 17, 2013
+# Version: 2.1.1.0, Jun 28, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -378,3 +378,4 @@ helloWorld.content=<p>Welcome to \
 <span style="color: orangered; font-weight: bold;">Solo</span></a>\
 . This is your first post. Edit or delete it, then start blogging!</p>
 helloWorld.comment.content=Hi, this is a comment. _esc_enter_88250_To delete a comment, just log in and view the post's comments. There you will have the option to delete them.
+articleContentPwd=This article need password to view.
\ No newline at end of file

war/src/main/resources/lang_zh_CN.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo default language configurations(zh_CN).
-# Version: 2.1.1.6, May 17, 2013
+# Version: 2.1.1.7, Jun 28, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -378,3 +378,4 @@ helloWorld.content=<p>\u6b22\u8fce\u4f7f\u7528 \
 <span style="color: orangered; font-weight: bold;">Solo</span></a>\
 \u3002\u8fd9\u662f\u7cfb\u7edf\u81ea\u52a8\u751f\u6210\u7684\u6f14\u793a\u6587\u7ae0\u3002\u7f16\u8f91\u6216\u8005\u5220\u9664\u5b83\uff0c\u7136\u540e\u5f00\u59cb\u60a8\u7684\u535a\u5ba2\uff01</p>
 helloWorld.comment.content=\u60a8\u597d\uff0c\u8fd9\u662f\u4e00\u6761\u8bc4\u8bba\u3002_esc_enter_88250_\u8981\u5220\u9664\u8bc4\u8bba\uff0c\u8bf7\u5148\u767b\u5f55\uff0c\u7136\u540e\u518d\u67e5\u770b\u8fd9\u7bc7\u6587\u7ae0\u7684\u8bc4\u8bba\u3002\u5728\u90a3\u91cc\uff0c\u60a8\u53ef\u4ee5\u770b\u5230\u7f16\u8f91\u6216\u8005\u5220\u9664\u8bc4\u8bba\u7684\u9009\u9879\u3002
+articleContentPwd=\u8be5\u6587\u7ae0\u5df2\u7ecf\u52a0\u5bc6\u3002
\ No newline at end of file