Merge pull request #240 from b3log/master

Rebase

pom.xml

@@ -110,9 +110,9 @@
         </developer>
         
         <developer>
-            <id>dongxv.vang@gmail.com</id>
+            <id>dongxu.wang@acm.org</id>
             <name>Dongxu Wang</name>
-            <email>dongxv.vang@gmail.com</email>
+            <email>dongxu.wang@acm.org</email>
             <url>http://dx.b3log.org</url>
             <roles>
                 <role>Committer</role>

war/bae/src/main/resources/mail.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 mail configurations. Configures this file if B3log Solo
-#              runs on standard Servlet container, it is unnecessary to change 
-#              this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.0.3, Jan 4, 2013
-# Author: Liang Ding
-#
-
-mail.user=b3log.solo@gmail.com
-mail.password=b3logsolo
-mail.debug=false
-mail.smtp.host=smtp.gmail.com
-mail.smtp.port=587
-mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-mail.smtp.socketFactory.fallback=false
-mail.smtp.socketFactory.port=465
-mail.debug=false
+#
+# 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 mail configurations. Configures this file if B3log Solo
+#              runs on standard Servlet container, it is unnecessary to change 
+#              this file if B3log Solo runs on Google App Engine.
+# Version: 1.0.0.3, Jan 4, 2013
+# Author: Liang Ding
+#
+
+mail.user=b3log.solo@gmail.com
+mail.password=b3logsolo
+mail.debug=false
+mail.smtp.host=smtp.gmail.com
+mail.smtp.port=587
+mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+mail.smtp.socketFactory.fallback=false
+mail.smtp.socketFactory.port=465

war/h2/src/main/resources/mail.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 mail configurations. Configures this file if B3log Solo
-#              runs on standard Servlet container, it is unnecessary to change 
-#              this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.0.3, Jan 4, 2013
-# Author: Liang Ding
-#
-
-mail.user=b3log.solo@gmail.com
-mail.password=b3logsolo
-mail.debug=false
-mail.smtp.host=smtp.gmail.com
-mail.smtp.port=587
-mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-mail.smtp.socketFactory.fallback=false
-mail.smtp.socketFactory.port=465
-mail.debug=false
+#
+# 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 mail configurations. Configures this file if B3log Solo
+#              runs on standard Servlet container, it is unnecessary to change 
+#              this file if B3log Solo runs on Google App Engine.
+# Version: 1.0.0.3, Jan 4, 2013
+# Author: Liang Ding
+#
+
+mail.user=b3log.solo@gmail.com
+mail.password=b3logsolo
+mail.debug=false
+mail.smtp.host=smtp.gmail.com
+mail.smtp.port=587
+mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+mail.smtp.socketFactory.fallback=false
+mail.smtp.socketFactory.port=465

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

@@ -44,4 +44,4 @@ jdbc.maxConnCnt=10
 jdbc.transactionIsolation=READ_COMMITTED
 
 # The specific table name prefix
-jdbc.tablePrefix=
+jdbc.tablePrefix=b3_solo

war/mysql/src/main/resources/mail.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 mail configurations. Configures this file if B3log Solo
-#              runs on standard Servlet container, it is unnecessary to change 
-#              this file if B3log Solo runs on Google App Engine.
-# Version: 1.0.0.3, Jan 4, 2013
-# Author: Liang Ding
-#
-
-mail.user=b3log.solo@gmail.com
-mail.password=b3logsolo
-mail.debug=false
-mail.smtp.host=smtp.gmail.com
-mail.smtp.port=587
-mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-mail.smtp.socketFactory.fallback=false
-mail.smtp.socketFactory.port=465
-mail.debug=false
+#
+# 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 mail configurations. Configures this file if B3log Solo
+#              runs on standard Servlet container, it is unnecessary to change 
+#              this file if B3log Solo runs on Google App Engine.
+# Version: 1.0.0.3, Jan 4, 2013
+# Author: Liang Ding
+#
+
+mail.user=b3log.solo@gmail.com
+mail.password=b3logsolo
+mail.debug=false
+mail.smtp.host=smtp.gmail.com
+mail.smtp.port=587
+mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+mail.smtp.socketFactory.fallback=false
+mail.smtp.socketFactory.port=465