Commit e6b0ff5d authored by Liang Ding's avatar Liang Ding

升级到 0.5.5

parent 2033033f
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo core.
Version: 2.0.1.0, Aug 16, 2012
Version: 2.0.1.1, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -17,7 +17,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo</artifactId>
<version>0.5.0</version>
<version>0.5.5</version>
</parent>
<dependencies>
......
......@@ -53,7 +53,7 @@ import org.json.JSONObject;
* B3log Solo servlet listener.
*
* @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
* @version 1.0.7.5, Aug 16, 2011
* @version 1.0.7.6, Nov 21, 2012
* @since 0.3.1
*/
public final class SoloServletListener extends AbstractServletListener {
......@@ -61,7 +61,7 @@ public final class SoloServletListener extends AbstractServletListener {
/**
* B3log Solo version.
*/
public static final String VERSION = "0.5.0";
public static final String VERSION = "0.5.5";
/**
* Logger.
*/
......
......@@ -45,7 +45,7 @@ import org.json.JSONObject;
*
* @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
* @author <a href="mailto:dongxv.vang@gmail.com">Dongxu Wang</a>
* @version 1.1.1.3, Aug 30, 2012
* @version 1.1.1.4, Nov 21, 2012
* @since 0.3.1
*/
@RequestProcessor
......@@ -123,10 +123,10 @@ public final class UpgradeProcessor {
return;
}
if ("0.4.6".equals(version)) {
v046ToV050();
if ("0.5.0".equals(version)) {
v050ToV055();
} else {
LOGGER.log(Level.WARNING, "Attempt to skip more than one version to upgrade. Expected: 0.4.6; Actually: {0}", version);
LOGGER.log(Level.WARNING, "Attempt to skip more than one version to upgrade. Expected: 0.5.0; Actually: {0}", version);
if(!sent){
notifyUserByEmail();
sent = true;
......@@ -141,12 +141,12 @@ public final class UpgradeProcessor {
}
/**
* Upgrades from version 046 to version 050.
* Upgrades from version 050 to version 055.
*
* @throws Exception upgrade fails
*/
private void v046ToV050() throws Exception {
LOGGER.info("Upgrading from version 046 to version 050....");
private void v050ToV055() throws Exception {
LOGGER.info("Upgrading from version 050 to version 055....");
articleRepository.setCacheEnabled(false);
......@@ -157,25 +157,25 @@ public final class UpgradeProcessor {
// Upgrades preference model
final JSONObject preference = preferenceRepository.get(Preference.PREFERENCE);
preference.put(Preference.VERSION, "0.5.0");
preference.put(Preference.VERSION, "0.5.5");
preferenceRepository.update(Preference.PREFERENCE, preference);
LOGGER.log(Level.FINEST, "Updated preference");
transaction.commit();
LOGGER.log(Level.FINEST, "Updated preference");
} catch (final Exception e) {
if (transaction.isActive()) {
transaction.rollback();
}
LOGGER.log(Level.SEVERE, "Upgrade failed.", e);
throw new Exception("Upgrade failed from version 046 to version 050");
throw new Exception("Upgrade failed from version 050 to version 055");
} finally {
articleRepository.setCacheEnabled(true);
}
LOGGER.info("Upgraded from version 046 to version 050 successfully :-)");
LOGGER.info("Upgraded from version 050 to version 055 successfully :-)");
}
/**
......
......@@ -16,11 +16,11 @@
#
# Description: ease skin (mock for test).
# Version: 1.0.0.1, Aug 16, 2012
# Version: 1.0.0.2, Nov 21, 2012
# Author: Liang Ding
#
name=ease
version=1.0.2
forSolo=0.5.0
version=1.0.3
forSolo=0.5.5
memo=\u56de\u5f52\u606c\u9759
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo parent POM.
Version: 2.0.2.4, Sep 20, 2012
Version: 2.0.2.5, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -11,7 +11,7 @@
<groupId>org.b3log</groupId>
<artifactId>solo</artifactId>
<packaging>pom</packaging>
<version>0.5.0</version>
<version>0.5.5</version>
<name>B3log Solo</name>
<url>https://github.com/b3log/b3log-solo</url>
<description>
......@@ -28,7 +28,7 @@
<!-- Properties -->
<properties>
<servlet.version>2.5</servlet.version>
<org.b3log.solo.version>0.5.0</org.b3log.solo.version>
<org.b3log.solo.version>0.5.5</org.b3log.solo.version>
<org.b3log.latke.version>0.5.0-SNAPSHOT</org.b3log.latke.version>
<org.b3log.latke-gae.version>0.5.0-SNAPSHOT</org.b3log.latke-gae.version>
<org.b3log.latke-bae.version>0.5.0-SNAPSHOT</org.b3log.latke-bae.version>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo BAE POM.
Version: 1.0.1.0, Sep 5, 2012
Version: 1.0.1.1, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.5.0</version>
<version>0.5.5</version>
</parent>
<properties>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo GAE POM.
Version: 2.0.2.0, Sep 5, 2012
Version: 2.0.2.1, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.5.0</version>
<version>0.5.5</version>
</parent>
<properties>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo (MySQL) standard Servlet container POM.
Version: 1.0.1.0, Sep 5, 2012
Version: 1.0.1.1, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.5.0</version>
<version>0.5.5</version>
</parent>
<properties>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo WAR POM.
Version: 2.0.1.4, Sep 4, 2012
Version: 2.0.1.5, Nov 21, 2012
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo</artifactId>
<version>0.5.0</version>
<version>0.5.5</version>
</parent>
<modules>
......
......@@ -20,12 +20,12 @@
Description: Web deployment descriptor on GAE. See
http://code.google.com/intl/en/appengine/docs/java/config/appconfig.html
for more details.
Version: 1.0.3.9, Aug 22, 2012
Version: 1.0.3.10, Nov 21, 2012
Author: Liang Ding
-->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>solo-demo</application>
<version>050</version>
<version>055</version>
<sessions-enabled>true</sessions-enabled>
......
This diff is collapsed.
......@@ -16,12 +16,12 @@
#
# Description: ease skin.
# Version: 1.0.0.2, Aug 16, 2012
# Version: 1.0.0.3, Nov 21, 2012
# Author: Liyuan Li
# Author: Liang Ding
#
name=ease
version=1.0.2
forSolo=0.5.0
version=1.0.3
forSolo=0.5.5
memo=\u56de\u5f52\u606c\u9759
......@@ -16,11 +16,11 @@
#
# Description: Mobile skin.
# Version: 1.0.0.4, Aug 16, 2012
# Version: 1.0.0.5, Nov 21, 2012
# Author: Liang Ding
#
name=Mobile
version=0.1.3
forSolo=0.5.0
version=0.1.4
forSolo=0.5.5
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002
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