The Unified and Autonomous Development Platform
Migration to 1.0-EAP-build27
robin shine81f90b1a7748
diff --git a/core/pom.xml b/core/pom.xmlindex 896324866f..9f916e1126 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.gitplex</groupId><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></parent><build><plugins>diff --git a/core/src/main/java/com/gitplex/server/GitPlex.java b/core/src/main/java/com/gitplex/server/GitPlex.javaindex a96ec4764a..a1b9000326 100644--- a/core/src/main/java/com/gitplex/server/GitPlex.java+++ b/core/src/main/java/com/gitplex/server/GitPlex.java@@ -87,8 +87,9 @@ public class GitPlex extends AbstractPlugin implements Serializable {@Overridepublic void start() {+ jettyRunner.start();+if (Bootstrap.command == null) {- jettyRunner.start();taskScheduler.start();}diff --git a/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.javaindex 873c368ded..dafd2feea0 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java@@ -25,9 +25,11 @@ import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;+import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.execution.Commandline;import com.gitplex.server.util.execution.LineConsumer;import com.gitplex.server.util.validation.EntityValidator;+import com.google.common.base.Charsets;@Singletonpublic class DefaultUpgradeCommand extends DefaultPersistManager {@@ -47,9 +49,31 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {}protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {+ String version;+ File versionFile = new File(upgradeDir, "version.txt");+ if (versionFile.exists()) {+ try {+ version = FileUtils.readFileToString(versionFile).trim();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ version = "1.0-EAP-build26";+ }++ String bootstrapClass;+ if (version.startsWith("1.0-EAP")) {+ int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));+ if (build <= 26)+ bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";+ else+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";+ } else {+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";+ }Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");- cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*",- "com.gitplex.launcher.bootstrap.Bootstrap", command);+ cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass,+ command);cmdline.addArgs(commandArgs);cmdline.workingDir(new File(upgradeDir, "boot"));return cmdline;@@ -156,6 +180,8 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {FileUtils.createDir(upgradeBackup);File dbBackup = null;+ FileUtils.cleanDir(new File(upgradeDir, "temp"));+if (usingEmbeddedDB.get()) {logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());try {@@ -350,10 +376,17 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {}}try {+ File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");+ String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",+ "com.gitplex.launcher.bootstrap.Bootstrap");+ FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);+FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),new File(upgradeDir, "conf/wrapper-license.conf"));FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));FileUtils.copyFile(new File(Bootstrap.installDir, "license.txt"), new File(upgradeDir, "license.txt"));+ FileUtils.copyFile(new File(Bootstrap.installDir, "version.txt"), new File(upgradeDir, "version.txt"));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.javaindex f7669a964f..a67c213fc6 100644--- a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java@@ -45,4 +45,5 @@ public interface CommitInfoManager {* child commits*/Set<ObjectId> getChildren(Depot depot, ObjectId parent);+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.javaindex cd9062fa38..1bf0fd26d0 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java@@ -25,10 +25,6 @@ import org.hibernate.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;-import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.GitPlex;@@ -47,6 +43,7 @@ import com.gitplex.server.manager.CodeCommentInfoManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.PullRequestInfoManager;+import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.TeamAuthorizationManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;@@ -61,12 +58,18 @@ import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.Pair;import com.gitplex.server.util.StringUtils;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;+import com.google.common.collect.BiMap;+import com.google.common.collect.HashBiMap;@Singletonpublic class DefaultDepotManager extends AbstractEntityManager<Depot> implements DepotManager {private static final Logger logger = LoggerFactory.getLogger(DefaultDepotManager.class);+ private static final int INFO_VERSION = 2;+private final ListenerRegistry listenerRegistry;private final AccountManager userManager;@@ -79,6 +82,8 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsprivate final TeamAuthorizationManager teamAuthorizationManager;+ private final StorageManager storageManager;+private final String gitReceiveHook;private final BiMap<Pair<Long, String>, Long> nameToId = HashBiMap.create();@@ -90,7 +95,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Injectpublic DefaultDepotManager(Dao dao, AccountManager userManager, CodeCommentInfoManager codeCommentInfoManager,TeamAuthorizationManager teamAuthorizationManager, PullRequestInfoManager pullRequestInfoManager,- CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry) {+ CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry, StorageManager storageManager) {super(dao);this.userManager = userManager;@@ -99,6 +104,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsthis.commitInfoManager = commitInfoManager;this.codeCommentInfoManager = codeCommentInfoManager;this.listenerRegistry = listenerRegistry;+ this.storageManager = storageManager;try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {Preconditions.checkNotNull(is);@@ -182,7 +188,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsidLock.writeLock().unlock();}if (isNew) {- checkSanity(depot);+ checkGit(depot);}}@@ -274,7 +280,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsdoAfterCommit(newAfterCommitRunnable(to, isNew));}- private void checkSanity(Depot depot) {+ private void checkGit(Depot depot) {logger.info("Checking sanity of repository '{}'...", depot);File gitDir = depot.getDirectory();if (depot.getDirectory().exists() && !GitUtils.isValid(gitDir)) {@@ -316,12 +322,31 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Listenpublic void on(SystemStarted event) {for (Depot depot: findAll()) {- checkSanity(depot);+ checkGit(depot);+ checkInfo(depot);commitInfoManager.collect(depot);pullRequestInfoManager.collect(depot);codeCommentInfoManager.collect(depot);}}++ private void checkInfo(Depot depot) {+ File infoVersionFile = new File(storageManager.getInfoDir(depot), "version.txt");+ int infoVersion;+ if (infoVersionFile.exists()) {+ try {+ infoVersion = Integer.parseInt(FileUtils.readFileToString(infoVersionFile).trim());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ infoVersion = 0;+ }+ if (infoVersion != INFO_VERSION) {+ FileUtils.cleanDir(infoVersionFile.getParentFile());+ FileUtils.writeFile(infoVersionFile, String.valueOf(INFO_VERSION));+ }+ }@Listenpublic void on(SystemStopping event) {diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.javaindex 292cbc48df..d4114d390a 100644--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java@@ -1,13 +1,16 @@package com.gitplex.server.migration;import java.io.File;+import java.io.IOException;import java.util.Stack;import javax.inject.Singleton;+import org.apache.commons.io.FileUtils;import org.dom4j.Element;import com.gitplex.server.util.StringUtils;+import com.google.common.base.Charsets;@Singleton@SuppressWarnings("unused")@@ -98,4 +101,41 @@ public class DatabaseMigrator {}}+ private void migrate6(File dataDir, Stack<Integer> versions) {+ }++ private void migrate7(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = StringUtils.replace(content,+ "com.gitplex.commons.hibernate.migration.VersionTable",+ "com.gitplex.server.model.ModelVersion");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.support.IntegrationPolicy",+ "com.gitplex.server.model.support.IntegrationPolicy");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.PullRequest_-IntegrationStrategy",+ "com.gitplex.server.model.PullRequest_-IntegrationStrategy");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.", "com.gitplex.server.model.");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.SpecifiedGit", "com.gitplex.server.git.config.SpecifiedGit");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.SystemGit", "com.gitplex.server.git.config.SystemGit");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");+ FileUtils.writeStringToFile(file, content, Charsets.UTF_8);++ if (file.getName().equals("VersionTables.xml")) {+ FileUtils.moveFile(file, new File(file.getParentFile(), "ModelVersions.xml"));+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+}diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.javaindex 655c1c743e..c208704236 100644--- a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java@@ -263,9 +263,17 @@ public class DefaultPersistManager implements PersistManager {throw Throwables.propagate(e);}}++ private File getVersionFile(File dataDir) {+ File versionFile = new File(dataDir, ModelVersion.class.getSimpleName() + "s.xml");+ if (!versionFile.exists())+ versionFile = new File(dataDir, "VersionTables.xml");+ return versionFile;+ }protected void migrateData(File dataDir) {- File versionFile = new File(dataDir, ModelVersion.class.getSimpleName() + "s.xml");+ File versionFile = getVersionFile(dataDir);+VersionedDocument dom = VersionedDocument.fromFile(versionFile);List<Element> elements = dom.getRootElement().elements();if (elements.size() != 1)@@ -276,7 +284,8 @@ public class DefaultPersistManager implements PersistManager {}if (MigrationHelper.migrate(versionElement.getText(), new DatabaseMigrator(), dataDir)) {- // read VersionTable dom again in case we changed something of it while migrating+ // load version file again in case we changed something of it while migrating+ versionFile = getVersionFile(dataDir);dom = VersionedDocument.fromFile(versionFile);elements = dom.getRootElement().elements();Preconditions.checkState(elements.size() == 1);diff --git a/pom.xml b/pom.xmlindex befe930009..abdb119f58 100644--- a/pom.xml+++ b/pom.xml@@ -8,7 +8,7 @@<relativePath>../launcher</relativePath></parent><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version><packaging>pom</packaging><build><pluginManagement>diff --git a/product/build/prepare_package.gant b/product/build/prepare_package.gantindex 86ce48cee9..070fbaa73b 100644--- a/product/build/prepare_package.gant+++ b/product/build/prepare_package.gant@@ -2,6 +2,8 @@ target(default:"prepare to package the product") {File buildDir = new File("${buildDirectory}")File sandboxDir = new File(buildDir, "sandbox")+ echo(file: new File(sandboxDir, "version.txt"), message: "${productVersion}")+File jswLoc = new File(buildDir, "jsw")unzip(src: new File("${jswPath}/wrapper-delta-pack-st.zip"), dest: jswLoc, overwrite: true) {regexpmapper(from: "^.*?/(.*)", to:"\\1")diff --git a/product/pom.xml b/product/pom.xmlindex d1edb0b7a6..efc44f7ead 100644--- a/product/pom.xml+++ b/product/pom.xml@@ -6,7 +6,7 @@<parent><groupId>com.gitplex</groupId><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></parent><build><plugins>@@ -92,8 +92,9 @@<definition name="buildDirectory" value="${project.build.directory}"/><definition name="outputDirectory" value="${project.build.outputDirectory}"/><definition name="jswPath" value="${basedir}/build/jsw"/>- <definition name="productName" value="${project.name}"/>+ <definition name="productName" value="${project.name}"/><definition name="lowerCaseProductName" value="${lowerCaseProductName}"/>+ <definition name="productVersion" value="${project.version}"/><definition name="bootstrapClass" value="${bootstrapClass}"/></gant></target>@@ -124,22 +125,22 @@<dependency><groupId>com.gitplex</groupId><artifactId>server-core</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>com.gitplex</groupId><artifactId>server-web</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>com.gitplex</groupId><artifactId>server-rest</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>com.gitplex</groupId><artifactId>server-search</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency></dependencies><properties>diff --git a/rest/pom.xml b/rest/pom.xmlindex 995117e101..b985775f8d 100644--- a/rest/pom.xml+++ b/rest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.gitplex</groupId><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></parent><build><plugins>@@ -19,7 +19,7 @@<dependency><groupId>com.gitplex</groupId><artifactId>server-core</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>org.glassfish.jersey.containers</groupId>diff --git a/search/pom.xml b/search/pom.xmlindex d5cb0575ee..764358b312 100644--- a/search/pom.xml+++ b/search/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.gitplex</groupId><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></parent><build><plugins>@@ -26,7 +26,7 @@<dependency><groupId>com.gitplex</groupId><artifactId>server-core</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><artifactId>lucene-core</artifactId>diff --git a/web/pom.xml b/web/pom.xmlindex 8feb01ce5a..3d5e34c874 100644--- a/web/pom.xml+++ b/web/pom.xml@@ -5,7 +5,7 @@<parent><groupId>com.gitplex</groupId><artifactId>server-parent</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></parent><build><plugins>@@ -79,12 +79,12 @@<dependency><groupId>com.gitplex</groupId><artifactId>server-core</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>com.gitplex</groupId><artifactId>server-rest</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>commons-fileupload</groupId>@@ -104,7 +104,7 @@<dependency><groupId>com.gitplex</groupId><artifactId>server-search</artifactId>- <version>1.0-EAP-build26</version>+ <version>1.0-EAP-build27</version></dependency><dependency><groupId>com.gitplex</groupId>