The Unified and Autonomous Development Platform
Database and program upgrade logic
Robin Shenc4ca579bb34d
diff --git a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.javaindex a532f54548..e4344aa22a 100644--- a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java+++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java@@ -18,6 +18,8 @@ import org.joda.time.format.DateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Charsets;+import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.launcher.loader.PluginManager;import io.onedev.server.migration.DatabaseMigrator;@@ -32,8 +34,6 @@ import io.onedev.utils.StringUtils;import io.onedev.utils.command.Commandline;import io.onedev.utils.command.LineConsumer;-import com.google.common.base.Charsets;-@Singletonpublic class UpgradeCommand extends DefaultPersistManager {@@ -400,14 +400,27 @@ public class UpgradeCommand extends DefaultPersistManager {}cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));- File onedevAvatar = new File(upgradeDir, "site/avatars/onedev.png");- if (!onedevAvatar.exists()) {+ for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {try {- FileUtils.copyFile(new File(Bootstrap.getSiteDir(), "avatars/onedev.png"), onedevAvatar);+ FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));} catch (IOException e) {throw new RuntimeException(e);}}+ File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");+ File userUploadsDir = new File(uploadedDir, "users");+ if (uploadedDir.exists() && !userUploadsDir.exists()) {+ FileUtils.createDir(userUploadsDir);+ for (File file: uploadedDir.listFiles()) {+ if (file.isFile()) {+ try {+ FileUtils.moveFileToDirectory(file, userUploadsDir, false);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+ }for (File file: Bootstrap.getSiteLibDir().listFiles()) {// end user may put some custom program files in site lib before upgrade,// to override site lib of old versiondiff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javaindex 3a8f8c9d46..dffc41b798 100644--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java@@ -789,34 +789,16 @@ public class DatabaseMigrator {replyCount = 0;element.addElement("replyCount").setText(String.valueOf(replyCount));+ Element dateElement = element.element("date");+ dateElement.setName("createDate");+ Element updateDateElement = element.addElement("updateDate");+ updateDateElement.addAttribute("class", "sql-timestamp");Element lastEventElement = element.element("lastEvent");if (lastEventElement != null) {- lastEventElement.setName("lastActivity");- lastEventElement.element("type").setName("description");- Element userElement = lastEventElement.element("user");- Element userNameElement = lastEventElement.element("userName");- if (userNameElement != null) {- if (userElement != null)- userElement.detach();- } else {- if (userElement != null) {- userElement.setName("userName");- userElement.setText(userNames.get(userElement.getTextTrim()));- } else {- lastEventElement.addElement("userName").setText("unknown");- }- }+ updateDateElement.setText(lastEventElement.elementText("date"));+ lastEventElement.detach();} else {- Element lastActivityElement = element.addElement("lastActivity");- lastActivityElement.addElement("description").setText("created");- Element dateElement = lastActivityElement.addElement("date");- dateElement.addAttribute("class", "sql-timestamp");- dateElement.setText(element.elementText("date"));- Element userElement = element.element("user");- if (userElement != null)- lastActivityElement.addElement("userName").setText(userNames.get(userElement.getTextTrim()));- else- lastActivityElement.addElement("userName").setText(element.elementText("userName"));+ updateDateElement.setText(dateElement.getText());}}dom.writeToFile(file, false);@@ -849,34 +831,15 @@ public class DatabaseMigrator {closeInfoElement.element("closeDate").setName("date");closeInfoElement.element("closeStatus").setName("status");}+ Element submitDateElement = element.element("submitDate");+ Element updateDateElement = element.addElement("updateDate");+ updateDateElement.addAttribute("class", "sql-timestamp");Element lastEventElement = element.element("lastEvent");if (lastEventElement != null) {- lastEventElement.setName("lastActivity");- lastEventElement.element("type").setName("description");- Element userElement = lastEventElement.element("user");- Element userNameElement = lastEventElement.element("userName");- if (userNameElement != null) {- if (userElement != null)- userElement.detach();- } else {- if (userElement != null) {- userElement.setName("userName");- userElement.setText(userNames.get(userElement.getTextTrim()));- } else {- lastEventElement.addElement("userName").setText("unknown");- }- }+ updateDateElement.setText(lastEventElement.elementText("date"));+ lastEventElement.detach();} else {- Element lastActivityElement = element.addElement("lastActivity");- lastActivityElement.addElement("description").setText("submitted");- Element dateElement = lastActivityElement.addElement("date");- dateElement.addAttribute("class", "sql-timestamp");- dateElement.setText(element.elementText("submitDate"));- Element submitterElement = element.element("submitter");- if (submitterElement != null)- lastActivityElement.addElement("userName").setText(userNames.get(submitterElement.getTextTrim()));- else- lastActivityElement.addElement("userName").setText(element.elementText("submitterName"));+ updateDateElement.setText(submitDateElement.getText());}}dom.writeToFile(file, false);