Author: snoopdave
Date: Sun Jun 7 02:18:30 2009
New Revision: 782326
URL: http://svn.apache.org/viewvc?rev=782326&view=rev
Log:
Next rev from trunk will be 5.0, not 4.1
Added:
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm
(contents, props changed)
- copied, changed from r782293,
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-410-migration.vm
Removed:
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-410-migration.vm
Modified:
roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/branches/roller_mediablogging/apps/weblogger/src/sql/dbscripts.properties
Modified:
roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=782326&r1=782325&r2=782326&view=diff
==============================================================================
---
roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
(original)
+++
roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Sun Jun 7 02:18:30 2009
@@ -245,9 +245,9 @@
upgradeTo400(con, runScripts);
dbversion = 400;
}
- if(dbversion < 410) {
- upgradeTo410(con, runScripts);
- dbversion = 410;
+ if(dbversion < 500) {
+ upgradeTo500(con, runScripts);
+ dbversion = 500;
}
// make sure the database version is the exact version
@@ -1119,16 +1119,16 @@
/**
- * Upgrade database for Roller 4.1.0
+ * Upgrade database for Roller 5.0.0
*/
- private void upgradeTo410(Connection con, boolean runScripts) throws
StartupException {
+ private void upgradeTo500(Connection con, boolean runScripts) throws
StartupException {
// first we need to run upgrade scripts
SQLScriptRunner runner = null;
try {
if (runScripts) {
String handle = getDatabaseHandle(con);
- String scriptPath = handle + "/400-to-410-migration.sql";
+ String scriptPath = handle + "/400-to-500-migration.sql";
successMessage("Running database upgrade script:
"+scriptPath);
runner = new
SQLScriptRunner(scripts.getDatabaseScript(scriptPath));
runner.runScript(con, true);
Copied:
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm
(from r782293,
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-410-migration.vm)
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm?p2=roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm&p1=roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-410-migration.vm&r1=782293&r2=782326&rev=782326&view=diff
==============================================================================
---
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-410-migration.vm
(original)
+++
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm
Sun Jun 7 02:18:30 2009
@@ -1,5 +1,5 @@
#**
-400-to-410-migration.vm: Velocity template that generates vendor-specific
database scripts
+400-to-500-migration.vm: Velocity template that generates vendor-specific
database scripts
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
Propchange:
roller/branches/roller_mediablogging/apps/weblogger/src/sql/400-to-500-migration.vm
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
roller/branches/roller_mediablogging/apps/weblogger/src/sql/dbscripts.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mediablogging/apps/weblogger/src/sql/dbscripts.properties?rev=782326&r1=782325&r2=782326&view=diff
==============================================================================
---
roller/branches/roller_mediablogging/apps/weblogger/src/sql/dbscripts.properties
(original)
+++
roller/branches/roller_mediablogging/apps/weblogger/src/sql/dbscripts.properties
Sun Jun 7 02:18:30 2009
@@ -7,5 +7,5 @@
# list all db templates to generate, separated by spaces
templates=createdb 200-to-210-migration 210-to-230-migration \
230-to-240-migration 240-to-300-migration 300-to-310-migration \
-310-to-400-migration 400-to-410-migration
+310-to-400-migration 400-to-500-migration
