Merge branch '0.6.0' of https://github.com/b3log/b3log-solo into 0.6.0

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

@@ -50,7 +50,7 @@ import static org.b3log.solo.model.Preference.*;
  * Preference management service.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.5, May 16, 2012
+ * @version 1.0.0.6, Apr 1, 2013
  * @since 0.4.0
  */
 public final class PreferenceMgmtService {
@@ -180,7 +180,7 @@ public final class PreferenceMgmtService {
                 }
             }
 
-            final String maxPageCntStr = Latkes.getLocalProperty("cache.maxPageCnt");
+            final String maxPageCntStr = Latkes.getMaxPageCacheCnt();
 
             if (Integer.valueOf(maxPageCntStr) <= 0) {
                 preference.put(PAGE_CACHE_ENABLED, false);

core/src/test/resources/latke.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Latke configurations for test (GAE runtime).
-# Version: 1.0.0.1, May 2, 2012
+# Version: 1.0.0.2, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -51,5 +51,9 @@ cache=GAE
 # userService=GAE
 userService=LOCAL
 
+#### Cache ####
+cache.maxPageCnt=128
+cache.maxDataCnt=128
+
 #### Static resource version ####
 staticResourceVersion=201206280945
\ No newline at end of file

war/bae/src/main/resources/latke.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Latke configurations. Configures the section "Server" carefully.
-# Version: 1.0.0.7, Sep 7, 2012
+# Version: 1.0.0.8, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -48,5 +48,9 @@ cache=BAE
 #### User Service Implementation ####
 userService=LOCAL
 
+#### Cache ####
+cache.maxPageCnt=128
+cache.maxDataCnt=128
+
 #### Static resource version ####
 staticResourceVersion=201211021410
\ No newline at end of file

war/bae/src/main/resources/local.properties

@@ -18,7 +18,7 @@
 # Description: B3log Solo local environment configurations. Configures this file 
 #              if B3log Solo runs on a standard Servlet container or Baidu App Engine, 
 #              it is unnecessary to care this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.2.2, Jan 23, 2013
+# Version: 1.0.2.3, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -44,7 +44,3 @@ jdbc.transactionIsolation=READ_COMMITTED
 
 # The specific table name prefix
 jdbc.tablePrefix=b3_solo
-
-#### Cache ####
-cache.maxPageCnt=128
-cache.maxDataCnt=128
\ No newline at end of file

war/gae/src/main/resources/latke.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Latke configurations. Configures the section "Server" carefully.
-# Version: 1.0.0.6, Aug 14, 2012
+# Version: 1.0.0.7, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -47,5 +47,9 @@ cache=GAE
 #### User Service Implementation ####
 userService=LOCAL
 
+#### Cache ####
+cache.maxPageCnt=1024000
+cache.maxDataCnt=1024000
+
 #### Static resource version ####
 staticResourceVersion=201211021410
\ No newline at end of file

war/h2/src/main/resources/latke.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Latke configurations. Configures the section "Server" carefully.
-# Version: 1.0.0.6, Aug 14, 2012
+# Version: 1.0.0.7, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -47,5 +47,9 @@ cache=LOCAL
 #### User Service Implementation ####
 userService=LOCAL
 
+#### Cache ####
+cache.maxPageCnt=128
+cache.maxDataCnt=128
+
 #### Static resource version ####
 staticResourceVersion=201211021410
\ No newline at end of file

war/h2/src/main/resources/local.properties

@@ -18,7 +18,7 @@
 # Description: B3log Solo local environment configurations. Configures this file 
 #              if B3log Solo runs on a standard Servlet container or Baidu App Engine, 
 #              it is unnecessary to care this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.2.3, Jan 23, 2013
+# Version: 1.0.2.4, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -44,6 +44,3 @@ jdbc.transactionIsolation=READ_COMMITTED
 # The specific table name prefix
 jdbc.tablePrefix=
 
-#### Cache ####
-cache.maxPageCnt=128
-cache.maxDataCnt=128

war/mysql/src/main/resources/latke.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Latke configurations. Configures the section "Server" carefully.
-# Version: 1.0.0.6, Aug 14, 2012
+# Version: 1.0.0.7, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -47,5 +47,9 @@ cache=LOCAL
 #### User Service Implementation ####
 userService=LOCAL
 
+#### Cache ####
+cache.maxPageCnt=128
+cache.maxDataCnt=128
+
 #### Static resource version ####
 staticResourceVersion=201211021410
\ No newline at end of file

war/mysql/src/main/resources/local.properties

@@ -18,7 +18,7 @@
 # Description: B3log Solo local environment configurations. Configures this file 
 #              if B3log Solo runs on a standard Servlet container or Baidu App Engine, 
 #              it is unnecessary to care this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.2.3, Feb 26, 2013
+# Version: 1.0.2.4, Apr 1, 2013
 # Author: Liang Ding
 #
 
@@ -45,7 +45,3 @@ jdbc.transactionIsolation=READ_COMMITTED
 
 # The specific table name prefix
 jdbc.tablePrefix=
-
-#### Cache ####
-cache.maxPageCnt=128
-cache.maxDataCnt=128