Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
e6b0ff5d
Commit
e6b0ff5d
authored
Nov 21, 2012
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级到 0.5.5
parent
2033033f
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
605 additions
and
605 deletions
+605
-605
core/pom.xml
core/pom.xml
+2
-2
core/src/main/java/org/b3log/solo/SoloServletListener.java
core/src/main/java/org/b3log/solo/SoloServletListener.java
+2
-2
core/src/main/java/org/b3log/solo/processor/UpgradeProcessor.java
.../main/java/org/b3log/solo/processor/UpgradeProcessor.java
+12
-12
core/src/test/resources/skins/ease/skin.properties
core/src/test/resources/skins/ease/skin.properties
+3
-3
pom.xml
pom.xml
+3
-3
war/bae/pom.xml
war/bae/pom.xml
+2
-2
war/gae/pom.xml
war/gae/pom.xml
+2
-2
war/mysql/pom.xml
war/mysql/pom.xml
+2
-2
war/pom.xml
war/pom.xml
+2
-2
war/src/main/webapp/WEB-INF/appengine-web.xml
war/src/main/webapp/WEB-INF/appengine-web.xml
+2
-2
war/src/main/webapp/js/admin/latkeAdmin.js
war/src/main/webapp/js/admin/latkeAdmin.js
+567
-567
war/src/main/webapp/skins/ease/skin.properties
war/src/main/webapp/skins/ease/skin.properties
+3
-3
war/src/main/webapp/skins/mobile/skin.properties
war/src/main/webapp/skins/mobile/skin.properties
+3
-3
No files found.
core/pom.xml
View file @
e6b0ff5d
<?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>
...
...
core/src/main/java/org/b3log/solo/SoloServletListener.java
View file @
e6b0ff5d
...
...
@@ -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.
*/
...
...
core/src/main/java/org/b3log/solo/processor/UpgradeProcessor.java
View file @
e6b0ff5d
...
...
@@ -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
))
{
v0
46ToV050
();
if
(
"0.
5.0
"
.
equals
(
version
))
{
v0
50ToV055
();
}
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 0
46 to version 050
.
* Upgrades from version 0
50 to version 055
.
*
* @throws Exception upgrade fails
*/
private
void
v0
46ToV050
()
throws
Exception
{
LOGGER
.
info
(
"Upgrading from version 0
46 to version 050
...."
);
private
void
v0
50ToV055
()
throws
Exception
{
LOGGER
.
info
(
"Upgrading from version 0
50 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 0
46 to version 050
"
);
throw
new
Exception
(
"Upgrade failed from version 0
50 to version 055
"
);
}
finally
{
articleRepository
.
setCacheEnabled
(
true
);
}
LOGGER
.
info
(
"Upgraded from version 0
46 to version 050
successfully :-)"
);
LOGGER
.
info
(
"Upgraded from version 0
50 to version 055
successfully :-)"
);
}
/**
...
...
core/src/test/resources/skins/ease/skin.properties
View file @
e6b0ff5d
...
...
@@ -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
=
\u
56de
\u
5f52
\u
606c
\u9759
pom.xml
View file @
e6b0ff5d
<?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>
...
...
war/bae/pom.xml
View file @
e6b0ff5d
<?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>
...
...
war/gae/pom.xml
View file @
e6b0ff5d
<?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>
...
...
war/mysql/pom.xml
View file @
e6b0ff5d
<?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>
...
...
war/pom.xml
View file @
e6b0ff5d
<?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>
...
...
war/src/main/webapp/WEB-INF/appengine-web.xml
View file @
e6b0ff5d
...
...
@@ -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>
05
0
</version>
<version>
05
5
</version>
<sessions-enabled>
true
</sessions-enabled>
...
...
war/src/main/webapp/js/admin/latkeAdmin.js
View file @
e6b0ff5d
This diff is collapsed.
Click to expand it.
war/src/main/webapp/skins/ease/skin.properties
View file @
e6b0ff5d
...
...
@@ -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
=
\u
56de
\u
5f52
\u
606c
\u9759
war/src/main/webapp/skins/mobile/skin.properties
View file @
e6b0ff5d
...
...
@@ -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
=
\u
8bf7
\u
4e0d
\u8981\u
4ece
\u
90e8
\u
7f72
\u
76ee
\u
5f55
\u
4e2d
\u5220\u9664\u
8be5
\u
76ae
\u
80a4
\u
ff0c
\u5426\u5219\u
79fb
\u
52a8
\u
8bbe
\u5907\u
8bbf
\u
95ee
\u
65f6
\u
535a
\u
5ba2
\u
5c06
\u
4e0d
\u
53ef
\u7528\u3002
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment