The Unified and Autonomous Development Platform
Do data migration from 1.0.0
Robin Shenef726e59c499
diff --git a/core/pom.xml b/core/pom.xmlindex 1041637ca8..c5175cc3be 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.turbodev</groupId><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></parent><build><plugins>diff --git a/core/src/main/java/com/turbodev/server/command/UpgradeCommand.java b/core/src/main/java/com/turbodev/server/command/UpgradeCommand.javaindex a87af2c165..cf98451f63 100644--- a/core/src/main/java/com/turbodev/server/command/UpgradeCommand.java+++ b/core/src/main/java/com/turbodev/server/command/UpgradeCommand.java@@ -66,9 +66,11 @@ public class UpgradeCommand extends DefaultPersistManager {if (version.startsWith("1.0-EAP")) {int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));if (build <= 26)- bootstrapClass = "com.turbodev.commons.bootstrap.Bootstrap";+ bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";else- bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";+ } else if (version.startsWith("1.0.0")) {+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";} else {bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";}@@ -394,10 +396,10 @@ public class UpgradeCommand extends DefaultPersistManager {}cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));- File gitplexAvatar = new File(upgradeDir, "site/avatars/turbodev.png");- if (!gitplexAvatar.exists()) {+ File turbodevAvatar = new File(upgradeDir, "site/avatars/turbodev.png");+ if (!turbodevAvatar.exists()) {try {- FileUtils.copyFile(new File(Bootstrap.getSiteDir(), "avatars/turbodev.png"), gitplexAvatar);+ FileUtils.copyFile(new File(Bootstrap.getSiteDir(), "avatars/turbodev.png"), turbodevAvatar);} catch (IOException e) {throw new RuntimeException(e);}@@ -413,7 +415,9 @@ public class UpgradeCommand extends DefaultPersistManager {try {File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);- wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.commons.bootstrap.Bootstrap",+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",+ "com.turbodev.launcher.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap","com.turbodev.launcher.bootstrap.Bootstrap");FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);@@ -421,6 +425,8 @@ public class UpgradeCommand extends DefaultPersistManager {String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8);hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false","hibernate.hikari.autoCommit=true");+ hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "TurboDev");+if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {hibernateProps = StringUtils.replace(hibernateProps,"hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",@@ -433,6 +439,7 @@ public class UpgradeCommand extends DefaultPersistManager {String logbackConfig = FileUtils.readFileToString(logbackConfigFile, Charsets.UTF_8);logbackConfig = StringUtils.replace(logbackConfig, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>","<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");+ logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, Charsets.UTF_8);FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.javaindex c04359ade3..5d690be145 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java@@ -56,7 +56,7 @@ import jetbrains.exodus.env.TransactionalExecutable;public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentManagerimplements CodeCommentRelationInfoManager {- private static final int INFO_VERSION = 2;+ private static final int INFO_VERSION = 3;private static final int BATCH_SIZE = 5000;diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.javaindex c2d550ec02..239fa6bd88 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java@@ -79,7 +79,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);- private static final int INFO_VERSION = 2;+ private static final int INFO_VERSION = 3;private static final long LOG_FILE_SIZE = 256*1024;diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.javaindex e2b802c794..6cfdb6576c 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java@@ -33,7 +33,7 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultUserInfoManager extends AbstractEnvironmentManager implements UserInfoManager {- private static final int INFO_VERSION = 1;+ private static final int INFO_VERSION = 2;private static final String VISIT_STORE = "visit";diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.javaindex 0b5600d6de..9bd0ce431a 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java@@ -44,7 +44,7 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultVerificationManager extends AbstractEnvironmentManager implements VerificationManager {- private static final int INFO_VERSION = 1;+ private static final int INFO_VERSION = 2;private static final String INFO_DIR = "verification";diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.javaindex 98b13f2dbd..5bc2f8dc7e 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java@@ -32,7 +32,7 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultVisitManager extends AbstractEnvironmentManager implements VisitManager {- private static final int INFO_VERSION = 1;+ private static final int INFO_VERSION = 2;private static final String INFO_DIR = "visit";diff --git a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java b/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.javaindex 393903d548..379036a252 100644--- a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java@@ -53,8 +53,8 @@ public class DatabaseMigrator {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {String name = element.getName();- name = StringUtils.replace(name, "com.pmease.commons", "com.turbodev.commons");- name = StringUtils.replace(name, "com.pmease.turbodev", "com.turbodev.server");+ name = StringUtils.replace(name, "com.pmease.commons", "com.gitplex.commons");+ name = StringUtils.replace(name, "com.pmease.gitplex", "com.gitplex.server");element.setName(name);}if (file.getName().startsWith("Configs.xml")) {@@ -62,11 +62,11 @@ public class DatabaseMigrator {Element settingElement = element.element("setting");if (settingElement != null) {String clazz = settingElement.attributeValue("class");- settingElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.turbodev", "com.turbodev.server"));+ settingElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));Element gitConfigElement = settingElement.element("gitConfig");if (gitConfigElement != null) {clazz = gitConfigElement.attributeValue("class");- gitConfigElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.turbodev", "com.turbodev.server"));+ gitConfigElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));}}}@@ -113,24 +113,24 @@ public class DatabaseMigrator {try {String content = FileUtils.readFileToString(file, Charsets.UTF_8);content = StringUtils.replace(content,- "com.turbodev.commons.hibernate.migration.VersionTable",- "com.turbodev.server.model.ModelVersion");+ "com.gitplex.commons.hibernate.migration.VersionTable",+ "com.gitplex.server.model.ModelVersion");content = StringUtils.replace(content,- "com.turbodev.server.core.entity.support.IntegrationPolicy",- "com.turbodev.server.model.support.IntegrationPolicy");+ "com.gitplex.server.core.entity.support.IntegrationPolicy",+ "com.gitplex.server.model.support.IntegrationPolicy");content = StringUtils.replace(content,- "com.turbodev.server.core.entity.PullRequest_-IntegrationStrategy",- "com.turbodev.server.model.PullRequest_-IntegrationStrategy");+ "com.gitplex.server.core.entity.PullRequest_-IntegrationStrategy",+ "com.gitplex.server.model.PullRequest_-IntegrationStrategy");content = StringUtils.replace(content,- "com.turbodev.server.core.entity.", "com.turbodev.server.model.");+ "com.gitplex.server.core.entity.", "com.gitplex.server.model.");content = StringUtils.replace(content,- "com.turbodev.server.core.setting.SpecifiedGit", "com.turbodev.server.git.config.SpecifiedGit");+ "com.gitplex.server.core.setting.SpecifiedGit", "com.gitplex.server.git.config.SpecifiedGit");content = StringUtils.replace(content,- "com.turbodev.server.core.setting.SystemGit", "com.turbodev.server.git.config.SystemGit");+ "com.gitplex.server.core.setting.SystemGit", "com.gitplex.server.git.config.SystemGit");content = StringUtils.replace(content,- "com.turbodev.server.core.setting.", "com.turbodev.server.model.support.setting.");+ "com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");content = StringUtils.replace(content,- "com.turbodev.server.core.gatekeeper.", "com.turbodev.server.gatekeeper.");+ "com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");FileUtils.writeStringToFile(file, content, Charsets.UTF_8);if (file.getName().equals("VersionTables.xml")) {@@ -170,7 +170,7 @@ public class DatabaseMigrator {if (element.elementTextTrim("key").equals("SYSTEM")) {Element settingElement = element.element("setting");settingElement.addElement("curlConfig")- .addAttribute("class", "com.turbodev.server.git.config.SystemCurl");+ .addAttribute("class", "com.gitplex.server.git.config.SystemCurl");}}dom.writeToFile(file, false);@@ -242,8 +242,8 @@ public class DatabaseMigrator {File renamedFile = new File(dataDir, file.getName().replace("Accounts.xml", "Users.xml"));FileUtils.moveFile(file, renamedFile);String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);- content = StringUtils.replace(content, "com.turbodev.server.model.Account",- "com.turbodev.server.model.User");+ content = StringUtils.replace(content, "com.gitplex.server.model.Account",+ "com.gitplex.server.model.User");VersionedDocument dom = VersionedDocument.fromXML(content);for (Element element: dom.getRootElement().elements()) {accountIdToName.put(element.elementText("id"), element.elementText("name"));@@ -271,8 +271,8 @@ public class DatabaseMigrator {File renamedFile = new File(dataDir, file.getName().replace("Depots.xml", "Projects.xml"));FileUtils.moveFile(file, renamedFile);String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);- content = StringUtils.replace(content, "com.turbodev.server.model.Depot",- "com.turbodev.server.model.Project");+ content = StringUtils.replace(content, "com.gitplex.server.model.Depot",+ "com.gitplex.server.model.Project");VersionedDocument dom = VersionedDocument.fromXML(content);for (Element element: dom.getRootElement().elements()) {String accountId = element.elementText("account");@@ -289,7 +289,7 @@ public class DatabaseMigrator {adminId = "1";}Element userAuthorizationElement =- userAuthorizationListElement.addElement("com.turbodev.server.model.UserAuthorization");+ userAuthorizationListElement.addElement("com.gitplex.server.model.UserAuthorization");userAuthorizationElement.addAttribute("revision", "0.0");userAuthorizationElement.addElement("id").setText(String.valueOf(++lastUserAuthorizationId));userAuthorizationElement.addElement("user").setText(adminId);@@ -376,7 +376,7 @@ public class DatabaseMigrator {if (codeCommentsFromWeiFeng.exists()) {dom = VersionedDocument.fromFile(codeCommentsFromWeiFeng);for (Element commentElement: dom.getRootElement().elements()) {- commentElement.setName("com.turbodev.server.model.CodeComment");+ commentElement.setName("com.gitplex.server.model.CodeComment");commentElement.element("depot").setName("project");commentElement.element("resolved").detach();commentElement.element("commentPos").setName("markPos");@@ -397,7 +397,7 @@ public class DatabaseMigrator {if (maxId < id)maxId = id;}- Element licenseConfigElement = dom.getRootElement().addElement("com.turbodev.server.model.Config");+ Element licenseConfigElement = dom.getRootElement().addElement("com.gitplex.server.model.Config");licenseConfigElement.addElement("id").setText(String.valueOf(maxId+1));licenseConfigElement.addElement("key").setText("LICENSE");dom.writeToFile(file, false);@@ -422,4 +422,17 @@ public class DatabaseMigrator {}}+ private void migrate13(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = StringUtils.replace(content, "gitplex", "turbodev");+ content = StringUtils.replace(content, "GitPlex", "TurboDev");+ FileUtils.writeFile(file, content, Charsets.UTF_8.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+}diff --git a/pom.xml b/pom.xmlindex b10daf5eae..200306096b 100644--- a/pom.xml+++ b/pom.xml@@ -8,7 +8,7 @@<relativePath>../launcher</relativePath></parent><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version><packaging>pom</packaging><build><pluginManagement>diff --git a/product/pom.xml b/product/pom.xmlindex b870a7886f..975220f66f 100644--- a/product/pom.xml+++ b/product/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.turbodev</groupId><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></parent><build><plugins>@@ -94,22 +94,22 @@<dependency><groupId>com.turbodev</groupId><artifactId>server-core</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>com.turbodev</groupId><artifactId>server-web</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>com.turbodev</groupId><artifactId>server-rest</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>com.turbodev</groupId><artifactId>server-search</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency></dependencies><properties>diff --git a/product/system/conf/hibernate.properties b/product/system/conf/hibernate.propertiesindex 5c960775f5..c11486e13f 100644--- a/product/system/conf/hibernate.properties+++ b/product/system/conf/hibernate.properties@@ -13,7 +13,7 @@ hibernate.connection.password=#----------------------------------------------------------------------------------# To use MySQL/MariaDB database, please follow these steps:# 1. Uncomment MySQL/MariaDB settings below and comment out settings for other databases.-# 2. Create an empty turbodev schema at MySQL/MariaDB side.+# 2. Create an empty TurboDev schema at MySQL/MariaDB side.# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",# and "hibernate.connection.password" so that TurboDev can connect and write to# the database created in step 3.@@ -31,9 +31,9 @@ hibernate.connection.password=#----------------------------------------------------------------------------------# To use PostgreSQL database, please follow these steps:# 1. Uncomment PostgreSQL settings below and comment out settings for other databases.-# 2. Create an empty QuickBuild database at PostgreSQL side.+# 2. Create an empty TurboDev database at PostgreSQL side.# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that QuickBuild can connect and write to+# and "hibernate.connection.password" so that TurboDev can connect and write to# the database created in step 3.#----------------------------------------------------------------------------------diff --git a/product/system/conf/wrapper-license.conf b/product/system/conf/wrapper-license.confindex b9a2202dd0..c9748e7ab3 100644--- a/product/system/conf/wrapper-license.conf+++ b/product/system/conf/wrapper-license.conf@@ -1,13 +1,13 @@#encoding=UTF-8wrapper.license.type=DEV-wrapper.license.id=201712090000010+wrapper.license.id=201802110000001wrapper.license.licensee=Robin Shen-wrapper.license.group=GitPlex-wrapper.license.dev_application=GitPlex+wrapper.license.group=TurboDev+wrapper.license.dev_application=TurboDevwrapper.license.features=64bitwrapper.license.upgrade_term.begin_date=2009-04-26wrapper.license.upgrade_term.end_date=2018-04-26-wrapper.license.key.1=8d6b-3fdd-17c6-59da-wrapper.license.key.2=1192-209e-35c6-b9f8-wrapper.license.key.3=d724-4e08-e544-058b-wrapper.license.key.4=dd59-0485-7f29-8760\ No newline at end of file+wrapper.license.key.1=0949-2612-4d04-557e+wrapper.license.key.2=333e-ec7b-2e48-968c+wrapper.license.key.3=e149-f668-0c91-16ce+wrapper.license.key.4=150b-6144-636d-d5d2\ No newline at end of filediff --git a/rest/pom.xml b/rest/pom.xmlindex 31ee6c206c..6aac6cb103 100644--- a/rest/pom.xml+++ b/rest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.turbodev</groupId><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></parent><build><plugins>@@ -19,7 +19,7 @@<dependency><groupId>com.turbodev</groupId><artifactId>server-core</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>org.glassfish.jersey.containers</groupId>diff --git a/search/pom.xml b/search/pom.xmlindex 52f17c1410..5d6d93595c 100644--- a/search/pom.xml+++ b/search/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.turbodev</groupId><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></parent><build><plugins>@@ -26,7 +26,7 @@<dependency><groupId>com.turbodev</groupId><artifactId>server-core</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><artifactId>lucene-core</artifactId>diff --git a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java b/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.javaindex 847ad49c67..fc7e3b7658 100644--- a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java@@ -92,7 +92,7 @@ public class DefaultIndexManager implements IndexManager {private static final int BACKEND_INDEXING_PRIORITY = 50;- private static final int DATA_VERSION = 1;+ private static final int DATA_VERSION = 2;private final StorageManager storageManager;diff --git a/web/pom.xml b/web/pom.xmlindex 9472197202..564ca670e3 100644--- a/web/pom.xml+++ b/web/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.turbodev</groupId><artifactId>server-parent</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></parent><build><plugins>@@ -79,12 +79,12 @@<dependency><groupId>com.turbodev</groupId><artifactId>server-core</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>com.turbodev</groupId><artifactId>server-rest</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>commons-fileupload</groupId>@@ -104,7 +104,7 @@<dependency><groupId>com.turbodev</groupId><artifactId>server-search</artifactId>- <version>1.0.0-build98</version>+ <version>1.0.1-build99</version></dependency><dependency><groupId>com.turbodev</groupId>