Skip to content

The Unified and Autonomous Development Platform

Migration logic from 2.x

Robin Shen2b42eede1bac
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 83839fe5af..e6778b0b92 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -77,12 +77,6 @@ import io.onedev.server.buildspec.job.JobManager;
import io.onedev.server.buildspec.job.log.DefaultLogManager;
import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
-import io.onedev.server.cache.CodeCommentRelationInfoManager;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.cache.DefaultCodeCommentRelationInfoManager;
-import io.onedev.server.cache.DefaultCommitInfoManager;
-import io.onedev.server.cache.DefaultUserInfoManager;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
@@ -154,6 +148,12 @@ import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitPostReceiveCallback;
import io.onedev.server.git.GitPreReceiveCallback;
import io.onedev.server.git.config.GitConfig;
+import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.DefaultCodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.DefaultCommitInfoManager;
+import io.onedev.server.infomanager.DefaultUserInfoManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.maintenance.ApplyDatabaseConstraints;
import io.onedev.server.maintenance.BackupDatabase;
import io.onedev.server.maintenance.CheckDataVersion;
@@ -163,8 +163,6 @@ import io.onedev.server.maintenance.DefaultDataManager;
import io.onedev.server.maintenance.ResetAdminPassword;
import io.onedev.server.maintenance.RestoreDatabase;
import io.onedev.server.maintenance.Upgrade;
-import io.onedev.server.migration.JpaConverter;
-import io.onedev.server.migration.PersistentBagConverter;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;
@@ -234,6 +232,12 @@ import io.onedev.server.util.work.BatchWorkManager;
import io.onedev.server.util.work.DefaultBatchWorkManager;
import io.onedev.server.util.work.DefaultWorkExecutor;
import io.onedev.server.util.work.WorkExecutor;
+import io.onedev.server.util.xstream.CollectionConverter;
+import io.onedev.server.util.xstream.HibernateProxyConverter;
+import io.onedev.server.util.xstream.MapConverter;
+import io.onedev.server.util.xstream.ReflectionConverter;
+import io.onedev.server.util.xstream.StringConverter;
+import io.onedev.server.util.xstream.VersionedDocumentConverter;
import io.onedev.server.web.DefaultUrlManager;
import io.onedev.server.web.DefaultWicketFilter;
import io.onedev.server.web.DefaultWicketServlet;
@@ -637,10 +641,10 @@ public class CoreModule extends AbstractPluginModule {
@Override
public String serializedClass(Class type) {
- if (type == PersistentBag.class)
- return super.serializedClass(ArrayList.class);
- else if (type == null)
+ if (type == null)
return super.serializedClass(type);
+ else if (type == PersistentBag.class)
+ return super.serializedClass(ArrayList.class);
else if (type.getName().contains("$HibernateProxy$"))
return StringUtils.substringBefore(type.getName(), "$HibernateProxy$");
else
@@ -657,12 +661,16 @@ public class CoreModule extends AbstractPluginModule {
// register NullConverter as highest; otherwise NPE when unmarshal a map
// containing an entry with value set to null.
xstream.registerConverter(new NullConverter(), XStream.PRIORITY_VERY_HIGH);
- xstream.registerConverter(new PersistentBagConverter(xstream.getMapper()), 200);
- xstream.registerConverter(new JpaConverter(xstream.getMapper(), xstream.getReflectionProvider()));
- xstream.registerConverter(new ISO8601DateConverter(), 100);
- xstream.registerConverter(new ISO8601SqlTimestampConverter(), 100);
+ xstream.registerConverter(new StringConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new VersionedDocumentConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new HibernateProxyConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new CollectionConverter(xstream.getMapper()), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new MapConverter(xstream.getMapper()), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new ISO8601DateConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new ISO8601SqlTimestampConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new ReflectionConverter(xstream.getMapper(), xstream.getReflectionProvider()),
+ XStream.PRIORITY_VERY_LOW);
xstream.autodetectAnnotations(true);
-
return xstream;
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
index 764744fba8..0d3c1f5951 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
@@ -10,4 +10,6 @@ public interface RoleManager extends EntityManager<Role> {
@Nullable
Role find(String name);
+
+ void setupDefaults();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 016fdabba8..3ea4617b5b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -39,13 +39,13 @@ import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.PlanarRange;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 813446b7de..a4a4cb964a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -44,7 +44,6 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -54,6 +53,7 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.CloneCommand;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Group;
import io.onedev.server.model.GroupAuthorization;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index f84a1b4b47..c860b80e46 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -66,7 +66,6 @@ import io.onedev.server.buildspec.job.JobManager;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
import io.onedev.server.buildspec.job.trigger.PullRequestTrigger;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestBuildManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
@@ -86,6 +85,7 @@ import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.FileChange;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index c563741dd3..96c9c81b30 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -7,11 +7,15 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
+import com.google.common.collect.Lists;
+
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
+import io.onedev.server.model.support.role.CodePrivilege;
+import io.onedev.server.model.support.role.JobPrivilege;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -79,4 +83,48 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements R
return dao.find(criteria);
}
+ @Transactional
+ public void setupDefaults() {
+ Role manager = new Role();
+ manager.setName("Manager");
+ manager.setManageProject(true);
+ save(manager, null);
+
+ Role developer = new Role();
+ developer.setName("Developer");
+ developer.setCodePrivilege(CodePrivilege.WRITE);
+ developer.setScheduleIssues(true);
+ developer.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
+
+ JobPrivilege jobPrivilege = new JobPrivilege();
+ jobPrivilege.setJobNames("*");
+ jobPrivilege.setRunJob(true);
+ developer.getJobPrivileges().add(jobPrivilege);
+
+ save(developer, null);
+
+ Role tester = new Role();
+ tester.setName("Tester");
+ tester.setCodePrivilege(CodePrivilege.READ);
+ tester.setScheduleIssues(true);
+ tester.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
+
+ jobPrivilege = new JobPrivilege();
+ jobPrivilege.setJobNames("*");
+ jobPrivilege.setAccessLog(true);
+ tester.getJobPrivileges().add(jobPrivilege);
+
+ save(tester, null);
+
+ Role reporter = new Role();
+ reporter.setName("Reporter");
+ reporter.setCodePrivilege(CodePrivilege.NONE);
+ reporter.setEditableIssueFields(Lists.newArrayList("Type", "Priority"));
+
+ jobPrivilege = new JobPrivilege();
+ jobPrivilege.setJobNames("*");
+ reporter.getJobPrivileges().add(jobPrivilege);
+
+ save(reporter, null);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index eb97510ca6..99af63e4d3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -16,11 +16,11 @@ import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
-import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
-import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
+import io.onedev.server.model.support.administration.GroovyScript;
+import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
@@ -362,5 +362,5 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
setting.setValue(projectSetting);
dao.persist(setting);
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java
index 9d87acb4ea..5e8afbc8b8 100644
--- a/server-core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.io.File;
import java.io.IOException;
diff --git a/server-core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/CodeCommentRelationInfoManager.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/CodeCommentRelationInfoManager.java
index 99583721ae..703935251f 100644
--- a/server-core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/CodeCommentRelationInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java
index a715a1f32a..43c6652f85 100644
--- a/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.util.Collection;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCodeCommentRelationInfoManager.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/DefaultCodeCommentRelationInfoManager.java
index 772214928e..1cb3322514 100644
--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCodeCommentRelationInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.io.File;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
index 2bf42fbdbf..4197a777f1 100644
--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.io.File;
import java.io.IOException;
diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java
index 35dcbc6647..4af1bc0f74 100644
--- a/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.io.File;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java
rename to server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java
index 9842fc8596..ada93953fa 100644
--- a/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cache;
+package io.onedev.server.infomanager;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index c3dddb8b0d..7ea0f42f0d 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -36,7 +36,6 @@ import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.system.SystemStarting;
-import io.onedev.server.model.Role;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.User;
@@ -49,8 +48,6 @@ import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;
-import io.onedev.server.model.support.role.CodePrivilege;
-import io.onedev.server.model.support.role.JobPrivilege;
import io.onedev.server.notification.MailManager;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.PersistManager;
@@ -119,48 +116,7 @@ public class DefaultDataManager implements DataManager, Serializable {
user.setPassword(passwordService.encryptPassword(user.getPassword()));
userManager.save(user, null);
idManager.init(User.class);
-
- Role manager = new Role();
- manager.setName("Manager");
- manager.setManageProject(true);
- roleManager.save(manager, null);
-
- Role developer = new Role();
- developer.setName("Developer");
- developer.setCodePrivilege(CodePrivilege.WRITE);
- developer.setScheduleIssues(true);
- developer.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
-
- JobPrivilege jobPrivilege = new JobPrivilege();
- jobPrivilege.setJobNames("*");
- jobPrivilege.setRunJob(true);
- developer.getJobPrivileges().add(jobPrivilege);
-
- roleManager.save(developer, null);
-
- Role tester = new Role();
- tester.setName("Tester");
- tester.setCodePrivilege(CodePrivilege.READ);
- tester.setScheduleIssues(true);
- tester.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
-
- jobPrivilege = new JobPrivilege();
- jobPrivilege.setJobNames("*");
- jobPrivilege.setAccessLog(true);
- tester.getJobPrivileges().add(jobPrivilege);
-
- roleManager.save(tester, null);
-
- Role reporter = new Role();
- reporter.setName("Reporter");
- reporter.setCodePrivilege(CodePrivilege.NONE);
- reporter.setEditableIssueFields(Lists.newArrayList("Type", "Priority"));
-
- jobPrivilege = new JobPrivilege();
- jobPrivilege.setJobNames("*");
- reporter.getJobPrivileges().add(jobPrivilege);
-
- roleManager.save(reporter, null);
+ roleManager.setupDefaults();
}
});
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
index 21e4ac1aaf..ab37a124ef 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
@@ -77,11 +77,25 @@ public class Upgrade extends DefaultPersistManager {
bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
} else if (version.startsWith("1.0.1")) {
bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";
- } else if (version.startsWith("2.0.")){
+ } else if (version.startsWith("2.0.")) {
bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";
} else {
bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";
}
+
+ if (version.startsWith("1.") || version.startsWith("2.")) {
+ switch (command) {
+ case "check-data-version":
+ command = "check_data_version";
+ break;
+ case "backup-db":
+ command = "backup";
+ break;
+ case "clean-db":
+ command = "clean";
+ break;
+ }
+ }
Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");
cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass,
command);
@@ -124,18 +138,6 @@ public class Upgrade extends DefaultPersistManager {
upgradeDir.getAbsolutePath());
System.exit(1);
}
- String oldProgramVersion;
- String newProgramVersion;
- try {
- oldProgramVersion = FileUtils.readFileToString(new File(upgradeDir, "version.txt"));
- newProgramVersion = FileUtils.readFileToString(new File(Bootstrap.installDir, "version.txt"));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- if (oldProgramVersion.equals(newProgramVersion)) {
- logger.info("Program files are up to date");
- System.exit(0);
- }
logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
@@ -402,7 +404,28 @@ public class Upgrade extends DefaultPersistManager {
throw new RuntimeException(e);
}
}
+
+ if (new File(upgradeDir, "bin/apply_db_constraints.bat").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.bat"));
+ if (new File(upgradeDir, "bin/apply_db_constraints.sh").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.sh"));
+ if (new File(upgradeDir, "bin/backup.bat").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/backup.bat"));
+ if (new File(upgradeDir, "bin/backup.sh").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/backup.sh"));
+ if (new File(upgradeDir, "bin/restore.bat").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/restore.bat"));
+ if (new File(upgradeDir, "bin/restore.sh").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/restore.sh"));
+ if (new File(upgradeDir, "bin/reset_admin_password.bat").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.bat"));
+ if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));
+
cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));
+ if (new File(upgradeDir, "boot/system.classpath").exists())
+ FileUtils.deleteFile(new File(upgradeDir, "boot/system.classpath"));
+
cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));
for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {
try {
@@ -451,8 +474,33 @@ public class Upgrade extends DefaultPersistManager {
"hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"
+ "hibernate.connection.autocommit=true");
}
+
+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.connection.autocommit=true", "");
+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.leakDetectionThreshold=1800000", "");
+ hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.ehcache.EhCacheRegionFactory",
+ "org.hibernate.cache.jcache.JCacheRegionFactory");
+ if (!hibernateProps.contains("hibernate.cache.auto_evict_collection_cache=true")) {
+ hibernateProps += "hibernate.cache.auto_evict_collection_cache=true\r\n";
+ hibernateProps += "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider\r\n";
+ hibernateProps += "hibernate.javax.cache.missing_cache_strategy=create\r\n";
+ }
+
FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, Charsets.UTF_8);
+
+ File serverPropsFile = new File(upgradeDir, "conf/server.properties");
+ String serverProps = FileUtils.readFileToString(serverPropsFile, Charsets.UTF_8);
+ if (serverProps.contains("sessionTimeout"))
+ FileUtils.copyFile(new File(Bootstrap.getConfDir(), "server.properties"), serverPropsFile);
+ File logbackPropsFile = new File(upgradeDir, "conf/logback.xml");
+ String logbackProps = FileUtils.readFileToString(logbackPropsFile, Charsets.UTF_8);
+ if (!logbackProps.contains("AggregatedServiceLoader"))
+ FileUtils.copyFile(new File(Bootstrap.getConfDir(), "logback.xml"), logbackPropsFile);
+
+ File sampleKeystoreFile = new File(upgradeDir, "conf/sample.keystore");
+ if (sampleKeystoreFile.exists())
+ FileUtils.deleteFile(sampleKeystoreFile);
+
File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");
String logbackConfig = FileUtils.readFileToString(logbackConfigFile, Charsets.UTF_8);
logbackConfig = StringUtils.replace(logbackConfig, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index a01ce3ea9b..2c0aef9fa0 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -2,7 +2,10 @@ package io.onedev.server.migration;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -11,12 +14,16 @@ import java.util.Stack;
import javax.inject.Singleton;
+import org.apache.commons.io.IOUtils;
import org.dom4j.Element;
import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneException;
@Singleton
@SuppressWarnings("unused")
@@ -1035,4 +1042,218 @@ public class DataMigrator {
}
}
+ // from 2.0 to 3.0
+ private void migrate25(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ String content;
+ try {
+ content = FileUtils.readFileToString(file, Charsets.UTF_8.name());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ content = content.replace(".support.setting.", ".support.administration.");
+ content = content.replace(".support.authenticator.", ".support.administration.authenticator.");
+
+ VersionedDocument dom = VersionedDocument.fromXML(content);
+ for (Element element: dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("ISSUE") || key.equals("JOB_EXECUTORS")) {
+ element.detach();
+ } else if (key.equals("BACKUP")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ Element folderElement = valueElement.element("folder");
+ if (folderElement != null)
+ folderElement.detach();
+ }
+ } else if (key.equals("SECURITY")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.element("enableAnonymousAccess").setText("false");
+ } else if (key.equals("SYSTEM")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ Element storagePathElement = valueElement.element("storagePath");
+ String storagePath = storagePathElement.getText();
+ storagePathElement.detach();
+ try {
+ File projectsDir = new File(storagePath, "projects");
+ if (projectsDir.exists()) {
+ Path target = projectsDir.toPath();
+ File linkDir = new File(Bootstrap.installDir, "site/projects");
+ if (linkDir.exists())
+ throw new OneException("Directory already exists: " + linkDir);
+ Files.createSymbolicLink(linkDir.toPath(), target);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ } else if (key.equals("AUTHENTICATOR")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ Element defaultGroupNamesElement = valueElement.element("defaultGroupNames");
+ if (defaultGroupNamesElement != null)
+ defaultGroupNamesElement.detach();
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Groups.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements())
+ element.element("canCreateProjects").setName("createProjects");
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Users.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.addElement("userProjectQueries");
+
+ element.addElement("userIssueQueries");
+ element.addElement("userIssueQueryWatches");
+ element.addElement("issueQueryWatches");
+
+ element.addElement("userPullRequestQueries");
+ element.addElement("userPullRequestQueryWatches");
+ element.addElement("pullRequestQueryWatches");
+
+ element.addElement("userBuildQueries");
+ element.addElement("userBuildQuerySubscriptions");
+ element.addElement("buildQuerySubscriptions");
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("GroupAuthorizations.xml")
+ || file.getName().startsWith("UserAuthorizations.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element privilegeElement = element.element("privilege");
+ String privilege = privilegeElement.getTextTrim();
+ privilegeElement.detach();
+
+ String roleId;
+ switch (privilege) {
+ case "ISSUE_READ":
+ roleId = "4";
+ break;
+ case "CODE_READ":
+ roleId = "3";
+ break;
+ case "CODE_WRITE":
+ roleId = "2";
+ break;
+ default:
+ roleId = "1";
+ }
+ element.addElement("role").setText(roleId);
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Issues.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements())
+ element.element("numberStr").detach();
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("CodeComments.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element rangeElement = element.element("markPos").element("range");
+ rangeElement.element("beginLine").setName("fromRow");
+ rangeElement.element("endLine").setName("toRow");
+ rangeElement.element("beginChar").setName("fromColumn");
+ rangeElement.element("endChar").setName("toColumn");
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ String content;
+ try {
+ content = FileUtils.readFileToString(file, Charsets.UTF_8.name());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ content = content.replace("DO_NOT_MERGE", "CREATE_MERGE_COMMIT");
+
+ VersionedDocument dom = VersionedDocument.fromXML(content);
+ for (Element element: dom.getRootElement().elements())
+ element.element("numberStr").detach();
+
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Projects.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.addElement("owner").setText("1");
+
+ for (Element branchProtectionElement: element.element("branchProtections").elements()) {
+ Element submitterElement = branchProtectionElement.element("submitter");
+ submitterElement.setName("user");
+ submitterElement.setText("anyone");
+ branchProtectionElement.element("configurations").detach();
+ branchProtectionElement.element("buildMerges").detach();
+ branchProtectionElement.addElement("jobNames");
+ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements())
+ fileProtectionElement.addElement("jobNames");
+ }
+
+ for (Element tagProtectionElement: element.element("tagProtections").elements())
+ tagProtectionElement.element("submitter").setName("user");
+ element.addElement("secrets");
+ element.element("commitMessageTransforms").detach();
+ element.element("webHooks").detach();
+ element.addElement("webHooks");
+ element.element("issueSetting").detach();
+ element.addElement("issueSetting");
+
+ element.element("savedBuildQueries").detach();
+ Element buildSettingElement = element.addElement("buildSetting");
+ buildSettingElement.addElement("buildsToPreserve").setText("all");
+
+ element.element("savedCommitQueries").detach();
+ element.element("savedCodeCommentQueries").detach();
+ element.element("savedPullRequestQueries").detach();
+
+ element.addElement("pullRequestSetting");
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("IssueChanges.xml")
+ || file.getName().startsWith("Configurations.xml")
+ || file.getName().startsWith("IssueQuerySettings.xml")
+ || file.getName().startsWith("PullRequestQuerySettings.xml")
+ || file.getName().startsWith("CodeCommentQuerySettings.xml")
+ || file.getName().startsWith("PullRequestWatchs.xml")
+ || file.getName().startsWith("IssueWatchs.xml")
+ || file.getName().startsWith("CommitQuerySettings.xml")
+ || file.getName().startsWith("PullRequestBuilds.xml")
+ || file.getName().startsWith("BuildQuerySettings.xml")
+ || file.getName().startsWith("Builds.xml")
+ || file.getName().startsWith("Build2s.xml")
+ || file.getName().startsWith("BuildDependences.xml")
+ || file.getName().startsWith("BuildParams.xml")) {
+ FileUtils.deleteFile(file);
+ } else if (file.getName().startsWith("IssueFieldEntitys.xml")) {
+ String content;
+ try {
+ content = FileUtils.readFileToString(file, Charsets.UTF_8.name());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ content = content.replace("io.onedev.server.model.IssueFieldEntity",
+ "io.onedev.server.model.IssueField");
+
+ FileUtils.deleteFile(file);
+
+ File renamedFile = new File(dataDir, file.getName().replace(
+ "IssueFieldEntitys.xml", "IssueFields.xml"));
+ FileUtils.writeFile(renamedFile, content, Charsets.UTF_8.name());
+ }
+ }
+ try (InputStream is = getClass().getResourceAsStream("migrate25_roles.xml")) {
+ Preconditions.checkNotNull(is);
+ FileUtils.writeFile(
+ new File(dataDir, "Roles.xml"),
+ StringUtils.join(IOUtils.readLines(is, Charsets.UTF_8.name()), "\n"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/JpaConverter.java b/server-core/src/main/java/io/onedev/server/migration/JpaConverter.java
deleted file mode 100644
index 89d2be10c0..0000000000
--- a/server-core/src/main/java/io/onedev/server/migration/JpaConverter.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package io.onedev.server.migration;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.persistence.ManyToOne;
-
-import org.dom4j.Attribute;
-import org.dom4j.Branch;
-import org.dom4j.Element;
-import org.hibernate.collection.internal.PersistentBag;
-import org.hibernate.proxy.HibernateProxy;
-
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.core.util.HierarchicalStreams;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.mapper.Mapper;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.ClassUtils;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.ReflectionUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.persistence.dao.Dao;
-
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class JpaConverter extends ReflectionConverter {
-
- private ThreadLocal<Stack<HierarchicalStreamReader>> readerStack =
- new ThreadLocal<Stack<HierarchicalStreamReader>>() {
-
- @Override
- protected Stack<HierarchicalStreamReader> initialValue() {
- return new Stack<HierarchicalStreamReader>();
- }
-
- };
-
- private ThreadLocal<Stack<HierarchicalStreamWriter>> writerStack =
- new ThreadLocal<Stack<HierarchicalStreamWriter>>() {
-
- @Override
- protected Stack<HierarchicalStreamWriter> initialValue() {
- return new Stack<HierarchicalStreamWriter>();
- }
-
- };
-
- public JpaConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
- super(mapper, reflectionProvider);
- }
-
- @Override
- public void marshal(Object original, HierarchicalStreamWriter writer, MarshallingContext context) {
- try {
- writerStack.get().push(writer);
- if (original instanceof HibernateProxy)
- original = ((HibernateProxy)original).getHibernateLazyInitializer().getImplementation();
- super.marshal(original, writer, context);
- } finally {
- writerStack.get().pop();
- }
- }
-
- @Override
- protected void marshallField(MarshallingContext context, Object newObj, Field field) {
- HierarchicalStreamWriter writer = writerStack.get().peek();
- if (field.getAnnotation(ManyToOne.class) != null) {
- super.marshallField(context, ((AbstractEntity) newObj).getId(), field);
- } else if (newObj instanceof HibernateProxy) {
- newObj = ((HibernateProxy)newObj).getHibernateLazyInitializer().getImplementation();
- super.marshallField(context, newObj, field);
- } else if (newObj instanceof VersionedDocument) {
- marshallElement(writer, ((VersionedDocument)newObj).getRootElement());
- } else if (Collection.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
- for (VersionedDocument vdom: (List<VersionedDocument>)newObj) {
- if (vdom != null) {
- marshallElement(writer, vdom.getRootElement());
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- }
- } else if (Map.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
- for (Map.Entry<Object, VersionedDocument> entry:
- ((Map<Object, VersionedDocument>)newObj).entrySet()) {
- writer.startNode(mapper.serializedClass(Map.Entry.class));
- if (entry.getKey() != null) {
- writer.startNode(mapper.serializedClass(entry.getKey().getClass()));
- context.convertAnother(entry.getKey());
- writer.endNode();
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- if (entry.getValue() != null) {
- marshallElement(writer, entry.getValue().getRootElement());
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- writer.endNode();
- }
- } else if (field.getType().isEnum()) {
- writer.setValue(((Enum)newObj).name());
- } else if (field.getType() == String.class) {
- String stringValue = (String) newObj;
- if (stringValue.indexOf('\0') != -1)
- writer.setValue(StringUtils.replace(stringValue, "\0", ""));
- else
- writer.setValue(stringValue);
- } else {
- super.marshallField(context, newObj, field);
- }
- }
-
- @Override
- public Object unmarshal(HierarchicalStreamReader reader,
- UnmarshallingContext context) {
- try {
- readerStack.get().push(reader);
- return super.unmarshal(reader, context);
- } finally {
- readerStack.get().pop();
- }
- }
-
- @Override
- protected Object unmarshallField(UnmarshallingContext context,
- Object result, Class type, Field field) {
- HierarchicalStreamReader reader = readerStack.get().peek();
- if (field.getAnnotation(ManyToOne.class) != null) {
- return AppLoader.getInstance(Dao.class).load(
- (Class<? extends AbstractEntity>) field.getType(),
- Long.valueOf(reader.getValue()));
- } else if (field.getType() == VersionedDocument.class) {
- VersionedDocument vdom = new VersionedDocument();
- reader.moveDown();
- unmarshallElement(reader, vdom);
- reader.moveUp();
- return vdom;
- } else if (Collection.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
- Collection collection;
- try {
- collection = (Collection) mapper.defaultImplementationOf(
- field.getType()).newInstance();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- if (!reader.getNodeName().equals("null")) {
- VersionedDocument vdom = new VersionedDocument();
- unmarshallElement(reader, vdom);
- collection.add(vdom);
- } else {
- collection.add(null);
- }
- reader.moveUp();
- }
- return collection;
- } else if (Map.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
- Map map;
- try {
- map = (Map) mapper.defaultImplementationOf(field.getType()).newInstance();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- reader.moveDown();
- Class keyType = HierarchicalStreams.readClassType(reader, mapper);
- Object key;
- if (!reader.getNodeName().equals("null"))
- key = context.convertAnother(reader, keyType);
- else
- key = null;
- reader.moveUp();
- reader.moveDown();
- if (!reader.getNodeName().equals("null")) {
- VersionedDocument vdom = new VersionedDocument();
- unmarshallElement(reader, vdom);
- map.put(key, vdom);
- } else {
- map.put(key, null);
- }
- reader.moveUp();
- reader.moveUp();
- }
- return map;
- } else if (field.getType().isEnum()) {
- // process this separately since the default implementation
- // adds enum ordinal besides name for polymorphic enums
- // (for example Subscription.Condition)
- return Enum.valueOf((Class)field.getType(), reader.getValue());
- } else {
- return super.unmarshallField(context, result, type, field);
- }
- }
-
- public boolean canConvert(Class clazz) {
- return !ClassUtils.isSystemType(clazz) && clazz != PersistentBag.class;
- }
-
- private void marshallElement(HierarchicalStreamWriter writer, Element element) {
- writer.startNode(element.getName());
- for (Attribute attribute: (List<Attribute>)element.attributes())
- writer.addAttribute(attribute.getName(), attribute.getValue());
- if (element.getText().trim().length() != 0)
- writer.setValue(element.getText().trim());
- for (Element child: (List<Element>)element.elements())
- marshallElement(writer, child);
- writer.endNode();
- }
-
- private void unmarshallElement(HierarchicalStreamReader reader, Branch branch) {
- Element element = branch.addElement(reader.getNodeName());
- for (int i=0; i<reader.getAttributeCount(); i++) {
- String attributeName = reader.getAttributeName(i);
- String attributeValue = reader.getAttribute(i);
- element.addAttribute(attributeName, attributeValue);
- }
- if (StringUtils.isNotBlank(reader.getValue()))
- element.setText(reader.getValue().trim());
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- unmarshallElement(reader, element);
- reader.moveUp();
- }
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java b/server-core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java
deleted file mode 100644
index f7361efbc4..0000000000
--- a/server-core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.onedev.server.migration;
-
-import java.util.ArrayList;
-
-import org.hibernate.collection.internal.PersistentBag;
-
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.collections.CollectionConverter;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.mapper.Mapper;
-
-@SuppressWarnings({ "unchecked", "rawtypes" })
-public class PersistentBagConverter extends CollectionConverter {
-
- public PersistentBagConverter(Mapper mapper) {
- super(mapper);
- }
-
- public void marshal(Object source, HierarchicalStreamWriter writer,
- MarshallingContext context) {
- source = new ArrayList((PersistentBag)source);
- super.marshal(source, writer, context);
- }
-
- public boolean canConvert(Class type) {
- return type == PersistentBag.class;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java b/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java
index 58928f0430..2b8836914a 100644
--- a/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java
+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java
@@ -19,6 +19,7 @@ import javax.annotation.Nullable;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.ObjectUtils.Null;
+import org.dom4j.Attribute;
import org.dom4j.Branch;
import org.dom4j.Comment;
import org.dom4j.Document;
@@ -41,6 +42,8 @@ import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.core.util.HierarchicalStreams;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.xml.Dom4JReader;
import com.thoughtworks.xstream.io.xml.Dom4JWriter;
import com.thoughtworks.xstream.mapper.CannotResolveClassException;
@@ -48,6 +51,7 @@ import com.thoughtworks.xstream.mapper.CannotResolveClassException;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
public final class VersionedDocument implements Document, Externalizable {
@@ -512,4 +516,41 @@ public final class VersionedDocument implements Document, Externalizable {
wrapped = null;
}
+ public void marshall(HierarchicalStreamWriter writer) {
+ marshallElement(writer, getRootElement());
+ }
+
+ private void marshallElement(HierarchicalStreamWriter writer, Element element) {
+ writer.startNode(element.getName());
+ for (Attribute attribute: (List<Attribute>)element.attributes())
+ writer.addAttribute(attribute.getName(), attribute.getValue());
+ if (element.getText().trim().length() != 0)
+ writer.setValue(element.getText().trim());
+ for (Element child: (List<Element>)element.elements())
+ marshallElement(writer, child);
+ writer.endNode();
+ }
+
+ public static VersionedDocument unmarshall(HierarchicalStreamReader reader) {
+ VersionedDocument dom = new VersionedDocument();
+ unmarshallElement(reader, dom);
+ return dom;
+ }
+
+ private static void unmarshallElement(HierarchicalStreamReader reader, Branch branch) {
+ Element element = branch.addElement(reader.getNodeName());
+ for (int i=0; i<reader.getAttributeCount(); i++) {
+ String attributeName = reader.getAttributeName(i);
+ String attributeValue = reader.getAttribute(i);
+ element.addAttribute(attributeName, attributeValue);
+ }
+ if (StringUtils.isNotBlank(reader.getValue()))
+ element.setText(reader.getValue().trim());
+ while (reader.hasMoreChildren()) {
+ reader.moveDown();
+ unmarshallElement(reader, element);
+ reader.moveUp();
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/migrate25_roles.xml b/server-core/src/main/java/io/onedev/server/migration/migrate25_roles.xml
new file mode 100644
index 0000000000..d621ca2d16
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/migration/migrate25_roles.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<list>
+ <io.onedev.server.model.Role revision="0.0">
+ <id>1</id>
+ <name>Manager</name>
+ <manageProject>true</manageProject>
+ <managePullRequests>false</managePullRequests>
+ <manageCodeComments>false</manageCodeComments>
+ <codePrivilege>NONE</codePrivilege>
+ <manageIssues>false</manageIssues>
+ <scheduleIssues>false</scheduleIssues>
+ <editableIssueFields/>
+ <jobPrivileges/>
+ </io.onedev.server.model.Role>
+ <io.onedev.server.model.Role revision="0.0">
+ <id>2</id>
+ <name>Developer</name>
+ <manageProject>false</manageProject>
+ <managePullRequests>false</managePullRequests>
+ <manageCodeComments>false</manageCodeComments>
+ <codePrivilege>WRITE</codePrivilege>
+ <manageIssues>false</manageIssues>
+ <scheduleIssues>true</scheduleIssues>
+ <editableIssueFields>
+ <string>Type</string>
+ <string>Priority</string>
+ <string>Assignee</string>
+ <string>Resolution</string>
+ <string>Duplicate With</string>
+ </editableIssueFields>
+ <jobPrivileges>
+ <io.onedev.server.model.support.role.JobPrivilege>
+ <jobNames>*</jobNames>
+ <manageJob>false</manageJob>
+ <runJob>true</runJob>
+ <accessLog>false</accessLog>
+ </io.onedev.server.model.support.role.JobPrivilege>
+ </jobPrivileges>
+ </io.onedev.server.model.Role>
+ <io.onedev.server.model.Role revision="0.0">
+ <id>3</id>
+ <name>Tester</name>
+ <manageProject>false</manageProject>
+ <managePullRequests>false</managePullRequests>
+ <manageCodeComments>false</manageCodeComments>
+ <codePrivilege>READ</codePrivilege>
+ <manageIssues>false</manageIssues>
+ <scheduleIssues>true</scheduleIssues>
+ <editableIssueFields>
+ <string>Type</string>
+ <string>Priority</string>
+ <string>Assignee</string>
+ <string>Resolution</string>
+ <string>Duplicate With</string>
+ </editableIssueFields>
+ <jobPrivileges>
+ <io.onedev.server.model.support.role.JobPrivilege>
+ <jobNames>*</jobNames>
+ <manageJob>false</manageJob>
+ <runJob>false</runJob>
+ <accessLog>true</accessLog>
+ </io.onedev.server.model.support.role.JobPrivilege>
+ </jobPrivileges>
+ </io.onedev.server.model.Role>
+ <io.onedev.server.model.Role revision="0.0">
+ <id>4</id>
+ <name>Reporter</name>
+ <manageProject>false</manageProject>
+ <managePullRequests>false</managePullRequests>
+ <manageCodeComments>false</manageCodeComments>
+ <codePrivilege>NONE</codePrivilege>
+ <manageIssues>false</manageIssues>
+ <scheduleIssues>false</scheduleIssues>
+ <editableIssueFields>
+ <string>Type</string>
+ <string>Priority</string>
+ </editableIssueFields>
+ <jobPrivileges>
+ <io.onedev.server.model.support.role.JobPrivilege>
+ <jobNames>*</jobNames>
+ <manageJob>false</manageJob>
+ <runJob>false</runJob>
+ <accessLog>false</accessLog>
+ </io.onedev.server.model.support.role.JobPrivilege>
+ </jobPrivileges>
+ </io.onedev.server.model.Role>
+</list>
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index f0264fe503..3896bbd3dc 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -54,10 +54,10 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.ComponentContext;
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 6ac30624f8..be87715ff6 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -33,10 +33,10 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.storage.AttachmentStorageSupport;
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 0843645ef9..eecda55e36 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -38,9 +38,9 @@ import com.google.common.collect.Sets;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.issue.fieldspec.FieldSpec;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index e4028f124e..c642bdab8c 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -74,7 +74,6 @@ import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildQuerySettingManager;
import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
@@ -96,6 +95,7 @@ import io.onedev.server.git.command.BlameCommand;
import io.onedev.server.git.command.ListChangedFilesCommand;
import io.onedev.server.git.exception.NotFileException;
import io.onedev.server.git.exception.ObjectNotFoundException;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.migration.VersionedDocument;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.support.BranchProtection;
@@ -257,27 +257,14 @@ public class Project extends AbstractEntity {
private ProjectPullRequestSetting pullRequestSetting = new ProjectPullRequestSetting();
@Lob
- @Column(length=65535, nullable=false)
+ @Column(length=65535)
@JsonView(DefaultView.class)
- private ArrayList<NamedCommitQuery> namedCommitQueries = new ArrayList<>();
- {
- namedCommitQueries.add(new NamedCommitQuery("All", "all"));
- namedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));
- namedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));
- namedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));
- namedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));
- }
+ private ArrayList<NamedCommitQuery> namedCommitQueries;
@Lob
- @Column(length=65535, nullable=false)
+ @Column(length=65535)
@JsonView(DefaultView.class)
- private ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries = new ArrayList<>();
- {
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));
- }
+ private ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries;
@Lob
@Column(length=65535, nullable=false)
@@ -994,6 +981,14 @@ public class Project extends AbstractEntity {
}
public ArrayList<NamedCommitQuery> getNamedCommitQueries() {
+ if (namedCommitQueries == null) {
+ namedCommitQueries = new ArrayList<>();
+ namedCommitQueries.add(new NamedCommitQuery("All", "all"));
+ namedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));
+ namedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));
+ namedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));
+ namedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));
+ }
return namedCommitQueries;
}
@@ -1002,6 +997,13 @@ public class Project extends AbstractEntity {
}
public ArrayList<NamedCodeCommentQuery> getNamedCodeCommentQueries() {
+ if (namedCodeCommentQueries == null) {
+ namedCodeCommentQueries = new ArrayList<>();
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));
+ }
return namedCodeCommentQueries;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index e7cff9c02d..5f377fc585 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -41,10 +41,10 @@ import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.pullrequest.CloseInfo;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java b/server-core/src/main/java/io/onedev/server/model/support/WebHook.java
index d2d120df1e..62500c2dfa 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/WebHook.java
@@ -1,6 +1,7 @@
package io.onedev.server.model.support;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.Size;
@@ -68,7 +69,7 @@ public class WebHook implements Serializable {
private String postUrl;
- private List<EventType> eventTypes;
+ private List<EventType> eventTypes = new ArrayList<>();
private String secret = RandomStringUtils.randomAlphanumeric(20);
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index b865ef7796..fc230d2a38 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -12,7 +12,6 @@ import javax.inject.Singleton;
import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
@@ -22,6 +21,7 @@ import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 5b7a3f9476..b73d079b25 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -16,7 +16,6 @@ import org.hibernate.type.Type;
import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
@@ -31,6 +30,7 @@ import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 779e982c67..bc5d514831 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -12,9 +12,9 @@ import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index 8f0aa6bb5d..d20c82cfc4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -52,7 +52,8 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public String toString() {
- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CREATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);
+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CREATE_DATE) + " "
+ + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index 794532ba46..52f1da1c5a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index 8c6e0d6dd5..9a59e7f908 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CodeCommentRelationInfoManager;
-import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
index daa4e46782..7c17ab85a2 100644
--- a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
@@ -49,6 +49,12 @@ public class DefaultStorageManager implements StorageManager {
return projectDir;
}
+ private File getUserDir(Long userId) {
+ File userDir = new File(getUsersDir(), String.valueOf(userId));
+ FileUtils.createDir(userDir);
+ return userDir;
+ }
+
@Override
public File getProjectGitDir(Long projectId) {
File gitDir = new File(getProjectDir(projectId), "git");
@@ -139,9 +145,9 @@ public class DefaultStorageManager implements StorageManager {
@Override
public File getUserInfoDir(Long userId) {
- File userDir = new File(getUsersDir(), String.valueOf(userId));
- FileUtils.createDir(userDir);
- return userDir;
+ File infoDir = new File(getUserDir(userId), "info");
+ FileUtils.createDir(infoDir);
+ return infoDir;
}
private File getBuildsDir(Long projectId) {
diff --git a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java b/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
index bd35a22d4a..f4bdd83b39 100644
--- a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
+++ b/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
@@ -29,7 +29,7 @@ public class CodeCommentConstants {
public static final String FIELD_CREATE_DATE = "Create Date";
- public static final String ATTR_CREATE_DATE = "date";
+ public static final String ATTR_CREATE_DATE = "createDate";
public static final String FIELD_UPDATE_DATE = "Update Date";
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java
new file mode 100644
index 0000000000..a479efb34a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java
@@ -0,0 +1,54 @@
+package io.onedev.server.util.xstream;
+
+import java.util.ArrayList;
+
+import org.hibernate.collection.internal.PersistentBag;
+
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
+
+import io.onedev.server.migration.VersionedDocument;
+
+public class CollectionConverter extends com.thoughtworks.xstream.converters.collections.CollectionConverter {
+
+ public CollectionConverter(Mapper mapper) {
+ super(mapper);
+ }
+
+ public CollectionConverter(Mapper mapper, Class<?> type) {
+ super(mapper, type);
+ }
+
+ @Override
+ public boolean canConvert(@SuppressWarnings("rawtypes") Class clazz) {
+ return super.canConvert(clazz) || clazz == PersistentBag.class;
+ }
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ @Override
+ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+ if (source instanceof PersistentBag)
+ source = new ArrayList((PersistentBag)source);
+ super.marshal(source, writer, context);
+ }
+
+ @Override
+ protected void writeCompleteItem(Object item, MarshallingContext context, HierarchicalStreamWriter writer) {
+ if (item instanceof VersionedDocument)
+ ((VersionedDocument)item).marshall(writer);
+ else
+ super.writeCompleteItem(item, context, writer);
+ }
+
+ @Override
+ protected Object readCompleteItem(HierarchicalStreamReader reader, UnmarshallingContext context, Object current) {
+ if (reader.getAttribute("revision") != null)
+ return VersionedDocument.unmarshall(reader);
+ else
+ return super.readCompleteItem(reader, context, current);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyConverter.java
new file mode 100644
index 0000000000..3401df969e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyConverter.java
@@ -0,0 +1,30 @@
+package io.onedev.server.util.xstream;
+
+import org.hibernate.proxy.HibernateProxy;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+public class HibernateProxyConverter implements Converter {
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public boolean canConvert(Class type) {
+ return HibernateProxy.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+ Object implementation = ((HibernateProxy)source).getHibernateLazyInitializer().getImplementation();
+ context.convertAnother(implementation);
+ }
+
+ @Override
+ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
+ throw new IllegalStateException();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/MapConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/MapConverter.java
new file mode 100644
index 0000000000..0187e42b1f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/MapConverter.java
@@ -0,0 +1,37 @@
+package io.onedev.server.util.xstream;
+
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
+
+import io.onedev.server.migration.VersionedDocument;
+
+public class MapConverter extends com.thoughtworks.xstream.converters.collections.MapConverter {
+
+ public MapConverter(Mapper mapper) {
+ super(mapper);
+ }
+
+ public MapConverter(Mapper mapper, Class<?> type) {
+ super(mapper, type);
+ }
+
+ @Override
+ protected void writeCompleteItem(Object item, MarshallingContext context, HierarchicalStreamWriter writer) {
+ if (item instanceof VersionedDocument)
+ ((VersionedDocument)item).marshall(writer);
+ else
+ super.writeCompleteItem(item, context, writer);
+ }
+
+ @Override
+ protected Object readCompleteItem(HierarchicalStreamReader reader, UnmarshallingContext context, Object current) {
+ if (reader.getAttribute("revision") != null)
+ return VersionedDocument.unmarshall(reader);
+ else
+ return super.readCompleteItem(reader, context, current);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java
new file mode 100644
index 0000000000..5a3d5c2716
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java
@@ -0,0 +1,46 @@
+package io.onedev.server.util.xstream;
+
+import java.lang.reflect.Field;
+
+import javax.persistence.ManyToOne;
+
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
+import com.thoughtworks.xstream.mapper.Mapper;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.persistence.dao.Dao;
+
+public class ReflectionConverter extends com.thoughtworks.xstream.converters.reflection.ReflectionConverter {
+
+ public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
+ super(mapper, reflectionProvider);
+ }
+
+ @SuppressWarnings("rawtypes")
+ public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider, Class type) {
+ super(mapper, reflectionProvider, type);
+ }
+
+ @Override
+ protected void marshallField(MarshallingContext context, Object newObj, Field field) {
+ if (field.getAnnotation(ManyToOne.class) != null)
+ super.marshallField(context, ((AbstractEntity) newObj).getId(), field);
+ else
+ super.marshallField(context, newObj, field);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ protected Object unmarshallField(UnmarshallingContext context, Object result, Class type, Field field) {
+ if (field.getAnnotation(ManyToOne.class) != null) {
+ Long entityId = (Long) context.convertAnother(context.currentObject(), Long.class);
+ return AppLoader.getInstance(Dao.class).load((Class<? extends AbstractEntity>) field.getType(), entityId);
+ } else {
+ return super.unmarshallField(context, result, type, field);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java
new file mode 100644
index 0000000000..4dea67a859
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java
@@ -0,0 +1,20 @@
+package io.onedev.server.util.xstream;
+
+import io.onedev.commons.utils.StringUtils;
+
+public class StringConverter extends com.thoughtworks.xstream.converters.basic.StringConverter {
+
+ @Override
+ public Object fromString(String str) {
+ return super.fromString(str);
+ }
+
+ @Override
+ public String toString(Object obj) {
+ String string = (String) obj;
+ if (string != null && string.indexOf('\0') != -1)
+ string = StringUtils.replace(string, "\0", "");
+ return super.toString(string);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/VersionedDocumentConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/VersionedDocumentConverter.java
new file mode 100644
index 0000000000..197092b872
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/VersionedDocumentConverter.java
@@ -0,0 +1,29 @@
+package io.onedev.server.util.xstream;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+import io.onedev.server.migration.VersionedDocument;
+
+public class VersionedDocumentConverter implements Converter {
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public boolean canConvert(Class type) {
+ return type == VersionedDocument.class;
+ }
+
+ @Override
+ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+ ((VersionedDocument)source).marshall(writer);
+ }
+
+ @Override
+ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
+ return VersionedDocument.unmarshall(reader);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index b02a9aa332..c299bfa140 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -21,8 +21,8 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.match.PatternApplied;
import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.git.NameAndEmail;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index ecb62617d2..269cfb792a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -37,9 +37,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.html
index a9237350ae..51fd48c395 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="invalid-code-comment">
+ <div class="invalid-code-comment alert alert-danger">
<div class="head">
Unable to show code comment as associated commit no longer exists in the underlying git repository
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
index 6108b62d62..9689603093 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
@@ -109,9 +109,8 @@
}
.invalid-code-comment>.head {
- font-size: 20px;
+ font-size: 18px;
font-weight: bold;
- color: #444;
margin-bottom: 20px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
index 35d611c823..e98d6460e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -21,9 +21,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CodeCommentRelationInfoManager;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.SecurityUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index 39b3dc71f2..3702b23cee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -17,7 +17,7 @@
<img wicket:id="icon">
<span>Revision indexing in progress... (search in this revision will be accurate after indexed)</span>
</div>
- <div wicket:id="ciSupportNote" class="ci-support-note"><i class="fa fa-info-circle"></i> Enable build support by <a wicket:id="addFile"></a></div>
+ <div wicket:id="buildSupportNote" class="build-support-note"><i class="fa fa-info-circle"></i> Enable build support by <a wicket:id="addFile"></a></div>
<div wicket:id="blobContent" class="blob-content"></div>
<div wicket:id="searchResult" class="search-result">
<div id="search-result-resize-handle" class="ui-resizable-handle ui-resizable-n"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 85104d8e8e..00fd2ea8be 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -245,7 +245,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
});
- newCISupportNote(null);
+ newBuildSupportNote(null);
newBlobContent(null);
add(searchResult = new WebMarkupContainer("searchResult"));
@@ -709,14 +709,17 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
}
}
- private void newCISupportNote(@Nullable AjaxRequestTarget target) {
- Component ciSupportNote = new WebMarkupContainer("ciSupportNote") {
+ private void newBuildSupportNote(@Nullable AjaxRequestTarget target) {
+ Component buildSupportNote = new WebMarkupContainer("buildSupportNote") {
@Override
protected void onInitialize() {
super.onInitialize();
- if (SecurityUtils.canModify(getProject(), state.blobIdent.revision, BuildSpec.BLOB_PATH)) {
+ String branch = state.blobIdent.revision;
+ if (branch == null)
+ branch = "master";
+ if (SecurityUtils.canModify(getProject(), branch, BuildSpec.BLOB_PATH)) {
add(new ViewStateAwareAjaxLink<Void>("addFile") {
@Override
@@ -758,10 +761,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
};
if (target != null) {
- replace(ciSupportNote);
- target.add(ciSupportNote);
+ replace(buildSupportNote);
+ target.add(buildSupportNote);
} else {
- add(ciSupportNote);
+ add(buildSupportNote);
}
}
@@ -840,7 +843,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
target.add(revisionIndexing);
newBlobNavigator(target);
newBlobOperations(target);
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
}
@@ -946,7 +949,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
state = popState;
newBlobNavigator(target);
newBlobOperations(target);
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
}
@@ -1005,7 +1008,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
state.commentId = null;
newBlobNavigator(target);
newBlobOperations(target);
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
@@ -1017,14 +1020,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
} else {
state.mode = Mode.VIEW;
newBlobOperations(target);
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
}
} else if (prevPosition != null) {
state.mode = Mode.VIEW;
newBlobOperations(target);
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
}
@@ -1129,7 +1132,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
newBlobOperations(target);
}
}
- newCISupportNote(target);
+ newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
index f09de26bd9..07d008eead 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
@@ -101,7 +101,7 @@ body.ProjectBlobPage.additionalWidth3 {
color: #8a6d3b;
font-size: 13px;
}
-#project-blob>.ci-support-note {
+#project-blob>.build-support-note {
padding: 8px;
border-bottom: 1px solid #DDD;
background: #E5FBE5;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 8203ce1da3..bdac92b481 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -47,12 +47,12 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.CodeComment;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 539707a98d..971f6732b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -21,10 +21,10 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index e186f4eb3b..6ef575943e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -25,10 +25,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.issue.fieldspec.FieldSpec;
import io.onedev.server.model.Issue;
import io.onedev.server.util.SecurityUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
index 149894301a..1e52bd5535 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="invalid-pullrequest">
+ <div class="invalid-pullrequest alert alert-danger">
<div class="head">
Unable to show pull request as some commits no longer exist in the underlying git repository
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 71f880900e..8582dfee32 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -80,11 +80,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
-import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
index 182894bcd4..dc87228930 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
@@ -10,7 +10,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.UserInfoManager;
+import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.SecurityUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-pullrequest.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-pullrequest.css
index 81d35e19a4..21b803c85d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-pullrequest.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-pullrequest.css
@@ -1,10 +1,5 @@
-.invalid-pullrequest {
- margin: 20px;
-}
-
.invalid-pullrequest>.head {
- font-size: 20px;
+ font-size: 18px;
font-weight: bold;
- color: #444;
margin-bottom: 20px;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index c15755a98d..2936318052 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.git.Contribution;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.util.Day;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index 610b89f3d8..7ec821055a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.util.Day;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
index 6cbd89c987..ffa00f6256 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
@@ -14,9 +14,9 @@ import org.apache.wicket.request.resource.AbstractResource;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.git.Contribution;
import io.onedev.server.git.Contributor;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.Day;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 7b0fc1bbc0..db091bf423 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,11 +1,19 @@
package io.onedev.server.web.page.test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.Pair;
+import io.onedev.server.migration.VersionedDocument;
+import io.onedev.server.model.support.WebHook;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -34,4 +42,17 @@ public class TestPage extends BasePage {
response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));
}
+ public static class Bean {
+ public Map<String, VersionedDocument> doms = new HashMap<>();
+
+ public List<String> names = new ArrayList<>();
+
+ public List<WebHook.EventType> events = new ArrayList<>();
+
+ public VersionedDocument dom;
+
+ public WebHook.EventType event;
+
+ public Pair<String, String> pair = new Pair<>("fi\0rst", "second");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index d737ac5210..08e6da3c94 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -30,7 +30,6 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
-import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueManager;
@@ -40,6 +39,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;