Skip to content

S
solo
Commit eb568c30 authored by Liang Ding's avatar Liang Ding
Browse files
Options

升级到 Latke 2 

完整去除 GAE 依赖
parent a27b80d8
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 272 deletions
pom.xml
View file @ eb568c30
......@@ -105,7 +105,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.b3log.latke.version>1.4.10-SNAPSHOT</org.b3log.latke.version>
<org.b3log.latke.version>2.0.0</org.b3log.latke.version>
<servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
......
src/main/java/org/b3log/solo/model/Option.java
View file @ eb568c30
......@@ -381,7 +381,7 @@ public final class Option {
/**
* Default meta keywords..
*/
public static final String DEFAULT_META_KEYWORDS = "Java 博客,GAE,b3log";
public static final String DEFAULT_META_KEYWORDS = "Solo,Java 博客,开源";
/**
* Default meta description..
......
src/main/java/org/b3log/solo/processor/BlogProcessor.java
View file @ eb568c30
......@@ -112,7 +112,7 @@ public class BlogProcessor {
* <li>Serve path</li>
* <li>Static serve path</li>
* <li>Solo version</li>
* <li>Runtime environment (GAE/LOCAL)</li>
* <li>Runtime environment (LOCAL)</li>
* <li>Locale</li>
* </ul>
*
......
src/main/resources/lang_en_US.properties
View file @ eb568c30
......@@ -16,7 +16,7 @@
#
# Description: Solo language configurations(en_US).
# Version: 2.5.2.8, Dec 18, 2015
# Version: 2.5.2.9, Jan 8, 2016
# Author: Liang Ding
# Author: Liyuan Li
# Author: Dongxu Wang
......@@ -65,7 +65,7 @@ upToDateLabel=Your Solo is up to date ;-)
outOfDateLabel=Your Solo is out of date ;-(, download the latest version:
aboutLabel=About
aboutContentLabel=<p><a href="https://github.com/b3log/solo" target="_blank">Solo</a> \
is an open source (<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>) blogging program, which can run on <a href="http://code.google.com/appengine" target="_blank">Google App Engine</a> and a standard Servlet container.</p>\
is an open source (<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>) blogging program, which can run on a standard Servlet container.</p>\
<p><a href="http://b3log.org" target="_blank">B3log</a> advocates the rights of equality, freedom and passion, and we are trying to create a bran-new experience about individual blogging + community. Sound interesting? <a href="https://github.com/b3log/solo/wiki/Join_us" target="_blank">Join us</a>!</p>\
<a target="blank" href="http://b3log.org/donate.html">\
<div class="ico-alipay-me" alt="Alipay B3log" title="\u901a\u8fc7\u652f\u4ed8\u5b9d\u8fdb\u884c\u6350\u8d60"></div></a>
......
src/main/webapp/WEB-INF/appengine-web.xml deleted 100644 → 0
View file @ a27b80d8
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2010-2016, b3log.org & hacpai.com
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: Web deployment descriptor on GAE. See
http://code.google.com/intl/en/appengine/docs/java/config/appconfig.html
for more details.
Version: 1.6.5.6, Dec 19, 2015
Author: Liang Ding
-->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>solo-demo</application>
<version>130</version>
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties" />
</system-properties>
<static-files>
<!-- Uses the STANDARD Ant Path Pattern to configure these paths! -->
<include path="/favicon.ico" />
<include path="/favicon.png" />
<include path="/robots.txt" />
<include path="/js/**.js" />
<include path="/js/**/*.js" />
<include path="/js/**.css" />
<include path="/js/**/*.css" />
<include path="/js/**.htm" />
<include path="/js/**/*.htm" />
<include path="/js/**.html" />
<include path="/js/**/*.html" />
<include path="/js/**.gif" />
<include path="/js/**/*.gif" />
<include path="/js/**.png" />
<include path="/js/**/*.png" />
<include path="/js/**.jpg" />
<include path="/js/**/*.jpg" />
<include path="/skins/**.css" />
<include path="/skins/**.css.map" />
<include path="/skins/**/*.css" />
<include path="/skins/**/*.css.map" />
<include path="/skins/**.js" />
<include path="/skins/**/*.js" />
<include path="/skins/**.png" />
<include path="/skins/**/*.png" />
<include path="/skins/**.jpg" />
<include path="/skins/**/*.jpg" />
<include path="/skins/**.swf" />
<include path="/skins/**/*.swf" />
<include path="/skins/**.gif" />
<include path="/skins/**/*.gif" />
<include path="/skins/**/*.eot" />
<include path="/skins/**/*.svg" />
<include path="/skins/**/*.ttf" />
<include path="/skins/**/*.woff" />
<include path="/css/**.css" />
<include path="/css/**/*.css" />
<include path="/images/**.png" />
<include path="/images/**/*.png" />
<include path="/images/**.jpg" />
<include path="/images/**/*.jpg" />
<include path="/images/**.gif" />
<include path="/images/**/*.gif" />
<include path="/plugins/**.css" />
<include path="/plugins/**/*.css" />
<include path="/plugins/**.js" />
<include path="/plugins/**/*.js" />
<include path="/plugins/**.png" />
<include path="/plugins/**/*.png" />
<include path="/plugins/**.jpg" />
<include path="/plugins/**/*.jpg" />
<include path="/plugins/**.swf" />
<include path="/plugins/**/*.swf" />
<include path="/plugins/**.gif" />
<include path="/plugins/**/*.gif" />
<include path="/plugins/**.html" />
<include path="/plugins/**/*.html" />
<include path="/plugins/**.htm" />
<include path="/plugins/**/*.htm" />
<include path="/CHANGE_LOGS.html" />
<include path="/README.txt" />
<include path="/LICENSE.txt" />
</static-files>
</appengine-web-app>
src/main/webapp/WEB-INF/datastore-indexes.xml deleted 100644 → 0
View file @ a27b80d8
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2010-2016, b3log.org & hacpai.com
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: Datastore index configurations on GAE. See
http://code.google.com/intl/en/appengine/docs/java/config/indexconfig.html
for more details.
Version: 1.0.2.4, Feb 4, 2013
Author: Liang Ding
-->
<datastore-indexes autoGenerate="true">
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleIsPublished" direction="asc"/>
<property name="articleViewPwd" direction="asc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleIsPublished" direction="asc"/>
<property name="articleCreateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleIsPublished" direction="asc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleIsPublished" direction="asc"/>
<property name="articleCreateDate" direction="asc"/>
<property name="articlePermalink" direction="asc"/>
<property name="articleTitle" direction="asc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleAuthorEmail" direction="asc"/>
<property name="articleIsPublished" direction="asc"/>
<property name="articleUpdateDate" direction="desc"/>
<property name="articlePutTop" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="manual">
<property name="articleIsPublished" direction="asc"/>
<property name="articleCreateDate" direction="desc"/>
<property name="articlePermalink" direction="asc"/>
<property name="articleTitle" direction="asc"/>
</datastore-index>
<datastore-index kind="tag_article" ancestor="false" source="auto">
<property name="tag_oId" direction="asc"/>
<property name="article_oId" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articleCommentCount" direction="desc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articleViewCount" direction="desc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articlePutTop" direction="desc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articlePutTop" direction="desc"/>
<property name="articleCreateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="archiveDate_article" ancestor="false" source="auto">
<property name="archiveDate_oId" direction="asc"/>
<property name="article_oId" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleAuthorEmail" direction="asc"/>
<property name="articleIsPublished" direction="asc"/>
<property name="articlePutTop" direction="desc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleAuthorEmail" direction="asc"/>
<property name="articleIsPublished" direction="asc"/>
<property name="articleUpdateDate" direction="desc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articleRandomDouble" direction="asc"/>
</datastore-index>
<datastore-index kind="article" ancestor="false" source="auto">
<property name="articleIsPublished" direction="asc"/>
<property name="articleRandomDouble" direction="desc"/>
</datastore-index>
<datastore-index kind="comment" ancestor="false" source="auto">
<property name="commentOnId" direction="asc"/>
<property name="oId" direction="desc"/>
</datastore-index>
</datastore-indexes>
\ No newline at end of file
src/main/webapp/WEB-INF/queue.xml
View file @ eb568c30
......@@ -17,24 +17,11 @@
-->
<!--
Description: Task queue configurations on GAE. See
https://code.google.com/appengine/docs/java/config/queue.html
for more details.
Version: 1.0.1.2, Feb 21, 2012
Description: Task queue configurations.
Version: 2.0.1.2, Jan 8, 2016
Author: Liang Ding
-->
<queue-entries>
<!--
<queue>
<name>request-stat-queue</name>
<rate>20/m</rate>
<bucket-size>60</bucket-size>
<retry-parameters>
<task-retry-limit>7</task-retry-limit>
</retry-parameters>
</queue>
-->
<queue>
<name>fix-queue</name>
<rate>20/m</rate>
......
src/main/webapp/WEB-INF/static-resources.xml 0 → 100644
View file @ eb568c30
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2010-2016, b3log.org & hacpai.com
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: Static resources definition.
Version: 2.6.5.6, Jan 8, 2016
Author: Liang Ding
-->
<static-files>
<!-- Uses the STANDARD Ant Path Pattern to configure these paths! -->
<include path="/favicon.ico" />
<include path="/favicon.png" />
<include path="/robots.txt" />
<include path="/js/**.js" />
<include path="/js/**/*.js" />
<include path="/js/**.css" />
<include path="/js/**/*.css" />
<include path="/js/**.htm" />
<include path="/js/**/*.htm" />
<include path="/js/**.html" />
<include path="/js/**/*.html" />
<include path="/js/**.gif" />
<include path="/js/**/*.gif" />
<include path="/js/**.png" />
<include path="/js/**/*.png" />
<include path="/js/**.jpg" />
<include path="/js/**/*.jpg" />
<include path="/skins/**.css" />
<include path="/skins/**.css.map" />
<include path="/skins/**/*.css" />
<include path="/skins/**/*.css.map" />
<include path="/skins/**.js" />
<include path="/skins/**/*.js" />
<include path="/skins/**.png" />
<include path="/skins/**/*.png" />
<include path="/skins/**.jpg" />
<include path="/skins/**/*.jpg" />
<include path="/skins/**.swf" />
<include path="/skins/**/*.swf" />
<include path="/skins/**.gif" />
<include path="/skins/**/*.gif" />
<include path="/skins/**/*.eot" />
<include path="/skins/**/*.svg" />
<include path="/skins/**/*.ttf" />
<include path="/skins/**/*.woff" />
<include path="/css/**.css" />
<include path="/css/**/*.css" />
<include path="/images/**.png" />
<include path="/images/**/*.png" />
<include path="/images/**.jpg" />
<include path="/images/**/*.jpg" />
<include path="/images/**.gif" />
<include path="/images/**/*.gif" />
<include path="/plugins/**.css" />
<include path="/plugins/**/*.css" />
<include path="/plugins/**.js" />
<include path="/plugins/**/*.js" />
<include path="/plugins/**.png" />
<include path="/plugins/**/*.png" />
<include path="/plugins/**.jpg" />
<include path="/plugins/**/*.jpg" />
<include path="/plugins/**.swf" />
<include path="/plugins/**/*.swf" />
<include path="/plugins/**.gif" />
<include path="/plugins/**/*.gif" />
<include path="/plugins/**.html" />
<include path="/plugins/**/*.html" />
<include path="/plugins/**.htm" />
<include path="/plugins/**/*.htm" />
<include path="/CHANGE_LOGS.html" />
<include path="/README.txt" />
<include path="/LICENSE.txt" />
</static-files>
src/main/webapp/article-pwd.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8" />
<title>${articleViewPwdLabel}</title>
<meta name="keywords" content="Java 博客,GAE blog,b3log" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客" />
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
......
src/main/webapp/init.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8" />
<title>${welcomeToSoloLabel} Solo!</title>
<meta name="keywords" content="GAE 博客,GAE blog,b3log,init" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,初始化程序" />
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
......
src/main/webapp/kill-browser.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8" />
<title>${blogTitle}</title>
<meta name="keywords" content="Java 博客,blog,b3log,kill IE6" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,Let's kill IE6" />
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
......
src/main/webapp/login.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8" />
<title>${welcomeToSoloLabel} Solo!</title>
<meta name="keywords" content="Java 博客,GAE blog,b3log" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客" />
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
......
src/main/webapp/register.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8" />
<title>${blogTitle}</title>
<meta name="keywords" content="Java 博客,blog,b3log,kill IE6" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,用户注册" />
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
......
src/main/webapp/reset-pwd.ftl
View file @ eb568c30
......@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8"/>
<title>${forgotLabel} Solo!</title>
<meta name="keywords" content="Java 博客,GAE blog,b3log"/>
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客"/>
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team"/>
<meta name="author" content="B3log Team"/>
<meta name="generator" content="Solo"/>
......
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