Skip to content

S
solo
Commit 7839d204 authored by Vanessa's avatar Vanessa
Browse files
Options

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

parents eb965c4c 6c2ebb51
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 267 deletions
core/src/main/java/org/b3log/solo/service/PreferenceMgmtService.java
View file @ 7839d204
...@@ -50,7 +50,7 @@ import static org.b3log.solo.model.Preference.*; ...@@ -50,7 +50,7 @@ import static org.b3log.solo.model.Preference.*;
* Preference management service. * Preference management service.
* *
* @author <a href="mailto:DL88250@gmail.com">Liang Ding</a> * @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 * @since 0.4.0
*/ */
public final class PreferenceMgmtService { public final class PreferenceMgmtService {
...@@ -180,7 +180,7 @@ 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) { if (Integer.valueOf(maxPageCntStr) <= 0) {
preference.put(PAGE_CACHE_ENABLED, false); preference.put(PAGE_CACHE_ENABLED, false);
......
core/src/test/resources/latke.properties
View file @ 7839d204
# #
# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team # Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: B3log Latke configurations for test (GAE runtime). # 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 # Author: Liang Ding
# #
#### Server #### #### Server ####
# Configures the followings before deploy # Configures the followings before deploy
serverScheme=http serverScheme=http
serverHost=localhost serverHost=localhost
serverPort=8080 serverPort=8080
staticServerScheme=http staticServerScheme=http
staticServerHost=localhost staticServerHost=localhost
staticServerPort=8080 staticServerPort=8080
# Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/' # Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/'
# and not ends with '/', for example, /blog # and not ends with '/', for example, /blog
contextPath= contextPath=
staticPath= staticPath=
#### Runtime Environment #### #### Runtime Environment ####
#runtimeEnv=LOCAL #runtimeEnv=LOCAL
runtimeEnv=GAE runtimeEnv=GAE
#### Runtime Mode #### #### Runtime Mode ####
runtimeMode=DEVELOPMENT runtimeMode=DEVELOPMENT
#runtimeMode=PRODUCTION #runtimeMode=PRODUCTION
#### Cache Implementation #### #### Cache Implementation ####
# Note: If the runtime environment is LOCAL, the cache will be LOCAL always # Note: If the runtime environment is LOCAL, the cache will be LOCAL always
#cache=LOCAL #cache=LOCAL
cache=GAE cache=GAE
#### User Service Implementation #### #### User Service Implementation ####
# userService=GAE # userService=GAE
userService=LOCAL userService=LOCAL
#### Static resource version #### #### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
#### Static resource version ####
staticResourceVersion=201206280945 staticResourceVersion=201206280945
\ No newline at end of file
war/bae/src/main/resources/latke.properties
View file @ 7839d204
# #
# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team # Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # 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 # Author: Liang Ding
# #
#### Server #### #### Server ####
# Configures the followings before deploy # Configures the followings before deploy
serverScheme=http serverScheme=http
serverHost=localhost serverHost=localhost
serverPort=8080 serverPort=8080
staticServerScheme=http staticServerScheme=http
staticServerHost=localhost staticServerHost=localhost
staticServerPort=8080 staticServerPort=8080
# Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/' # Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/'
# and not ends with '/', for example, /blog # and not ends with '/', for example, /blog
contextPath= contextPath=
staticPath= staticPath=
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=BAE runtimeEnv=BAE
#### Runtime Mode #### #### Runtime Mode ####
runtimeMode=DEVELOPMENT runtimeMode=DEVELOPMENT
#runtimeMode=PRODUCTION #runtimeMode=PRODUCTION
#### Cache Implementation #### #### Cache Implementation ####
# Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always # Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always
#cache=LOCAL #cache=LOCAL
cache=BAE cache=BAE
#### User Service Implementation #### #### User Service Implementation ####
userService=LOCAL userService=LOCAL
#### Static resource version #### #### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
#### Static resource version ####
staticResourceVersion=201211021410 staticResourceVersion=201211021410
\ No newline at end of file
war/bae/src/main/resources/local.properties
View file @ 7839d204
# #
# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team # Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: B3log Solo local environment configurations. Configures this file # Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine, # 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. # 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 # Author: Liang Ding
# #
#### Runtime Database (RuntimeDatabase) #### #### Runtime Database (RuntimeDatabase) ####
runtimeDatabase=MYSQL runtimeDatabase=MYSQL
#### JDBC database Configurations #### #### JDBC database Configurations ####
jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=com.mysql.jdbc.Driver
jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=UTF-8 jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=UTF-8
jdbc.username=root jdbc.username=root
jdbc.password= jdbc.password=
# database connection pool # database connection pool
# Note: If the runtime environment is BAE, the pool will be 'none' always # Note: If the runtime environment is BAE, the pool will be 'none' always
jdbc.pool=none jdbc.pool=none
# The minConnCnt MUST larger or equal to 3 # The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt=3 jdbc.minConnCnt=3
jdbc.maxConnCnt=10 jdbc.maxConnCnt=10
# Be care to change the transaction isolation # Be care to change the transaction isolation
jdbc.transactionIsolation=READ_COMMITTED jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix # The specific table name prefix
jdbc.tablePrefix=b3_solo jdbc.tablePrefix=b3_solo
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
\ No newline at end of file
war/gae/src/main/resources/latke.properties
View file @ 7839d204
# #
# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team # Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # 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 # Author: Liang Ding
# #
#### Server #### #### Server ####
# Configures the followings before deploy # Configures the followings before deploy
serverScheme=http serverScheme=http
serverHost=localhost serverHost=localhost
serverPort=8080 serverPort=8080
staticServerScheme=http staticServerScheme=http
staticServerHost=localhost staticServerHost=localhost
staticServerPort=8080 staticServerPort=8080
# Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/' # Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/'
# and not ends with '/', for example, /blog # and not ends with '/', for example, /blog
contextPath= contextPath=
staticPath= staticPath=
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=GAE runtimeEnv=GAE
#### Runtime Mode #### #### Runtime Mode ####
runtimeMode=DEVELOPMENT runtimeMode=DEVELOPMENT
#runtimeMode=PRODUCTION #runtimeMode=PRODUCTION
#### Cache Implementation #### #### Cache Implementation ####
# Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always # Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always
cache=GAE cache=GAE
#### User Service Implementation #### #### User Service Implementation ####
userService=LOCAL userService=LOCAL
#### Static resource version #### #### Cache ####
cache.maxPageCnt=1024000
cache.maxDataCnt=1024000
#### Static resource version ####
staticResourceVersion=201211021410 staticResourceVersion=201211021410
\ No newline at end of file
war/h2/src/main/resources/latke.properties
View file @ 7839d204
# #
# Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team # Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # 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 # Author: Liang Ding
# #
#### Server #### #### Server ####
# Configures the followings before deploy # Configures the followings before deploy
serverScheme=http serverScheme=http
serverHost=localhost serverHost=localhost
serverPort=8080 serverPort=8080
staticServerScheme=http staticServerScheme=http
staticServerHost=localhost staticServerHost=localhost
staticServerPort=8080 staticServerPort=8080
# Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/' # Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/'
# and not ends with '/', for example, /blog # and not ends with '/', for example, /blog
contextPath= contextPath=
staticPath= staticPath=
#### Runtime Environment #### #### Runtime Environment ####
runtimeEnv=LOCAL runtimeEnv=LOCAL
#### Runtime Mode #### #### Runtime Mode ####
runtimeMode=DEVELOPMENT runtimeMode=DEVELOPMENT
#runtimeMode=PRODUCTION #runtimeMode=PRODUCTION
#### Cache Implementation #### #### Cache Implementation ####
# Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always # Note: If the runtime environment is LOCAL, the cache will be 'LOCAL' always
cache=LOCAL cache=LOCAL
#### User Service Implementation #### #### User Service Implementation ####
userService=LOCAL userService=LOCAL
#### Static resource version #### #### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
#### Static resource version ####
staticResourceVersion=201211021410 staticResourceVersion=201211021410
\ No newline at end of file
war/h2/src/main/resources/local.properties
View file @ 7839d204
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file # Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine, # 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. # 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 # Author: Liang Ding
# #
...@@ -44,6 +44,3 @@ jdbc.transactionIsolation=READ_COMMITTED ...@@ -44,6 +44,3 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix # The specific table name prefix
jdbc.tablePrefix= jdbc.tablePrefix=
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
war/mysql/src/main/resources/latke.properties
View file @ 7839d204
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Latke configurations. Configures the section "Server" carefully. # 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 # Author: Liang Ding
# #
...@@ -47,5 +47,9 @@ cache=LOCAL ...@@ -47,5 +47,9 @@ cache=LOCAL
#### User Service Implementation #### #### User Service Implementation ####
userService=LOCAL userService=LOCAL
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
#### Static resource version #### #### Static resource version ####
staticResourceVersion=201211021410 staticResourceVersion=201211021410
\ No newline at end of file
war/mysql/src/main/resources/local.properties
View file @ 7839d204
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file # Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine, # 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. # 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 # Author: Liang Ding
# #
...@@ -45,7 +45,3 @@ jdbc.transactionIsolation=READ_COMMITTED ...@@ -45,7 +45,3 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix # The specific table name prefix
jdbc.tablePrefix= jdbc.tablePrefix=
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment