[配合改造] Latke 加入动态代理

core/pom.xml

@@ -89,10 +89,6 @@
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

core/src/main/java/org/b3log/solo/api/metaweblog/MetaWeblogAPI.java

@@ -77,7 +77,7 @@ import org.jsoup.Jsoup;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class MetaWeblogAPI {
+public class MetaWeblogAPI {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/api/symphony/ArticleReceiver.java

@@ -50,7 +50,7 @@ import org.jsoup.Jsoup;
  * @since 0.5.5
  */
 @RequestProcessor
-public final class ArticleReceiver {
+public class ArticleReceiver {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/api/symphony/CommentReceiver.java

@@ -70,7 +70,7 @@ import org.json.JSONObject;
  * @since 0.5.5
  */
 @RequestProcessor
-public final class CommentReceiver {
+public class CommentReceiver {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/dev/ArticleGenerator.java

@@ -46,7 +46,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class ArticleGenerator {
+public class ArticleGenerator {
 
     /**
      * Logger.

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

@@ -36,6 +36,7 @@ import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.repository.RepositoryException;
 import org.b3log.latke.service.LangPropsService;
+import org.b3log.latke.service.LangPropsServiceImpl;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.util.StaticResources;
 import org.b3log.latke.util.Strings;
@@ -137,7 +138,7 @@ public final class PageCacheFilter implements Filter {
         final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
 
         final ArticleQueryService articleQueryService = beanManager.getReference(ArticleQueryService.class);
-        final LangPropsService langPropsService = beanManager.getReference(LangPropsService.class);
+        final LangPropsService langPropsService = beanManager.getReference(LangPropsServiceImpl.class);
 
         try {
             // If cached an article that has view password, dispatches the password form

core/src/main/java/org/b3log/solo/plugin/broadcast/ChanceProcessor.java

@@ -56,7 +56,7 @@ import org.json.JSONObject;
  * @since 0.6.0
  */
 @RequestProcessor
-public final class ChanceProcessor {
+public class ChanceProcessor {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/plugin/cache/AdminCacheService.java

@@ -52,7 +52,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class AdminCacheService {
+public class AdminCacheService {
 
     /**
      * Logger.

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

@@ -71,7 +71,7 @@ import org.jsoup.Jsoup;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class ArticleProcessor {
+public class ArticleProcessor {
 
     /**
      * Logger.

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

@@ -40,7 +40,7 @@ import org.json.JSONObject;
  * @since 0.4.6
  */
 @RequestProcessor
-public final class BlogProcessor {
+public class BlogProcessor {
 
     /**
      * Article query service.

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

@@ -44,7 +44,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class CacheProcessor {
+public class CacheProcessor {
 
     /**
      * Logger.

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

@@ -58,7 +58,7 @@ import org.b3log.solo.SoloServletListener;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class CaptchaProcessor {
+public class CaptchaProcessor {
 
     /**
      * Logger.

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

@@ -49,7 +49,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class CommentProcessor {
+public class CommentProcessor {
 
     /**
      * Logger.

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

@@ -48,7 +48,7 @@ import org.json.JSONObject;
  * @since 0.4.5
  */
 @RequestProcessor
-public final class ErrorProcessor {
+public class ErrorProcessor {
 
     /**
      * Logger.

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

@@ -72,7 +72,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class FeedProcessor {
+public class FeedProcessor {
 
     /**
      * Logger.

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

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class IndexProcessor {
+public class IndexProcessor {
 
     /**
      * Logger.

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

@@ -56,7 +56,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class InitProcessor {
+public class InitProcessor {
 
     /**
      * Logger.

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

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class LoginProcessor {
+public class LoginProcessor {
 
     /**
      * Logger.

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

@@ -55,7 +55,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class PageProcessor {
+public class PageProcessor {
 
     /**
      * Logger.

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

@@ -73,7 +73,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class RepairProcessor {
+public class RepairProcessor {
 
     /**
      * Logger.

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

@@ -58,7 +58,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class SitemapProcessor {
+public class SitemapProcessor {
 
     /**
      * Logger.

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

@@ -44,7 +44,7 @@ import org.b3log.solo.service.StatisticMgmtService;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class StatProcessor {
+public class StatProcessor {
 
     /**
      * Logger.

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

@@ -67,7 +67,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @RequestProcessor
-public final class TagProcessor {
+public class TagProcessor {
 
     /**
      * Logger.

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

@@ -64,7 +64,7 @@ import org.json.JSONObject;
 @RequestProcessor
 // TODO:
 // 1. Removes preference.blogHost from repository
-public final class UpgradeProcessor {
+public class UpgradeProcessor {
 
     /**
      * Logger.

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

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * @since 0.4.5
  */
 @RequestProcessor
-public final class UserTemplateProcessor {
+public class UserTemplateProcessor {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * @since 0.4.1
  */
 @RequestProcessor
-public final class AdminConsole {
+public class AdminConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/ArticleConsole.java

@@ -52,7 +52,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class ArticleConsole {
+public class ArticleConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/CommentConsole.java

@@ -47,7 +47,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class CommentConsole {
+public class CommentConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/LinkConsole.java

@@ -46,7 +46,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class LinkConsole {
+public class LinkConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/PageConsole.java

@@ -49,7 +49,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class PageConsole {
+public class PageConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/PluginConsole.java

@@ -51,7 +51,7 @@ import org.json.JSONObject;
  */
 @RequestProcessor
 @Before(adviceClass = ProcessAuthAdvice.class)
-public final class PluginConsole {
+public class PluginConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java

@@ -48,7 +48,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class PreferenceConsole {
+public class PreferenceConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/TagConsole.java

@@ -47,7 +47,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class TagConsole {
+public class TagConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/console/UserConsole.java

@@ -48,7 +48,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @RequestProcessor
-public final class UserConsole {
+public class UserConsole {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/util/Filler.java

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * @since 0.3.1
  */
 @Service
-public final class Filler {
+public class Filler {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/processor/util/TopBars.java

@@ -55,7 +55,7 @@ import org.json.JSONObject;
  * @since 0.3.5
  */
 @Service
-public final class TopBars {
+public class TopBars {
 
     /**
      * Logger.

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

@@ -36,7 +36,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class ArchiveDateQueryService {
+public class ArchiveDateQueryService {
 
     /**
      * Logger.

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

@@ -63,7 +63,7 @@ import org.json.JSONObject;
  * @since 0.3.5
  */
 @Service
-public final class ArticleMgmtService {
+public class ArticleMgmtService {
 
     /**
      * Logger.

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

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * @since 0.3.5
  */
 @Service
-public final class ArticleQueryService {
+public class ArticleQueryService {
 
     /**
      * Logger.

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

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * @since 0.3.5
  */
 @Service
-public final class CommentMgmtService {
+public class CommentMgmtService {
 
     /**
      * Logger.

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

@@ -51,7 +51,7 @@ import org.json.JSONObject;
  * @since 0.3.5
  */
 @Service
-public final class CommentQueryService {
+public class CommentQueryService {
 
     /**
      * Logger.

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

@@ -64,7 +64,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class InitService {
+public class InitService {
 
     /**
      * Logger.

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

@@ -36,7 +36,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class LinkMgmtService {
+public class LinkMgmtService {
 
     /**
      * Logger.

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

@@ -41,7 +41,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class LinkQueryService {
+public class LinkQueryService {
 
     /**
      * Logger.

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

@@ -35,7 +35,7 @@ import org.json.JSONObject;
  * @since 0.6.0
  */
 @Service
-public final class OptionMgmtService {
+public class OptionMgmtService {
 
     /**
      * Option repository.

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

@@ -38,7 +38,7 @@ import org.json.JSONObject;
  * @since 0.6.0
  */
 @Service
-public final class OptionQueryService {
+public class OptionQueryService {
 
     /**
      * Option repository.

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

@@ -46,7 +46,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class PageMgmtService {
+public class PageMgmtService {
 
     /**
      * Logger.

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

@@ -41,7 +41,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class PageQueryService {
+public class PageQueryService {
 
     /**
      * Logger.

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

@@ -36,7 +36,7 @@ import org.b3log.solo.repository.PageRepository;
  * @since 0.6.1
  */
 @Service
-public final class PermalinkQueryService {
+public class PermalinkQueryService {
 
     /**
      * Logger.

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

@@ -47,7 +47,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class PluginMgmtService {
+public class PluginMgmtService {
 
     /**
      * Logger.

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

@@ -42,7 +42,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class PluginQueryService {
+public class PluginQueryService {
 
     /**
      * Logger.

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

@@ -62,7 +62,7 @@ import static org.b3log.solo.util.Skins.setDirectoryForTemplateLoading;
  * @since 0.4.0
  */
 @Service
-public final class PreferenceMgmtService {
+public class PreferenceMgmtService {
 
     /**
      * Logger.

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

@@ -35,7 +35,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class PreferenceQueryService {
+public class PreferenceQueryService {
 
     /**
      * Logger.

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

@@ -58,7 +58,7 @@ import org.json.JSONException;
  * @since 0.5.0
  */
 @Service
-public final class StatisticMgmtService {
+public class StatisticMgmtService {
 
     /**
      * Logger.

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

@@ -36,7 +36,7 @@ import org.json.JSONObject;
  * @since 0.5.0
  */
 @Service
-public final class StatisticQueryService {
+public class StatisticQueryService {
 
     /**
      * Logger.

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

@@ -39,7 +39,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class TagMgmtService {
+public class TagMgmtService {
 
     /**
      * Logger.

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

@@ -40,7 +40,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class TagQueryService {
+public class TagQueryService {
 
     /**
      * Logger.

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

@@ -50,7 +50,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class UserMgmtService {
+public class UserMgmtService {
 
     /**
      * Logger.

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

@@ -48,7 +48,7 @@ import org.json.JSONObject;
  * @since 0.4.0
  */
 @Service
-public final class UserQueryService {
+public class UserQueryService {
 
     /**
      * Logger.

core/src/main/java/org/b3log/solo/util/Skins.java

@@ -32,6 +32,7 @@ import org.b3log.latke.ioc.Lifecycle;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
 import org.b3log.latke.service.LangPropsService;
+import org.b3log.latke.service.LangPropsServiceImpl;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Stopwatchs;
@@ -113,7 +114,7 @@ public final class Skins {
             
             // Fills the core language configurations
             final LatkeBeanManager beanManager = Lifecycle.getBeanManager();
-            final LangPropsService langPropsService = beanManager.getReference(LangPropsService.class);
+            final LangPropsService langPropsService = beanManager.getReference(LangPropsServiceImpl.class);
 
             dataModel.putAll(langPropsService.getAll(Latkes.getLocale()));
         } catch (final IOException e) {

core/src/test/java/org/b3log/solo/AbstractTestCase.java

@@ -20,6 +20,7 @@ import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
 import java.util.Locale;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.service.LangPropsService;
+import org.b3log.latke.service.LangPropsServiceImpl;
 import org.b3log.solo.repository.ArchiveDateArticleRepository;
 import org.b3log.solo.repository.ArchiveDateRepository;
 import org.b3log.solo.repository.ArticleRepository;
@@ -54,7 +55,7 @@ import org.testng.annotations.BeforeClass;
  * Abstract test case.
  * 
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.6, Apr 19, 2013
+ * @version 1.0.0.7, Jul 8, 2013
  * @see #beforeClass() 
  * @see #afterClass() 
  */
@@ -280,7 +281,7 @@ public abstract class AbstractTestCase {
         optionRepository = new OptionRepositoryImpl();
 
         // Services
-        langPropsService = new LangPropsService();
+        langPropsService = new LangPropsServiceImpl();
         
         pluginMgmtService = new PluginMgmtService();
         pluginMgmtService.setPluginRepository(pluginRepository);

core/src/test/resources/log4j.properties

+#
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Description: B3log Solo logging configurations for tesing.
+# Version: 1.0.0.0, Jul 8, 2013
+# Author: Liang Ding
+#
+
+log4j.rootLogger=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n
+
+log4j.logger.org.b3log.solo=DEBUG
+
+log4j.logger.org.b3log.latke=DEBUG
+