The Unified and Autonomous Development Platform
Rename entity package as model and remove Migrator interface
robin shinea3ce7881d653
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex 4e98677816..ad69058641 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -35,12 +35,11 @@ import org.pegdown.Parser;import org.pegdown.plugins.ToHtmlSerializerPlugin;import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.launcher.bootstrap.Bootstrap;+import com.gitplex.launcher.bootstrap.Command;import com.gitplex.launcher.loader.AbstractPlugin;import com.gitplex.launcher.loader.AbstractPluginModule;import com.gitplex.launcher.loader.ImplementationProvider;-import com.gitplex.launcher.loader.LoaderUtils;-import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.launcher.bootstrap.Command;import com.gitplex.server.command.DefaultApplyDBConstraintsCommand;import com.gitplex.server.command.DefaultBackupCommand;import com.gitplex.server.command.DefaultCheckDataVersionCommand;@@ -49,7 +48,6 @@ import com.gitplex.server.command.DefaultDBDialectCommand;import com.gitplex.server.command.DefaultRestoreCommand;import com.gitplex.server.command.DefaultUpgradeCommand;import com.gitplex.server.command.ResetAdminPasswordCommand;-import com.gitplex.server.entity.EntityLocator;import com.gitplex.server.git.config.GitConfig;import com.gitplex.server.git.config.SpecifiedGit;import com.gitplex.server.git.config.SystemGit;@@ -120,18 +118,13 @@ import com.gitplex.server.manager.impl.DefaultTeamMembershipManager;import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;import com.gitplex.server.manager.impl.DefaultVisitInfoManager;import com.gitplex.server.manager.impl.DefaultWorkExecutor;-import com.gitplex.server.migration.DatabaseMigrator;import com.gitplex.server.migration.JpaConverter;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.migration.PersistentBagConverter;-import com.gitplex.server.migration.VersionTable;-import com.gitplex.server.persistence.AbstractEntity;import com.gitplex.server.persistence.DefaultIdManager;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.DefaultUnitOfWork;import com.gitplex.server.persistence.HibernateInterceptor;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.PersistListener;import com.gitplex.server.persistence.PersistManager;import com.gitplex.server.persistence.PrefixedNamingStrategy;@@ -236,20 +229,6 @@ public class CoreModule extends AbstractPluginModule {configurePersistence();- bind(Migrator.class).to(DatabaseMigrator.class);-- contribute(ModelProvider.class, new ModelProvider() {-- @Override- public Collection<Class<? extends AbstractEntity>> getModelClasses() {- Collection<Class<? extends AbstractEntity>> modelClasses =- new HashSet<Class<? extends AbstractEntity>>();- modelClasses.addAll(LoaderUtils.findImplementations(AbstractEntity.class, EntityLocator.class));- return modelClasses;- }-- });-/** Contribute empty reservations to avoid Guice complain*/@@ -417,16 +396,6 @@ public class CoreModule extends AbstractPluginModule {}});- contribute(ModelProvider.class, new ModelProvider() {-- @SuppressWarnings("unchecked")- @Override- public Collection<Class<? extends AbstractEntity>> getModelClasses() {- return Lists.newArrayList(VersionTable.class);- }-- });-// put your guice bindings herebind(XStream.class).toProvider(new com.google.inject.Provider<XStream>() {diff --git a/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.javaindex 7e0fb8f582..04acf46788 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java@@ -3,7 +3,6 @@ package com.gitplex.server.command;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;-import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -16,11 +15,9 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.validation.EntityValidator;@@ -30,10 +27,10 @@ public class DefaultApplyDBConstraintsCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultApplyDBConstraintsCommand.class);@Inject- public DefaultApplyDBConstraintsCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultApplyDBConstraintsCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.javaindex e143b0e295..c1f04b96c9 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java@@ -1,7 +1,6 @@package com.gitplex.server.command;import java.io.File;-import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -12,17 +11,15 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Throwables;import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.launcher.bootstrap.BootstrapUtils;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.validation.EntityValidator;+import com.google.common.base.Throwables;@Singletonpublic class DefaultBackupCommand extends DefaultPersistManager {@@ -30,10 +27,10 @@ public class DefaultBackupCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultBackupCommand.class);@Inject- public DefaultBackupCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultBackupCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.javaindex 76cff53549..1833d9de87 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java@@ -1,7 +1,5 @@package com.gitplex.server.command;-import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;@@ -12,11 +10,9 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.validation.EntityValidator;@@ -26,10 +22,10 @@ public class DefaultCheckDataVersionCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultCheckDataVersionCommand.class);@Inject- public DefaultCheckDataVersionCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultCheckDataVersionCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.javaindex 92d3cae4f9..eb549cb179 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java@@ -1,7 +1,5 @@package com.gitplex.server.command;-import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;@@ -13,11 +11,9 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.validation.EntityValidator;@@ -27,10 +23,10 @@ public class DefaultCleanCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultCleanCommand.class);@Inject- public DefaultCleanCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultCleanCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.javaindex 932ce029d1..e2af6ce084 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java@@ -1,7 +1,5 @@package com.gitplex.server.command;-import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;@@ -9,11 +7,9 @@ import org.hibernate.Interceptor;import org.hibernate.SessionFactory;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.validation.EntityValidator;@@ -21,10 +17,10 @@ import com.gitplex.server.util.validation.EntityValidator;public class DefaultDBDialectCommand extends DefaultPersistManager {@Inject- public DefaultDBDialectCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultDBDialectCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.javaindex 7e259a91d8..3bebc352f4 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java@@ -1,7 +1,6 @@package com.gitplex.server.command;import java.io.File;-import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -15,11 +14,9 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.launcher.bootstrap.BootstrapUtils;import com.gitplex.launcher.bootstrap.Command;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.validation.EntityValidator;@@ -30,10 +27,10 @@ public class DefaultRestoreCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultRestoreCommand.class);@Inject- public DefaultRestoreCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultRestoreCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);}@Overridediff --git a/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.javaindex 0aa8bc798f..873c368ded 100644--- a/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java+++ b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java@@ -2,7 +2,6 @@ package com.gitplex.server.command;import java.io.File;import java.io.IOException;-import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;@@ -17,14 +16,13 @@ import org.joda.time.format.DateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.launcher.loader.PluginManager;import com.gitplex.launcher.bootstrap.Bootstrap;+import com.gitplex.launcher.loader.PluginManager;+import com.gitplex.server.migration.DatabaseMigrator;import com.gitplex.server.migration.MigrationHelper;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.execution.Commandline;@@ -41,10 +39,10 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {private final String appName;@Inject- public DefaultUpgradeCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultUpgradeCommand(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator, PluginManager pluginManager) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor, idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);appName = pluginManager.getProduct().getName();}@@ -167,7 +165,7 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {}restoreExecutables(upgradeBackup);- if (!MigrationHelper.getVersion(migrator.getClass()).equals(oldDataVersion.get())) {+ if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());backupDB(upgradeDir, dbBackup);@@ -175,7 +173,7 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {} else {// for non-embedded database, we should include database backup in the old installation backup directory// in case we need that for database restore after a failed upgrade- if (!MigrationHelper.getVersion(migrator.getClass()).equals(oldDataVersion.get())) {+ if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());backupDB(upgradeDir, dbBackup);diff --git a/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.javaindex 633c52292e..92ca60e398 100644--- a/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java+++ b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java@@ -1,7 +1,5 @@package com.gitplex.server.command;-import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;@@ -13,13 +11,11 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.migration.Migrator;+import com.gitplex.server.model.Account;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;-import com.gitplex.server.persistence.ModelProvider;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.validation.EntityValidator;@@ -33,12 +29,10 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {private final PasswordService passwordService;@Inject- public ResetAdminPasswordCommand(Set<ModelProvider> modelProviders,- PhysicalNamingStrategy physicalNamingStrategy, HibernateProperties properties,- Migrator migrator, Interceptor interceptor, IdManager idManager, Dao dao,+ public ResetAdminPasswordCommand(PhysicalNamingStrategy physicalNamingStrategy, HibernateProperties properties,+ Interceptor interceptor, IdManager idManager, Dao dao,EntityValidator validator, AccountManager accountManager, PasswordService passwordService) {- super(modelProviders, physicalNamingStrategy, properties, migrator, interceptor,- idManager, dao, validator);+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);this.accountManager = accountManager;this.passwordService = passwordService;}diff --git a/core/src/main/java/com/gitplex/server/entity/EntityLocator.java b/core/src/main/java/com/gitplex/server/entity/EntityLocator.javadeleted file mode 100644index f6678da9b9..0000000000--- a/core/src/main/java/com/gitplex/server/entity/EntityLocator.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.server.entity;--public class EntityLocator {--}diff --git a/core/src/main/java/com/gitplex/server/event/RefUpdated.java b/core/src/main/java/com/gitplex/server/event/RefUpdated.javaindex c8a526c053..1043f18e00 100644--- a/core/src/main/java/com/gitplex/server/event/RefUpdated.java+++ b/core/src/main/java/com/gitplex/server/event/RefUpdated.java@@ -2,7 +2,7 @@ package com.gitplex.server.event;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public class RefUpdated {diff --git a/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java b/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.javaindex 59b3b6bd2f..0cf3ea466c 100644--- a/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java+++ b/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java@@ -1,6 +1,6 @@package com.gitplex.server.event;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;public class TaskChangeEvent {diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.javaindex ebad62650e..7746fc396f 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java@@ -2,10 +2,10 @@ package com.gitplex.server.event.codecomment;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CodeCommentActivity;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CodeCommentActivity;public abstract class CodeCommentActivityEvent extends CodeCommentEvent {diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.javaindex b8681120ed..18424f4be0 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java@@ -2,8 +2,8 @@ package com.gitplex.server.event.codecomment;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="created")diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.javaindex 3a6fb851d9..d189113ef7 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java@@ -2,9 +2,9 @@ package com.gitplex.server.event.codecomment;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;public abstract class CodeCommentEvent implements MarkdownAware {diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.javaindex 6bd1a37d1f..f0e0158245 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java@@ -1,9 +1,9 @@package com.gitplex.server.event.codecomment;-import com.gitplex.server.entity.CodeCommentReply;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentReplied;+import com.gitplex.server.model.CodeCommentReply;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="replied")diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.javaindex b79078c040..2d4adeb5c4 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java@@ -1,9 +1,9 @@package com.gitplex.server.event.codecomment;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentResolved;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="resolved")diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.javaindex c62785f19c..35122b3579 100644--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java@@ -1,9 +1,9 @@package com.gitplex.server.event.codecomment;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentUnresolved;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="unresolved")diff --git a/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java b/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.javaindex e23f6d43a2..d65babe356 100644--- a/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java@@ -1,6 +1,6 @@package com.gitplex.server.event.depot;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public class DepotDeleted {diff --git a/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java b/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.javaindex d45646cea7..a1f26daeac 100644--- a/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java@@ -1,6 +1,6 @@package com.gitplex.server.event.depot;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public class DepotRenamed {diff --git a/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java b/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.javaindex 6ee542b1f2..5c2df48919 100644--- a/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java@@ -1,7 +1,7 @@package com.gitplex.server.event.depot;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;public class DepotTransferred {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.javaindex a4cee3045c..281c90416d 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java@@ -2,8 +2,8 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;public class IntegrationPreviewCalculated extends PullRequestChangeEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.javaindex d2642159ba..3ca0ea7a07 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java@@ -4,8 +4,8 @@ import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;public abstract class PullRequestChangeEvent extends PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.javaindex e1a215bec8..66de463319 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java@@ -2,9 +2,9 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CodeCommentActivity;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CodeCommentActivity;public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.javaindex 196defdce3..605e97f5e6 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java@@ -2,10 +2,10 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="commented code")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.javaindex 4637c12e80..320f2a2545 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java@@ -1,8 +1,8 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;public abstract class PullRequestCodeCommentEvent extends PullRequestChangeEvent implements MarkdownAware {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.javaindex ada6f1af83..6bbac80236 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java@@ -1,7 +1,7 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.CodeCommentReply;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeCommentReply;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="replied code comment")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.javaindex b2eac36cb1..73ff3b19d4 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java@@ -1,7 +1,7 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="resolved code comment")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.javaindex 0366205807..e9772ab81e 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java@@ -1,7 +1,7 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="Unresolved code comment")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.javaindex c8b1f1b86a..e2838bc7cf 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java@@ -2,9 +2,9 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequestComment;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="commented")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.javaindex 3b720f8c2c..b6f96e5fb5 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java@@ -1,6 +1,6 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;public abstract class PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.javaindex fb5efc2b4d..b4d89e8229 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java@@ -2,9 +2,9 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="opened")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.javaindex 60e4cd6e3f..12694b8bdd 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java@@ -1,6 +1,6 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;public class PullRequestPendingApproval extends PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.javaindex 206bd920ea..c81fefeeef 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java@@ -1,6 +1,6 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;public class PullRequestPendingIntegration extends PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.javaindex a3a2d4ac02..f774f49443 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java@@ -1,6 +1,6 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;public class PullRequestPendingUpdate extends PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.javaindex abf3dfdfd2..970e2a9ecb 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java@@ -1,6 +1,6 @@package com.gitplex.server.event.pullrequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestReviewInvitation;public class PullRequestReviewInvitationChanged extends PullRequestEvent {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.javaindex b9be94777a..b98b725976 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java@@ -2,9 +2,9 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequestStatusChange;import com.gitplex.server.event.MarkdownAware;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequestStatusChange;public class PullRequestStatusChangeEvent extends PullRequestChangeEvent implements MarkdownAware {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.javaindex 335336459a..1ac0196aac 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java@@ -2,8 +2,8 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="has new commits")diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.javaindex 8b18cec4d8..4c383f9ec0 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java@@ -2,8 +2,8 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequestVerification;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequestVerification;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="ran verification", icon="fa fa-cog")diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.javaindex b82e6ccbb6..114b7d842e 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java@@ -6,14 +6,14 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.Failed;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.gatekeeper.checkresult.Ignored;import com.gitplex.server.gatekeeper.checkresult.Passed;import com.gitplex.server.gatekeeper.checkresult.Pending;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editablediff --git a/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.javaindex 31c8489889..2a91d6842d 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java@@ -7,8 +7,8 @@ import java.util.List;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;public abstract class AndOrGateKeeper extends CompositeGateKeeper {diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.javaindex 719547719d..8832039ada 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java@@ -6,11 +6,11 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.javaindex c14095b87b..a608c6154f 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java@@ -4,12 +4,12 @@ import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.util.editable.annotation.AccountChoice;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.javaindex da6ce3dfd9..bf46ad7b24 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java@@ -2,10 +2,10 @@ package com.gitplex.server.gatekeeper;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;public abstract class CompositeGateKeeper extends AbstractGateKeeper {diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.javaindex a8dbe68e12..2896fd0c56 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java@@ -3,12 +3,12 @@ package com.gitplex.server.gatekeeper;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.checkresult.Failed;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.gatekeeper.checkresult.Passed;import com.gitplex.server.gatekeeper.checkresult.Pending;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Horizontal;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.javaindex c1852fa165..c13e86e0b6 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java@@ -2,10 +2,10 @@ package com.gitplex.server.gatekeeper;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editablediff --git a/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.javaindex 4d968d8d3c..9b05309349 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java@@ -6,11 +6,11 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.javaindex 07ed26e247..402f9b805d 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java@@ -4,12 +4,12 @@ import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.util.editable.annotation.AccountChoice;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.javaindex aecf65d137..7999dbee72 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java@@ -6,10 +6,10 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@Editable(name="Misc")diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.javaindex 45582db073..b99f694e8e 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java@@ -3,11 +3,11 @@ package com.gitplex.server.gatekeeper;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.checkresult.Failed;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.gatekeeper.checkresult.Passed;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Horizontal;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java b/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.javaindex 61b12dfcaf..f78ca0bbba 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java@@ -7,10 +7,10 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.validation.Validatable;import com.gitplex.server.util.validation.annotation.ClassValidating;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java b/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.javaindex 5c60375083..e677bc738b 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java@@ -5,11 +5,11 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Throwables;import com.google.common.collect.Lists;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.ExceptionUtils;import com.gitplex.server.util.editable.annotation.Editable;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.javaindex 8e04b2924d..be7e64f587 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java@@ -7,10 +7,10 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.revwalk.RevWalkUtils;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.javaindex 16cf8f8e42..74dda30150 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java@@ -4,10 +4,10 @@ import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.javaindex d539dfdb03..dba4a06b13 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java@@ -4,11 +4,11 @@ import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.AccountChoice;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java b/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.javaindex ed8a1feac4..09f830d8a2 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java@@ -3,11 +3,11 @@ package com.gitplex.server.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.javaindex dbe47b7d99..5e660e09de 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java@@ -6,11 +6,11 @@ import java.util.HashSet;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.TeamChoice;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.javaindex 062663ce6e..878d69dc69 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java@@ -9,11 +9,11 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.PathMatch;import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.javaindex 447169dc64..8914e8aaa8 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java@@ -5,11 +5,11 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import com.gitplex.server.util.includeexclude.IncludeExcludeParser;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.RefMatch;import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;diff --git a/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java b/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.javaindex 0ae8a63996..f481ccfc2b 100644--- a/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java+++ b/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java@@ -7,13 +7,13 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestVerification;-import com.gitplex.server.entity.support.IntegrationPreview;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.manager.PullRequestVerificationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestVerification;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.collect.Lists;diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.javaindex bc04b4499f..fd6c1784be 100644--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java@@ -27,8 +27,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.command.AdvertiseReceiveRefsCommand;import com.gitplex.server.git.command.AdvertiseUploadRefsCommand;import com.gitplex.server.git.command.ReceiveCommand;@@ -37,6 +35,8 @@ import com.gitplex.server.git.exception.GitException;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.WorkExecutor;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.util.concurrent.PrioritizedRunnable;import com.gitplex.server.util.serverconfig.ServerConfig;diff --git a/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.javaindex dd9bf326af..92df427e38 100644--- a/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java@@ -21,10 +21,10 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.launcher.loader.LoaderUtils;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.StringUtils;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.javaindex 5fed0b07f0..451a09aab0 100644--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java@@ -18,13 +18,13 @@ import org.apache.shiro.SecurityUtils;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.launcher.loader.LoaderUtils;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.GateKeeper;import com.gitplex.server.gatekeeper.checkresult.Failed;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.util.StringUtils;diff --git a/core/src/main/java/com/gitplex/server/manager/AccountManager.java b/core/src/main/java/com/gitplex/server/manager/AccountManager.javaindex 7ca8a00280..c722a6e4b7 100644--- a/core/src/main/java/com/gitplex/server/manager/AccountManager.java+++ b/core/src/main/java/com/gitplex/server/manager/AccountManager.java@@ -6,7 +6,7 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.persistence.dao.EntityManager;public interface AccountManager extends EntityManager<Account> {diff --git a/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.javaindex ab40f87af8..cd596902d0 100644--- a/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java@@ -2,7 +2,7 @@ package com.gitplex.server.manager;import java.io.File;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public interface AttachmentManager {diff --git a/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.javaindex 64cfd87783..64c4605ed6 100644--- a/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java@@ -2,9 +2,9 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.BranchWatch;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.BranchWatch;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.EntityManager;public interface BranchWatchManager extends EntityManager<BranchWatch> {diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.javaindex 8c08675c93..50e453a8b6 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java@@ -5,8 +5,8 @@ import java.util.Map;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.CompareContext;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.CompareContext;public interface CodeCommentInfoManager {diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.javaindex 0b8ff17701..eaf954cdfc 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java@@ -7,10 +7,10 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.codecomment.CodeCommentEvent;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.EntityManager;public interface CodeCommentManager extends EntityManager<CodeComment> {diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.javaindex bbdb4ef963..c69a69f074 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java@@ -2,9 +2,9 @@ package com.gitplex.server.manager;import java.util.List;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentRelation;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentRelation;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.EntityManager;public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.javaindex 286e45b97e..ca818df566 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.CodeCommentReply;+import com.gitplex.server.model.CodeCommentReply;import com.gitplex.server.persistence.dao.EntityManager;public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.javaindex c9f16c643e..421daba891 100644--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.CodeCommentStatusChange;+import com.gitplex.server.model.CodeCommentStatusChange;import com.gitplex.server.persistence.dao.EntityManager;public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {diff --git a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.javaindex b6a5ac4ddc..f7669a964f 100644--- a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java@@ -5,8 +5,8 @@ import java.util.Set;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.NameAndEmail;+import com.gitplex.server.model.Depot;public interface CommitInfoManager {diff --git a/core/src/main/java/com/gitplex/server/manager/ConfigManager.java b/core/src/main/java/com/gitplex/server/manager/ConfigManager.javaindex a925bab480..67fa83538b 100644--- a/core/src/main/java/com/gitplex/server/manager/ConfigManager.java+++ b/core/src/main/java/com/gitplex/server/manager/ConfigManager.java@@ -2,11 +2,11 @@ package com.gitplex.server.manager;import javax.annotation.Nullable;-import com.gitplex.server.entity.Config;-import com.gitplex.server.entity.support.setting.BackupSetting;-import com.gitplex.server.entity.support.setting.MailSetting;-import com.gitplex.server.entity.support.setting.SecuritySetting;-import com.gitplex.server.entity.support.setting.SystemSetting;+import com.gitplex.server.model.Config;+import com.gitplex.server.model.support.setting.BackupSetting;+import com.gitplex.server.model.support.setting.MailSetting;+import com.gitplex.server.model.support.setting.SecuritySetting;+import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.persistence.dao.EntityManager;public interface ConfigManager extends EntityManager<Config> {diff --git a/core/src/main/java/com/gitplex/server/manager/DataManager.java b/core/src/main/java/com/gitplex/server/manager/DataManager.javaindex c7d617c74c..56686b283e 100644--- a/core/src/main/java/com/gitplex/server/manager/DataManager.java+++ b/core/src/main/java/com/gitplex/server/manager/DataManager.java@@ -4,7 +4,7 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.entity.support.setting.BackupSetting;+import com.gitplex.server.model.support.setting.BackupSetting;import com.gitplex.server.util.init.ManualConfig;public interface DataManager {diff --git a/core/src/main/java/com/gitplex/server/manager/DepotManager.java b/core/src/main/java/com/gitplex/server/manager/DepotManager.javaindex 0583f80fa1..ed751d351c 100644--- a/core/src/main/java/com/gitplex/server/manager/DepotManager.java+++ b/core/src/main/java/com/gitplex/server/manager/DepotManager.java@@ -6,8 +6,8 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.Repository;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.EntityManager;public interface DepotManager extends EntityManager<Depot> {diff --git a/core/src/main/java/com/gitplex/server/manager/MailManager.java b/core/src/main/java/com/gitplex/server/manager/MailManager.javaindex 08474627ca..c4147d20c3 100644--- a/core/src/main/java/com/gitplex/server/manager/MailManager.java+++ b/core/src/main/java/com/gitplex/server/manager/MailManager.java@@ -2,7 +2,7 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.entity.support.setting.MailSetting;+import com.gitplex.server.model.support.setting.MailSetting;public interface MailManager {diff --git a/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.javaindex 61ae0f3ade..409c923753 100644--- a/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java+++ b/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java@@ -4,9 +4,9 @@ import java.util.Collection;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.TeamMembership;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.persistence.dao.EntityManager;public interface OrganizationMembershipManager extends EntityManager<OrganizationMembership> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.javaindex f778abfa14..783e973975 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.PullRequestComment;+import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.javaindex f84c5bf6dc..579e3fbf52 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java@@ -4,7 +4,7 @@ import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public interface PullRequestInfoManager {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.javaindex 3d5bad23bb..f3aaeed3cc 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java@@ -5,12 +5,12 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;-import com.gitplex.server.entity.support.DepotAndBranch;-import com.gitplex.server.entity.support.IntegrationPreview;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestManager extends EntityManager<PullRequest> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.javaindex 159336d7e8..6e95d401b9 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.PullRequestReference;+import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.javaindex 63d9fce295..a8c55a23de 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java@@ -3,9 +3,9 @@ package com.gitplex.server.manager;import java.util.Collection;import java.util.Date;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestReviewInvitationManager extends EntityManager<PullRequestReviewInvitation> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.javaindex 6aaf93d83d..c1c4dbe14b 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java@@ -4,10 +4,10 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.javaindex dc453eb00f..1206ec7160 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.javaindex f7f02204ab..6425ed487a 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.PullRequestTask;+import com.gitplex.server.model.PullRequestTask;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.javaindex 96f7bbdcec..ae9b827f1a 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java@@ -4,8 +4,8 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdate> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.javaindex 870f6e80d4..0e8309c3ca 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java@@ -2,8 +2,8 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestVerification;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestVerification;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.javaindex f7e1d57bae..85c25ab6e6 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.gitplex.server.entity.PullRequestWatch;+import com.gitplex.server.model.PullRequestWatch;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {diff --git a/core/src/main/java/com/gitplex/server/manager/StorageManager.java b/core/src/main/java/com/gitplex/server/manager/StorageManager.javaindex cd65f2964e..24bc60486d 100644--- a/core/src/main/java/com/gitplex/server/manager/StorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/StorageManager.java@@ -2,7 +2,7 @@ package com.gitplex.server.manager;import java.io.File;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public interface StorageManager {diff --git a/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.javaindex 6f8aee6c89..242d10ef12 100644--- a/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java@@ -2,8 +2,8 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.TeamAuthorization;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.persistence.dao.EntityManager;public interface TeamAuthorizationManager extends EntityManager<TeamAuthorization> {diff --git a/core/src/main/java/com/gitplex/server/manager/TeamManager.java b/core/src/main/java/com/gitplex/server/manager/TeamManager.javaindex 89c654447d..349542ed64 100644--- a/core/src/main/java/com/gitplex/server/manager/TeamManager.java+++ b/core/src/main/java/com/gitplex/server/manager/TeamManager.java@@ -2,8 +2,8 @@ package com.gitplex.server.manager;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.persistence.dao.EntityManager;public interface TeamManager extends EntityManager<Team> {diff --git a/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.javaindex 1281c7778b..ae1afa0772 100644--- a/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java+++ b/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java@@ -2,8 +2,8 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.TeamMembership;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.persistence.dao.EntityManager;public interface TeamMembershipManager extends EntityManager<TeamMembership> {diff --git a/core/src/main/java/com/gitplex/server/manager/UrlManager.java b/core/src/main/java/com/gitplex/server/manager/UrlManager.javaindex 93fa7c45d9..7c756dd107 100644--- a/core/src/main/java/com/gitplex/server/manager/UrlManager.java+++ b/core/src/main/java/com/gitplex/server/manager/UrlManager.java@@ -2,13 +2,13 @@ package com.gitplex.server.manager;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestComment;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.support.CodeCommentActivity;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestComment;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.support.CodeCommentActivity;public interface UrlManager {diff --git a/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.javaindex c3f2db636f..93c484a594 100644--- a/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java@@ -4,9 +4,9 @@ import java.util.Collection;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.UserAuthorization;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.persistence.dao.EntityManager;public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {diff --git a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.javaindex cf86dd62bd..d442ef66b7 100644--- a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java@@ -4,10 +4,10 @@ import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;public interface VisitInfoManager {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.javaindex 202a2dbef6..ca9b34b558 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java@@ -14,15 +14,15 @@ import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.support.IntegrationPolicy;import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.javaindex 664266ff5c..6515531a4b 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java@@ -12,13 +12,13 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.manager.AttachmentManager;import com.gitplex.server.manager.StorageManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityPersisted;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.javaindex 38c095fd82..69a8d6f44c 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java@@ -7,10 +7,10 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.BranchWatch;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.BranchWatchManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.BranchWatch;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.javaindex da16aef354..7d35a1a109 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java@@ -24,9 +24,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.CompareContext;import com.gitplex.server.event.codecomment.CodeCommentCreated;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;@@ -36,6 +33,9 @@ import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.support.BatchWorker;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.javaindex ada1e50d8a..8396bf5acd 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java@@ -18,13 +18,6 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentRelation;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CodeCommentActivity;import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;import com.gitplex.server.event.codecomment.CodeCommentCreated;import com.gitplex.server.event.codecomment.CodeCommentEvent;@@ -37,6 +30,13 @@ import com.gitplex.server.manager.CodeCommentStatusChangeManager;import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.UrlManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentRelation;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.javaindex 3ca7e49726..7365ead726 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java@@ -16,11 +16,6 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentRelation;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.support.CompareContext;import com.gitplex.server.event.codecomment.CodeCommentCreated;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;import com.gitplex.server.manager.CodeCommentInfoManager;@@ -29,6 +24,11 @@ import com.gitplex.server.manager.CodeCommentRelationManager;import com.gitplex.server.manager.PullRequestInfoManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentRelation;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.javaindex d508b270f2..2151fcc716 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java@@ -4,10 +4,10 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.CodeCommentReply;import com.gitplex.server.event.codecomment.CodeCommentReplied;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentReplyManager;+import com.gitplex.server.model.CodeCommentReply;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.javaindex 4b12298671..2bc960aa8a 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java@@ -3,8 +3,8 @@ package com.gitplex.server.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.server.entity.CodeCommentStatusChange;import com.gitplex.server.manager.CodeCommentStatusChangeManager;+import com.gitplex.server.model.CodeCommentStatusChange;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.javaindex 0393ad8ecd..a50f1193df 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java@@ -34,7 +34,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;@@ -45,6 +44,7 @@ import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.support.BatchWorker;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.javaindex 3baeee909b..679796b30c 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java@@ -5,14 +5,14 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Config;-import com.gitplex.server.entity.Config.Key;-import com.gitplex.server.entity.support.setting.BackupSetting;-import com.gitplex.server.entity.support.setting.MailSetting;-import com.gitplex.server.entity.support.setting.SecuritySetting;-import com.gitplex.server.entity.support.setting.SystemSetting;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;+import com.gitplex.server.model.Config;+import com.gitplex.server.model.Config.Key;+import com.gitplex.server.model.support.setting.BackupSetting;+import com.gitplex.server.model.support.setting.MailSetting;+import com.gitplex.server.model.support.setting.SecuritySetting;+import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.javaindex 4af2f0e8af..78d0cb5f3a 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java@@ -21,18 +21,18 @@ import com.gitplex.launcher.loader.ManagedSerializedForm;import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.launcher.bootstrap.BootstrapUtils;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Config;-import com.gitplex.server.entity.Config.Key;-import com.gitplex.server.entity.support.setting.BackupSetting;-import com.gitplex.server.entity.support.setting.MailSetting;-import com.gitplex.server.entity.support.setting.SecuritySetting;-import com.gitplex.server.entity.support.setting.SystemSetting;import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;import com.gitplex.server.manager.MailManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Config;+import com.gitplex.server.model.Config.Key;+import com.gitplex.server.model.support.setting.BackupSetting;+import com.gitplex.server.model.support.setting.MailSetting;+import com.gitplex.server.model.support.setting.SecuritySetting;+import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.persistence.IdManager;import com.gitplex.server.persistence.PersistManager;import com.gitplex.server.persistence.annotation.Sessional;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.javaindex e703121880..cd9062fa38 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java@@ -32,11 +32,6 @@ import com.google.common.collect.HashBiMap;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamAuthorization;-import com.gitplex.server.entity.support.IntegrationPolicy;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.depot.DepotRenamed;@@ -53,6 +48,11 @@ import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.PullRequestInfoManager;import com.gitplex.server.manager.TeamAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamAuthorization;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.javaindex fd680f2144..9ccaeb9478 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java@@ -16,9 +16,9 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.entity.support.setting.MailSetting;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;+import com.gitplex.server.model.support.setting.MailSetting;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.javaindex 7802b32e0c..643a869b0c 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java@@ -7,12 +7,12 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.javaindex fed96b5393..06a461e1a7 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java@@ -4,11 +4,11 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.PullRequestComment;-import com.gitplex.server.entity.support.LastEvent;import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.PullRequestComment;+import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.javaindex 0326edd76d..4263f6fa9e 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java@@ -24,8 +24,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequestUpdate;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.git.GitUtils;@@ -35,6 +33,8 @@ import com.gitplex.server.manager.PullRequestInfoManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.support.BatchWorker;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.javaindex 0fb0152fb6..bc5809bbc9 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java@@ -1,16 +1,16 @@package com.gitplex.server.manager.impl;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofOpen;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSource;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSourceDepot;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSubmitter;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTarget;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTargetDepot;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofOpen;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSource;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSourceDepot;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSubmitter;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTarget;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTargetDepot;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;import java.util.Collection;import java.util.Date;@@ -49,18 +49,6 @@ import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;-import com.gitplex.server.entity.PullRequestStatusChange.Type;-import com.gitplex.server.entity.support.CloseInfo;-import com.gitplex.server.entity.support.DepotAndBranch;-import com.gitplex.server.entity.support.IntegrationPolicy;-import com.gitplex.server.entity.support.IntegrationPreview;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.pullrequest.IntegrationPreviewCalculated;@@ -80,6 +68,18 @@ import com.gitplex.server.manager.PullRequestReviewInvitationManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.support.BatchWorker;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.PullRequestStatusChange.Type;+import com.gitplex.server.model.support.CloseInfo;+import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.IntegrationPolicy;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.javaindex 68b016cd0a..286c6812ac 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java@@ -8,12 +8,12 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReference;import com.gitplex.server.event.MarkdownAware;import com.gitplex.server.event.pullrequest.PullRequestChangeEvent;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestReferenceManager;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.javaindex 3de4e77970..2bbec0b200 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java@@ -9,12 +9,12 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;import com.gitplex.server.event.pullrequest.PullRequestReviewInvitationChanged;import com.gitplex.server.manager.PullRequestReviewInvitationManager;import com.gitplex.server.manager.PullRequestReviewManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.javaindex 2befce6aae..3fa60d1391 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java@@ -10,16 +10,16 @@ import javax.inject.Singleton;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequestStatusChange.Type;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestReviewManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.javaindex 77a92e47f9..41b1b8cb85 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java@@ -4,9 +4,9 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.PullRequestStatusChange;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.manager.PullRequestStatusChangeManager;+import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.javaindex acf8d8d159..01a990292f 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java@@ -1,9 +1,9 @@package com.gitplex.server.manager.impl;-import static com.gitplex.server.entity.PullRequest.Status.PENDING_INTEGRATE;-import static com.gitplex.server.entity.PullRequestTask.Type.INTEGRATE;-import static com.gitplex.server.entity.PullRequestTask.Type.REVIEW;-import static com.gitplex.server.entity.PullRequestTask.Type.UPDATE;+import static com.gitplex.server.model.PullRequest.Status.PENDING_INTEGRATE;+import static com.gitplex.server.model.PullRequestTask.Type.INTEGRATE;+import static com.gitplex.server.model.PullRequestTask.Type.REVIEW;+import static com.gitplex.server.model.PullRequestTask.Type.UPDATE;import javax.inject.Inject;import javax.inject.Singleton;@@ -15,11 +15,6 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.PullRequestTask;import com.gitplex.server.event.TaskChangeEvent;import com.gitplex.server.event.pullrequest.PullRequestPendingApproval;import com.gitplex.server.event.pullrequest.PullRequestPendingIntegration;@@ -30,6 +25,11 @@ import com.gitplex.server.event.pullrequest.PullRequestUpdated;import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.PullRequestTaskManager;import com.gitplex.server.manager.UrlManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestTask;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.javaindex f51ad829ac..027cdab044 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java@@ -13,15 +13,15 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Throwables;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.support.LastEvent;import com.gitplex.server.event.pullrequest.PullRequestUpdated;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestUpdateManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.javaindex 639cd3a7b3..aa9dfb3b43 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java@@ -9,16 +9,16 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.PullRequestVerification;-import com.gitplex.server.entity.PullRequestStatusChange.Type;-import com.gitplex.server.entity.PullRequestVerification.Status;import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.PullRequestVerificationManager;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestVerification;+import com.gitplex.server.model.PullRequestStatusChange.Type;+import com.gitplex.server.model.PullRequestVerification.Status;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.javaindex 612d8619b3..211b270b66 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java@@ -14,13 +14,6 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.collect.Sets;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.BranchWatch;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequestWatch;-import com.gitplex.server.entity.PullRequestStatusChange.Type;import com.gitplex.server.event.MarkdownAware;import com.gitplex.server.event.pullrequest.IntegrationPreviewCalculated;import com.gitplex.server.event.pullrequest.PullRequestChangeEvent;@@ -39,6 +32,13 @@ import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.PullRequestWatchManager;import com.gitplex.server.manager.UrlManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.BranchWatch;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequestWatch;+import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.javaindex 935551e9ad..6eb2ffd0c6 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java@@ -10,11 +10,11 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.StorageManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.javaindex 9dbc5b93ff..177d3f23d1 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java@@ -10,10 +10,10 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.TeamAuthorization;import com.gitplex.server.event.depot.DepotTransferred;import com.gitplex.server.manager.TeamAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.javaindex 5e0df89946..8ac84d1beb 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java@@ -7,11 +7,11 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.Team;import com.gitplex.server.gatekeeper.GateKeeper;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Team;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.javaindex 68691bca3e..5f828f0e1d 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java@@ -7,9 +7,9 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.javaindex d2469a27d2..34670e3323 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java@@ -7,10 +7,10 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.javaindex d803ecbb27..e10d803e16 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java@@ -12,12 +12,6 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentRelation;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CodeCommentActivity;import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;import com.gitplex.server.event.codecomment.CodeCommentCreated;import com.gitplex.server.event.depot.DepotDeleted;@@ -27,6 +21,12 @@ import com.gitplex.server.event.pullrequest.PullRequestOpened;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentRelation;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.javaindex 1fe6ac6027..292cbc48df 100644--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java@@ -11,7 +11,7 @@ import com.gitplex.server.util.StringUtils;@Singleton@SuppressWarnings("unused")-public class DatabaseMigrator implements Migrator {+public class DatabaseMigrator {private void migrate1(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {@@ -97,8 +97,5 @@ public class DatabaseMigrator implements Migrator {}}}-- private void migrate6(File dataDir, Stack<Integer> versions) {- }}diff --git a/core/src/main/java/com/gitplex/server/migration/JpaConverter.java b/core/src/main/java/com/gitplex/server/migration/JpaConverter.javaindex 85ab233b23..f237e3228a 100644--- a/core/src/main/java/com/gitplex/server/migration/JpaConverter.java+++ b/core/src/main/java/com/gitplex/server/migration/JpaConverter.java@@ -16,7 +16,7 @@ import org.hibernate.proxy.HibernateProxy;import com.google.common.base.Throwables;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.ClassUtils;import com.gitplex.server.util.ReflectionUtils;diff --git a/core/src/main/java/com/gitplex/server/migration/Migrator.java b/core/src/main/java/com/gitplex/server/migration/Migrator.javadeleted file mode 100644index ee7094d419..0000000000--- a/core/src/main/java/com/gitplex/server/migration/Migrator.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.server.migration;--public interface Migrator {--}diff --git a/core/src/main/java/com/gitplex/server/migration/VersionTable.java b/core/src/main/java/com/gitplex/server/migration/VersionTable.javaindex 49bf3d534c..ff8cf7f08d 100644--- a/core/src/main/java/com/gitplex/server/migration/VersionTable.java+++ b/core/src/main/java/com/gitplex/server/migration/VersionTable.java@@ -3,7 +3,7 @@ package com.gitplex.server.migration;import javax.persistence.Entity;import javax.persistence.Table;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;@Entity@Tablediff --git a/core/src/main/java/com/gitplex/server/persistence/AbstractEntity.java b/core/src/main/java/com/gitplex/server/model/AbstractEntity.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/persistence/AbstractEntity.javarename to core/src/main/java/com/gitplex/server/model/AbstractEntity.javaindex 7c27997501..89c48e1556 100644--- a/core/src/main/java/com/gitplex/server/persistence/AbstractEntity.java+++ b/core/src/main/java/com/gitplex/server/model/AbstractEntity.java@@ -1,4 +1,4 @@-package com.gitplex.server.persistence;+package com.gitplex.server.model;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/Account.java b/core/src/main/java/com/gitplex/server/model/Account.javasimilarity index 99%rename from core/src/main/java/com/gitplex/server/entity/Account.javarename to core/src/main/java/com/gitplex/server/model/Account.javaindex e2e3d0666c..0984da74ae 100644--- a/core/src/main/java/com/gitplex/server/entity/Account.java+++ b/core/src/main/java/com/gitplex/server/model/Account.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.ArrayList;import java.util.Collection;@@ -34,7 +34,6 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.TeamAuthorizationManager;import com.gitplex.server.manager.TeamMembershipManager;import com.gitplex.server.manager.UserAuthorizationManager;-import com.gitplex.server.persistence.AbstractEntity;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.security.protectedobject.AccountBelonging;import com.gitplex.server.security.protectedobject.ProtectedObject;diff --git a/core/src/main/java/com/gitplex/server/entity/BranchWatch.java b/core/src/main/java/com/gitplex/server/model/BranchWatch.javasimilarity index 92%rename from core/src/main/java/com/gitplex/server/entity/BranchWatch.javarename to core/src/main/java/com/gitplex/server/model/BranchWatch.javaindex 77b59758a6..4811690f4a 100644--- a/core/src/main/java/com/gitplex/server/entity/BranchWatch.java+++ b/core/src/main/java/com/gitplex/server/model/BranchWatch.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Column;import javax.persistence.Entity;@@ -9,8 +9,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_depot_id"), @Index(columnList="g_user_id"), @Index(columnList="branch")},diff --git a/core/src/main/java/com/gitplex/server/entity/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.javasimilarity index 95%rename from core/src/main/java/com/gitplex/server/entity/CodeComment.javarename to core/src/main/java/com/gitplex/server/model/CodeComment.javaindex 32622c7cf2..e37794d836 100644--- a/core/src/main/java/com/gitplex/server/entity/CodeComment.java+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.io.Serializable;import java.util.ArrayList;@@ -24,13 +24,12 @@ import javax.persistence.Version;import org.hibernate.annotations.DynamicUpdate;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.support.CodeCommentActivity;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.CompareContext;-import com.gitplex.server.entity.support.LastEvent;import com.gitplex.server.event.codecomment.CodeCommentEvent;import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.support.CodeCommentActivity;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.CompareContext;+import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.editable.EditableUtils;diff --git a/core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.java b/core/src/main/java/com/gitplex/server/model/CodeCommentRelation.javasimilarity index 92%rename from core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.javarename to core/src/main/java/com/gitplex/server/model/CodeCommentRelation.javaindex 32bc80079b..67781b576f 100644--- a/core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.java+++ b/core/src/main/java/com/gitplex/server/model/CodeCommentRelation.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -11,8 +11,6 @@ import javax.persistence.UniqueConstraint;import org.hibernate.annotations.Fetch;import org.hibernate.annotations.FetchMode;-import com.gitplex.server.persistence.AbstractEntity;-@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_comment_id")},uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_comment_id"})diff --git a/core/src/main/java/com/gitplex/server/entity/CodeCommentReply.java b/core/src/main/java/com/gitplex/server/model/CodeCommentReply.javasimilarity index 90%rename from core/src/main/java/com/gitplex/server/entity/CodeCommentReply.javarename to core/src/main/java/com/gitplex/server/model/CodeCommentReply.javaindex 2d91df23c8..8dcda84810 100644--- a/core/src/main/java/com/gitplex/server/entity/CodeCommentReply.java+++ b/core/src/main/java/com/gitplex/server/model/CodeCommentReply.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Column;import javax.persistence.Entity;@@ -8,7 +8,7 @@ import javax.persistence.Table;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.server.entity.support.CodeCommentActivity;+import com.gitplex.server.model.support.CodeCommentActivity;/** @DynamicUpdate annotation here along with various @OptimisticLock annotationsdiff --git a/core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.java b/core/src/main/java/com/gitplex/server/model/CodeCommentStatusChange.javasimilarity index 87%rename from core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.javarename to core/src/main/java/com/gitplex/server/model/CodeCommentStatusChange.javaindex d9f1daad56..378fce539f 100644--- a/core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.java+++ b/core/src/main/java/com/gitplex/server/model/CodeCommentStatusChange.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Entity;import javax.persistence.Index;@@ -6,7 +6,7 @@ import javax.persistence.Table;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.server.entity.support.CodeCommentActivity;+import com.gitplex.server.model.support.CodeCommentActivity;@Entity@Table(indexes={@Index(columnList="g_comment_id"), @Index(columnList="g_user_id")})diff --git a/core/src/main/java/com/gitplex/server/entity/Config.java b/core/src/main/java/com/gitplex/server/model/Config.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/Config.javarename to core/src/main/java/com/gitplex/server/model/Config.javaindex 047729a681..13ed78bd55 100644--- a/core/src/main/java/com/gitplex/server/entity/Config.java+++ b/core/src/main/java/com/gitplex/server/model/Config.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.io.Serializable;@@ -9,8 +9,6 @@ import javax.persistence.Lob;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import com.gitplex.server.persistence.AbstractEntity;-/*** This entity stores object in serialized form, with one entity* representing one object.diff --git a/core/src/main/java/com/gitplex/server/entity/Depot.java b/core/src/main/java/com/gitplex/server/model/Depot.javasimilarity index 99%rename from core/src/main/java/com/gitplex/server/entity/Depot.javarename to core/src/main/java/com/gitplex/server/model/Depot.javaindex 72d0288b08..7b514753aa 100644--- a/core/src/main/java/com/gitplex/server/entity/Depot.java+++ b/core/src/main/java/com/gitplex/server/model/Depot.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.io.File;import java.io.IOException;@@ -68,8 +68,6 @@ import com.gitplex.launcher.loader.AppLoader;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.launcher.loader.LoaderUtils;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.support.CommitMessageTransformSetting;-import com.gitplex.server.entity.support.IntegrationPolicy;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.gatekeeper.AndGateKeeper;import com.gitplex.server.gatekeeper.GateKeeper;@@ -84,7 +82,8 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.support.CommitMessageTransformSetting;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.protectedobject.AccountBelonging;diff --git a/core/src/main/java/com/gitplex/server/model/EntityLocator.java b/core/src/main/java/com/gitplex/server/model/EntityLocator.javanew file mode 100644index 0000000000..fdaf565cd1--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/EntityLocator.java@@ -0,0 +1,5 @@+package com.gitplex.server.model;++public class EntityLocator {++}diff --git a/core/src/main/java/com/gitplex/server/entity/OrganizationMembership.java b/core/src/main/java/com/gitplex/server/model/OrganizationMembership.javasimilarity index 92%rename from core/src/main/java/com/gitplex/server/entity/OrganizationMembership.javarename to core/src/main/java/com/gitplex/server/model/OrganizationMembership.javaindex 7ed0799c1f..5a71aa2d77 100644--- a/core/src/main/java/com/gitplex/server/entity/OrganizationMembership.java+++ b/core/src/main/java/com/gitplex/server/model/OrganizationMembership.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -8,8 +8,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_user_id"), @Index(columnList="g_organization_id")},diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/entity/PullRequest.javarename to core/src/main/java/com/gitplex/server/model/PullRequest.javaindex 986b41a5f2..433cbd1fef 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequest.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.io.IOException;import java.io.Serializable;@@ -39,11 +39,6 @@ import org.hibernate.criterion.Restrictions;import com.fasterxml.jackson.annotation.JsonView;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.support.CloseInfo;-import com.gitplex.server.entity.support.CompareContext;-import com.gitplex.server.entity.support.DepotAndBranch;-import com.gitplex.server.entity.support.IntegrationPreview;-import com.gitplex.server.entity.support.LastEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;import com.gitplex.server.gatekeeper.checkresult.Failed;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;@@ -54,7 +49,11 @@ import com.gitplex.server.manager.CodeCommentRelationManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestReviewManager;import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.support.CloseInfo;+import com.gitplex.server.model.support.CompareContext;+import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.IntegrationPreview;+import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ObjectPermission;diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestComment.java b/core/src/main/java/com/gitplex/server/model/PullRequestComment.javasimilarity index 95%rename from core/src/main/java/com/gitplex/server/entity/PullRequestComment.javarename to core/src/main/java/com/gitplex/server/model/PullRequestComment.javaindex 8c39f0b5b9..2bfc249317 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestComment.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestComment.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -15,8 +15,6 @@ import javax.persistence.Version;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.server.persistence.AbstractEntity;-/** @DynamicUpdate annotation here along with various @OptimisticLock annotations* on certain fields tell Hibernate not to perform version check on those fieldsdiff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestReference.java b/core/src/main/java/com/gitplex/server/model/PullRequestReference.javasimilarity index 94%rename from core/src/main/java/com/gitplex/server/entity/PullRequestReference.javarename to core/src/main/java/com/gitplex/server/model/PullRequestReference.javaindex 27745c0455..bf94cd96aa 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestReference.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -14,8 +14,6 @@ import javax.persistence.UniqueConstraint;import org.hibernate.annotations.Fetch;import org.hibernate.annotations.FetchMode;-import com.gitplex.server.persistence.AbstractEntity;-@Table(indexes={@Index(columnList="g_referenced_id"), @Index(columnList="g_referencedBy_id"), @Index(columnList="g_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"g_referenced_id", "g_referencedBy_id"})diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestReview.java b/core/src/main/java/com/gitplex/server/model/PullRequestReview.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/PullRequestReview.javarename to core/src/main/java/com/gitplex/server/model/PullRequestReview.javaindex 65a13ba02f..cf212faef9 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestReview.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestReview.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -11,8 +11,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_user_id"), @Index(columnList="g_update_id")},diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.java b/core/src/main/java/com/gitplex/server/model/PullRequestReviewInvitation.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.javarename to core/src/main/java/com/gitplex/server/model/PullRequestReviewInvitation.javaindex a87e8e0995..6d6abe25a0 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestReviewInvitation.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -11,8 +11,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_user_id"), @Index(columnList="g_request_id")},diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.java b/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.javasimilarity index 96%rename from core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.javarename to core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.javaindex c9a0acbb27..f686b9b14e 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -14,8 +14,6 @@ import javax.persistence.Version;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})@DynamicUpdatediff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestTask.java b/core/src/main/java/com/gitplex/server/model/PullRequestTask.javasimilarity index 95%rename from core/src/main/java/com/gitplex/server/entity/PullRequestTask.javarename to core/src/main/java/com/gitplex/server/model/PullRequestTask.javaindex 7a44ac5825..9e49ee58a4 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestTask.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestTask.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -11,8 +11,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id"), @Index(columnList="type")},diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.java b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.javasimilarity index 99%rename from core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.javarename to core/src/main/java/com/gitplex/server/model/PullRequestUpdate.javaindex fbeb6d42d0..7d6f6cab26 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.io.IOException;import java.util.ArrayList;@@ -33,7 +33,6 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;import com.fasterxml.jackson.annotation.JsonProperty;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.impl.DefaultCodeCommentRelationManager;-import com.gitplex.server.persistence.AbstractEntity;import com.google.common.base.Preconditions;@Entitydiff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestVerification.java b/core/src/main/java/com/gitplex/server/model/PullRequestVerification.javasimilarity index 95%rename from core/src/main/java/com/gitplex/server/entity/PullRequestVerification.javarename to core/src/main/java/com/gitplex/server/model/PullRequestVerification.javaindex 9d0298aa63..cada95b412 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestVerification.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestVerification.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.Date;@@ -11,8 +11,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id"),diff --git a/core/src/main/java/com/gitplex/server/entity/PullRequestWatch.java b/core/src/main/java/com/gitplex/server/model/PullRequestWatch.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/PullRequestWatch.javarename to core/src/main/java/com/gitplex/server/model/PullRequestWatch.javaindex 0260c4cb67..b55a1ad8d1 100644--- a/core/src/main/java/com/gitplex/server/entity/PullRequestWatch.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestWatch.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.annotation.Nullable;import javax.persistence.Entity;@@ -9,8 +9,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")},diff --git a/core/src/main/java/com/gitplex/server/entity/Team.java b/core/src/main/java/com/gitplex/server/model/Team.javasimilarity index 97%rename from core/src/main/java/com/gitplex/server/entity/Team.javarename to core/src/main/java/com/gitplex/server/model/Team.javaindex 433a72b158..61aed91742 100644--- a/core/src/main/java/com/gitplex/server/entity/Team.java+++ b/core/src/main/java/com/gitplex/server/model/Team.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import java.util.ArrayList;import java.util.Collection;@@ -20,7 +20,6 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.server.persistence.AbstractEntity;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Markdown;import com.gitplex.server.util.validation.annotation.DepotName;diff --git a/core/src/main/java/com/gitplex/server/entity/TeamAuthorization.java b/core/src/main/java/com/gitplex/server/model/TeamAuthorization.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/TeamAuthorization.javarename to core/src/main/java/com/gitplex/server/model/TeamAuthorization.javaindex 974f684ebb..b2db345a04 100644--- a/core/src/main/java/com/gitplex/server/entity/TeamAuthorization.java+++ b/core/src/main/java/com/gitplex/server/model/TeamAuthorization.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Column;import javax.persistence.Entity;@@ -9,7 +9,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;import com.gitplex.server.security.privilege.DepotPrivilege;@Entitydiff --git a/core/src/main/java/com/gitplex/server/entity/TeamMembership.java b/core/src/main/java/com/gitplex/server/model/TeamMembership.javasimilarity index 91%rename from core/src/main/java/com/gitplex/server/entity/TeamMembership.javarename to core/src/main/java/com/gitplex/server/model/TeamMembership.javaindex 3499a2ff2c..57362bd6e9 100644--- a/core/src/main/java/com/gitplex/server/entity/TeamMembership.java+++ b/core/src/main/java/com/gitplex/server/model/TeamMembership.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -8,8 +8,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;-@Entity@Table(indexes={@Index(columnList="g_user_id"), @Index(columnList="g_team_id")},diff --git a/core/src/main/java/com/gitplex/server/entity/UserAuthorization.java b/core/src/main/java/com/gitplex/server/model/UserAuthorization.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/UserAuthorization.javarename to core/src/main/java/com/gitplex/server/model/UserAuthorization.javaindex 87612be2cd..13e46841b1 100644--- a/core/src/main/java/com/gitplex/server/entity/UserAuthorization.java+++ b/core/src/main/java/com/gitplex/server/model/UserAuthorization.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity;+package com.gitplex.server.model;import javax.persistence.Column;import javax.persistence.Entity;@@ -9,7 +9,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.persistence.AbstractEntity;import com.gitplex.server.security.privilege.DepotPrivilege;@Entitydiff --git a/core/src/main/java/com/gitplex/server/entity/support/CloseInfo.java b/core/src/main/java/com/gitplex/server/model/support/CloseInfo.javasimilarity index 92%rename from core/src/main/java/com/gitplex/server/entity/support/CloseInfo.javarename to core/src/main/java/com/gitplex/server/model/support/CloseInfo.javaindex 7adfb53aa5..71f2add5bd 100644--- a/core/src/main/java/com/gitplex/server/entity/support/CloseInfo.java+++ b/core/src/main/java/com/gitplex/server/model/support/CloseInfo.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;import java.util.Date;@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;import org.hibernate.annotations.OptimisticLock;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;@Embeddablepublic class CloseInfo implements Serializable {diff --git a/core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.java b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.javasimilarity index 87%rename from core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.javarename to core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.javaindex 599cc8158c..60909c6bce 100644--- a/core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.java+++ b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.util.Date;@@ -10,10 +10,10 @@ import javax.persistence.ManyToOne;import javax.persistence.MappedSuperclass;import javax.persistence.Version;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeComment.ComparingInfo;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeComment.ComparingInfo;@MappedSuperclasspublic abstract class CodeCommentActivity extends AbstractEntity {diff --git a/core/src/main/java/com/gitplex/server/entity/support/CommentPos.java b/core/src/main/java/com/gitplex/server/model/support/CommentPos.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/entity/support/CommentPos.javarename to core/src/main/java/com/gitplex/server/model/support/CommentPos.javaindex a591a4ade0..1ddb218616 100644--- a/core/src/main/java/com/gitplex/server/entity/support/CommentPos.java+++ b/core/src/main/java/com/gitplex/server/model/support/CommentPos.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.java b/core/src/main/java/com/gitplex/server/model/support/CommitMessageTransformSetting.javasimilarity index 96%rename from core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.javarename to core/src/main/java/com/gitplex/server/model/support/CommitMessageTransformSetting.javaindex 80f6a48d5d..4319132c8a 100644--- a/core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/CommitMessageTransformSetting.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/CompareContext.java b/core/src/main/java/com/gitplex/server/model/support/CompareContext.javasimilarity index 97%rename from core/src/main/java/com/gitplex/server/entity/support/CompareContext.javarename to core/src/main/java/com/gitplex/server/model/support/CompareContext.javaindex 0ad37a2ceb..a18a5c8ca1 100644--- a/core/src/main/java/com/gitplex/server/entity/support/CompareContext.java+++ b/core/src/main/java/com/gitplex/server/model/support/CompareContext.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.java b/core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.javasimilarity index 87%rename from core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.javarename to core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.javaindex 47ff98cfa8..dc02f40ed6 100644--- a/core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.java+++ b/core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.java@@ -1,7 +1,7 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;public class DepotAndBranch extends DepotAndRevision {diff --git a/core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.java b/core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.javasimilarity index 97%rename from core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.javarename to core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.javaindex ee7e66d4d7..ecfde42c5f 100644--- a/core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.java+++ b/core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;@@ -12,9 +12,9 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;public class DepotAndRevision implements Serializable {diff --git a/core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.java b/core/src/main/java/com/gitplex/server/model/support/IntegrationPolicy.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.javarename to core/src/main/java/com/gitplex/server/model/support/IntegrationPolicy.javaindex 04a919eccd..24ee5d5bf6 100644--- a/core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.java+++ b/core/src/main/java/com/gitplex/server/model/support/IntegrationPolicy.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;import java.util.ArrayList;@@ -10,9 +10,9 @@ import org.apache.commons.lang3.StringUtils;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.util.includeexclude.IncludeExcludeParser;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;import com.gitplex.server.util.editable.annotation.BranchMatch;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.FullBranchMatch;diff --git a/core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.java b/core/src/main/java/com/gitplex/server/model/support/IntegrationPreview.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.javarename to core/src/main/java/com/gitplex/server/model/support/IntegrationPreview.javaindex 486d04bd97..d366cabeb5 100644--- a/core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.java+++ b/core/src/main/java/com/gitplex/server/model/support/IntegrationPreview.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;@@ -8,8 +8,8 @@ import javax.persistence.Embeddable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;@SuppressWarnings("serial")@Embeddablediff --git a/core/src/main/java/com/gitplex/server/entity/support/LastEvent.java b/core/src/main/java/com/gitplex/server/model/support/LastEvent.javasimilarity index 91%rename from core/src/main/java/com/gitplex/server/entity/support/LastEvent.javarename to core/src/main/java/com/gitplex/server/model/support/LastEvent.javaindex 3a63207cc5..8264576364 100644--- a/core/src/main/java/com/gitplex/server/entity/support/LastEvent.java+++ b/core/src/main/java/com/gitplex/server/model/support/LastEvent.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;import java.util.Date;@@ -9,7 +9,7 @@ import javax.persistence.FetchType;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;@Embeddablepublic class LastEvent implements Serializable {diff --git a/core/src/main/java/com/gitplex/server/entity/support/TextRange.java b/core/src/main/java/com/gitplex/server/model/support/TextRange.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/entity/support/TextRange.javarename to core/src/main/java/com/gitplex/server/model/support/TextRange.javaindex d1ee6d6924..9cb344d824 100644--- a/core/src/main/java/com/gitplex/server/entity/support/TextRange.java+++ b/core/src/main/java/com/gitplex/server/model/support/TextRange.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support;+package com.gitplex.server.model.support;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/BackupSetting.javasimilarity index 97%rename from core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.javarename to core/src/main/java/com/gitplex/server/model/support/setting/BackupSetting.javaindex 91461c98c0..60a1322bed 100644--- a/core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/BackupSetting.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support.setting;+package com.gitplex.server.model.support.setting;import java.io.Serializable;import java.text.ParseException;diff --git a/core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/MailSetting.javasimilarity index 98%rename from core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.javarename to core/src/main/java/com/gitplex/server/model/support/setting/MailSetting.javaindex fb2f8b8baa..5bf998a692 100644--- a/core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/MailSetting.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support.setting;+package com.gitplex.server.model.support.setting;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javasimilarity index 91%rename from core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.javarename to core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javaindex e8f32f775b..d8b787522c 100644--- a/core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support.setting;+package com.gitplex.server.model.support.setting;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.javasimilarity index 97%rename from core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.javarename to core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.javaindex 344fb2d1de..69e466df0b 100644--- a/core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java@@ -1,4 +1,4 @@-package com.gitplex.server.entity.support.setting;+package com.gitplex.server.model.support.setting;import java.io.Serializable;diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.javaindex b51c7302ca..1510975106 100644--- a/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java@@ -14,7 +14,6 @@ import java.util.Collections;import java.util.EnumSet;import java.util.Iterator;import java.util.List;-import java.util.Set;import javax.persistence.ManyToOne;@@ -42,10 +41,11 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.LoaderUtils;+import com.gitplex.server.migration.DatabaseMigrator;import com.gitplex.server.migration.MigrationHelper;-import com.gitplex.server.migration.Migrator;import com.gitplex.server.migration.VersionTable;import com.gitplex.server.migration.VersionedDocument;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.BeanUtils;@@ -63,14 +63,10 @@ public class DefaultPersistManager implements PersistManager {private static final Logger logger = LoggerFactory.getLogger(DefaultPersistManager.class);- protected final Set<ModelProvider> modelProviders;-protected final PhysicalNamingStrategy physicalNamingStrategy;protected final HibernateProperties properties;- protected final Migrator migrator;-protected final Interceptor interceptor;protected final IdManager idManager;@@ -84,13 +80,11 @@ public class DefaultPersistManager implements PersistManager {protected volatile SessionFactory sessionFactory;@Inject- public DefaultPersistManager(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,- HibernateProperties properties, Migrator migrator, Interceptor interceptor,+ public DefaultPersistManager(PhysicalNamingStrategy physicalNamingStrategy,+ HibernateProperties properties, Interceptor interceptor,IdManager idManager, Dao dao, EntityValidator validator) {- this.modelProviders = modelProviders;this.physicalNamingStrategy = physicalNamingStrategy;this.properties = properties;- this.migrator = migrator;this.interceptor = interceptor;this.idManager = idManager;this.dao = dao;@@ -128,11 +122,6 @@ public class DefaultPersistManager implements PersistManager {metadataSources.addAnnotatedClass(each);}- for (ModelProvider provider: modelProviders) {- for (Class<? extends AbstractEntity> modelClass: provider.getModelClasses())- metadataSources.addAnnotatedClass(modelClass);- }-return metadataSources.getMetadataBuilder().applyPhysicalNamingStrategy(physicalNamingStrategy).build();}@@ -146,7 +135,7 @@ public class DefaultPersistManager implements PersistManager {logger.error("Database is not populated yet");System.exit(1);}- String appDataVersion = MigrationHelper.getVersion(migrator.getClass());+ String appDataVersion = MigrationHelper.getVersion(DatabaseMigrator.class);if (dbDataVersion != null && !dbDataVersion.equals(appDataVersion)) {logger.error("Data version mismatch (app data version: {}, db data version: {})", appDataVersion, dbDataVersion);System.exit(1);@@ -187,7 +176,7 @@ public class DefaultPersistManager implements PersistManager {Transaction transaction = session.beginTransaction();try {VersionTable dataVersion = new VersionTable();- dataVersion.versionColumn = MigrationHelper.getVersion(migrator.getClass());+ dataVersion.versionColumn = MigrationHelper.getVersion(DatabaseMigrator.class);session.save(dataVersion);session.flush();transaction.commit();@@ -286,13 +275,13 @@ public class DefaultPersistManager implements PersistManager {throw new RuntimeException("Incorrect data format: no data version");}- if (MigrationHelper.migrate(versionElement.getText(), migrator, dataDir)) {+ if (MigrationHelper.migrate(versionElement.getText(), new DatabaseMigrator(), dataDir)) {// read VersionTable dom again in case we changed something of it while migratingdom = VersionedDocument.fromFile(versionFile);elements = dom.getRootElement().elements();Preconditions.checkState(elements.size() == 1);versionElement = Preconditions.checkNotNull(elements.iterator().next().element(getVersionFieldName()));- versionElement.setText(MigrationHelper.getVersion(migrator.getClass()));+ versionElement.setText(MigrationHelper.getVersion(DatabaseMigrator.class));dom.writeToFile(versionFile, false);}}diff --git a/core/src/main/java/com/gitplex/server/persistence/ModelProvider.java b/core/src/main/java/com/gitplex/server/persistence/ModelProvider.javadeleted file mode 100644index c3ce4ce5a4..0000000000--- a/core/src/main/java/com/gitplex/server/persistence/ModelProvider.java+++ /dev/null@@ -1,7 +0,0 @@-package com.gitplex.server.persistence;--import java.util.Collection;--public interface ModelProvider {- Collection<Class<? extends AbstractEntity>> getModelClasses();-}diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.javaindex 0b0952cec4..9db0a27614 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java@@ -4,7 +4,7 @@ import java.util.List;import org.hibernate.Session;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.util.ReflectionUtils;public abstract class AbstractEntityManager<T extends AbstractEntity> implements EntityManager<T> {diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.javaindex 79ce3ead23..438e8d24c9 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java@@ -6,7 +6,7 @@ import org.hibernate.HibernateException;import org.hibernate.Session;import org.hibernate.criterion.DetachedCriteria;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public interface Dao {diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.javaindex 98e0508b3c..efa85cb890 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java@@ -16,7 +16,7 @@ import org.hibernate.criterion.Projections;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.launcher.loader.ManagedSerializedForm;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.javaindex e2337e2ec0..0fbcb6dc38 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java@@ -16,7 +16,7 @@ import org.hibernate.internal.CriteriaImpl;import org.hibernate.sql.JoinType;import org.hibernate.transform.ResultTransformer;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;@SuppressWarnings("serial")public class EntityCriteria<T extends AbstractEntity> implements CriteriaSpecification, Serializable {diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.javaindex 2dd80260f6..f57bc618f9 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java@@ -5,7 +5,7 @@ import java.util.List;import org.hibernate.HibernateException;import org.hibernate.criterion.DetachedCriteria;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public interface EntityManager<T extends AbstractEntity> {diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.javaindex ee97f2ce3c..1f747872b2 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java@@ -1,6 +1,6 @@package com.gitplex.server.persistence.dao;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public class EntityPersisted {diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.javaindex 0712b9485e..4f0270780e 100644--- a/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java@@ -1,6 +1,6 @@package com.gitplex.server.persistence.dao;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public class EntityRemoved {diff --git a/core/src/main/java/com/gitplex/server/security/ObjectPermission.java b/core/src/main/java/com/gitplex/server/security/ObjectPermission.javaindex 4263c72e0b..d3bb6806eb 100644--- a/core/src/main/java/com/gitplex/server/security/ObjectPermission.java+++ b/core/src/main/java/com/gitplex/server/security/ObjectPermission.java@@ -2,8 +2,8 @@ package com.gitplex.server.security;import org.apache.shiro.authz.Permission;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.privilege.AccountPrivilege;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.security.privilege.Privilege;diff --git a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/SecurityRealm.javaindex b064411600..99c5e35277 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java@@ -21,17 +21,17 @@ import org.apache.shiro.subject.PrincipalCollection;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamAuthorization;-import com.gitplex.server.entity.TeamMembership;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.manager.TeamMembershipManager;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamAuthorization;+import com.gitplex.server.model.TeamMembership;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.privilege.AccountPrivilege;import com.gitplex.server.security.privilege.DepotPrivilege;diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.javaindex 18a1fe02f1..62b8cf6319 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java@@ -9,15 +9,15 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestComment;-import com.gitplex.server.entity.PullRequestReview;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.support.CodeCommentActivity;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestComment;+import com.gitplex.server.model.PullRequestReview;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.security.privilege.Privilege;diff --git a/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java b/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.javaindex a2afbd0fae..50e36b7600 100644--- a/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java+++ b/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java@@ -1,6 +1,6 @@package com.gitplex.server.security.protectedobject;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;public interface AccountBelonging extends ProtectedObject {Account getAccount();diff --git a/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java b/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.javaindex fb03b91cb3..d6df933b6e 100644--- a/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java+++ b/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java@@ -15,8 +15,8 @@ import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser;import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.MatchContext;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.DepotAndBranch;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.util.match.IncludeExclude;import com.gitplex.server.util.match.Matcher;import com.gitplex.server.util.match.WildcardUtils;diff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.javaindex 35e0a1cf59..5b0a70c098 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializer;import com.fasterxml.jackson.databind.deser.SettableAnyProperty;import com.fasterxml.jackson.databind.deser.SettableBeanProperty;import com.fasterxml.jackson.databind.deser.impl.PropertyValue;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;import com.google.common.base.Preconditions;diff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.javaindex 722ff42352..3235f03328 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java@@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.Version;import com.fasterxml.jackson.databind.AnnotationIntrospector;import com.fasterxml.jackson.databind.introspect.Annotated;import com.fasterxml.jackson.databind.introspect.AnnotatedMember;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;@SuppressWarnings("serial")public class HibernateAnnotationIntrospector extends AnnotationIntrospector {diff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.javaindex 5d4cd46af1..5d46f5189f 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.CollectionSerializer;import com.fasterxml.jackson.databind.ser.std.MapSerializer;import com.fasterxml.jackson.databind.type.CollectionType;import com.fasterxml.jackson.databind.type.MapType;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;@Singletondiff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.javaindex b8d6a8a952..27dda75a04 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java@@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.DeserializationContext;import com.fasterxml.jackson.databind.deser.std.StdDeserializer;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;@SuppressWarnings("serial")diff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.javaindex dec2949800..8dd6ec8b97 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonGenerationException;import com.fasterxml.jackson.core.JsonGenerator;import com.fasterxml.jackson.databind.SerializerProvider;import com.fasterxml.jackson.databind.ser.std.StdSerializer;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public final class ManyToOneSerializer extends StdSerializer<AbstractEntity> {diff --git a/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.javaindex a768017a84..e70a419e56 100644--- a/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java+++ b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java@@ -12,8 +12,8 @@ import org.jsoup.select.NodeTraversor;import com.google.common.collect.ImmutableSet;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.util.JsoupUtils;import com.gitplex.server.util.TextNodeVisitor;diff --git a/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.javaindex 57640f0401..9e6251df66 100644--- a/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java+++ b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java@@ -12,7 +12,7 @@ import org.jsoup.select.NodeTraversor;import com.google.common.collect.ImmutableSet;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.JsoupUtils;import com.gitplex.server.util.TextNodeVisitor;diff --git a/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java b/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.javaindex 2912ecdf98..f68d1ca303 100644--- a/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java+++ b/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java@@ -7,8 +7,8 @@ import javax.inject.Singleton;import javax.validation.ConstraintViolation;import javax.validation.Validator;-import com.gitplex.server.entity.Account;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;+import com.gitplex.server.model.Account;@Singletonpublic class DefaultEntityValidator implements EntityValidator {diff --git a/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java b/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.javaindex c132db9253..efc16824d1 100644--- a/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java+++ b/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java@@ -1,6 +1,6 @@package com.gitplex.server.util.validation;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;public interface EntityValidator {void validate(AbstractEntity entity);diff --git a/core/src/test/java/com/gitplex/server/entity/PullRequestTest.java b/core/src/test/java/com/gitplex/server/entity/PullRequestTest.javaindex 2ca11c8f90..4d8e760b68 100644--- a/core/src/test/java/com/gitplex/server/entity/PullRequestTest.java+++ b/core/src/test/java/com/gitplex/server/entity/PullRequestTest.java@@ -11,6 +11,9 @@ import org.mockito.Mockito;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.git.AbstractGitTest;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;public class PullRequestTest extends AbstractGitTest {diff --git a/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java b/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.javaindex 344f0924f4..8f4e70c3e2 100644--- a/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java+++ b/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java@@ -8,6 +8,9 @@ import org.junit.Test;import com.gitplex.server.git.AbstractGitTest;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;import com.google.common.collect.Sets;public class PullRequestUpdateTest extends AbstractGitTest {diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.javaindex 5636baaef5..604a5605b0 100644--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java@@ -17,7 +17,7 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.javaindex a5963112fa..674215c213 100644--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java@@ -21,9 +21,9 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.PullRequestVerification;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestVerificationManager;+import com.gitplex.server.model.PullRequestVerification;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;diff --git a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java b/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.javaindex 4716b19afd..8041c9a6c0 100644--- a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java@@ -19,8 +19,8 @@ import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;diff --git a/rest/src/main/java/com/gitplex/server/rest/UserResource.java b/rest/src/main/java/com/gitplex/server/rest/UserResource.javaindex c41b684d3e..3524c5ea1c 100644--- a/rest/src/main/java/com/gitplex/server/rest/UserResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/UserResource.java@@ -15,7 +15,7 @@ import javax.ws.rs.core.MediaType;import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.Email;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;diff --git a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java b/search/src/main/java/com/gitplex/server/search/CommitIndexed.javaindex 9ccf6081c4..48a0a055ab 100644--- a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java+++ b/search/src/main/java/com/gitplex/server/search/CommitIndexed.java@@ -2,7 +2,7 @@ package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;public class CommitIndexed {diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex 8cfaf97741..08e939c83e 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -69,13 +69,13 @@ import com.gitplex.jsymbol.ExtractException;import com.gitplex.jsymbol.Symbol;import com.gitplex.jsymbol.SymbolExtractor;import com.gitplex.jsymbol.SymbolExtractorRegistry;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.support.BatchWorker;import com.gitplex.server.manager.support.IndexResult;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.ContentDetector;import com.gitplex.server.util.concurrent.Prioritized;diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javaindex dbe97e7942..1c572281f5 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java@@ -41,10 +41,10 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.jsymbol.Symbol;-import com.gitplex.server.entity.Depot;import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.manager.StorageManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.search.hit.QueryHit;diff --git a/search/src/main/java/com/gitplex/server/search/IndexManager.java b/search/src/main/java/com/gitplex/server/search/IndexManager.javaindex ea998c186e..6f193bd30a 100644--- a/search/src/main/java/com/gitplex/server/search/IndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/IndexManager.java@@ -2,8 +2,8 @@ package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.support.IndexResult;+import com.gitplex.server.model.Depot;public interface IndexManager {diff --git a/search/src/main/java/com/gitplex/server/search/SearchManager.java b/search/src/main/java/com/gitplex/server/search/SearchManager.javaindex 2f1aaff3b9..d84c3ff12e 100644--- a/search/src/main/java/com/gitplex/server/search/SearchManager.java+++ b/search/src/main/java/com/gitplex/server/search/SearchManager.java@@ -8,7 +8,7 @@ import org.apache.lucene.search.IndexSearcher;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.jsymbol.Symbol;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;import com.gitplex.server.search.query.TooGeneralQueryException;diff --git a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.javaindex 2e5085750c..7085f4c6aa 100644--- a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java+++ b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java@@ -3,15 +3,15 @@ package com.gitplex.server.web;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestComment;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.support.CodeCommentActivity;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.UrlManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestComment;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.support.CodeCommentActivity;@Singletonpublic class WicketUrlManager implements UrlManager {diff --git a/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.javaindex d4b02600ac..d7f40a5abd 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java@@ -10,7 +10,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.javascript.JavaScriptEscape;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.util.DateUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java b/web/src/main/java/com/gitplex/server/web/component/AccountLink.javaindex 4dba43d9ef..a70bb62963 100644--- a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/AccountLink.java@@ -8,8 +8,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/BranchLink.javaindex 39a0cc8ef0..4e277b66a4 100644--- a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/BranchLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.support.DepotAndBranch;+import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.page.depot.file.DepotFilePage;diff --git a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.javaindex f989d75b71..b0f5ec305f 100644--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.depotselector.DepotSelector;diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.javaindex b5a7c19c8c..c8aa8e1635 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java@@ -9,8 +9,8 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.util.avatar.AvatarManager;diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.javaindex acbf5a3d43..22deb5aa63 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java@@ -8,7 +8,7 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.javaindex afbcf47882..aa17ee8a5c 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.select2.Select2MultiChoice;diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.javaindex 4c2b8e28f2..226c7c465c 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.javaindex 04a99ec1ee..e8958555f3 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java@@ -11,9 +11,9 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;diff --git a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java b/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.javaindex 2e72e8d326..6600f4c66b 100644--- a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.util.resource.ArchiveResource;diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.javaindex 94da549c9b..c9e43e664c 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java@@ -11,8 +11,8 @@ import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.util.avatar.AvatarManager;diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.javaindex f6d18afc9a..a060ce6277 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java@@ -2,7 +2,7 @@ package com.gitplex.server.web.component.avatar;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.util.AjaxEvent;public class AvatarChanged extends AjaxEvent {diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.javaindex 891687c7d7..b908bb6f76 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java@@ -13,8 +13,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.javaindex e10adfab5c..234510833e 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java@@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.util.avatar.AvatarManager;diff --git a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.javaindex 1076e4a4b7..e4cc97fb36 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java@@ -10,9 +10,9 @@ import org.apache.wicket.model.IModel;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.component.select2.Response;diff --git a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.javaindex 0fb86a7497..9f276be0f5 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java@@ -11,8 +11,8 @@ import com.gitplex.codeassist.InputSuggestion;import com.gitplex.codeassist.ParentedElement;import com.gitplex.codeassist.grammar.ElementSpec;import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeParser;-import com.gitplex.server.entity.Depot;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.javaindex b0e53f07b7..80513bead9 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java@@ -10,7 +10,7 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.javaindex 3e953e3ea7..93e41ecced 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.web.component.DepotPicker;import com.gitplex.server.web.util.model.AffinalDepotsModel;diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.javaindex 2d6b16d5a0..d9988065d1 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.DropdownLink;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.javaindex 6b2150f40e..530bbc23a6 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java@@ -24,9 +24,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.javaindex 35a885ac0a..02022e81c6 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java@@ -11,7 +11,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.CodeComment;+import com.gitplex.server.model.CodeComment;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.util.editable.annotation.AccountChoice;import com.gitplex.server.util.editable.annotation.Editable;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javaindex d631e0809f..91d792013f 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java@@ -32,11 +32,11 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CompareContext;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.javaindex e4f8f4005f..034a9e7059 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java@@ -32,19 +32,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentReply;-import com.gitplex.server.entity.CodeCommentStatusChange;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CodeCommentActivity;-import com.gitplex.server.entity.support.CompareContext;-import com.gitplex.server.entity.support.DepotAndRevision;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentReplyManager;import com.gitplex.server.manager.CodeCommentStatusChangeManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentReply;+import com.gitplex.server.model.CodeCommentStatusChange;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CodeCommentActivity;+import com.gitplex.server.model.support.CompareContext;+import com.gitplex.server.model.support.DepotAndRevision;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ClassUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javaindex 3853a03776..851a7c7653 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java@@ -22,9 +22,9 @@ import org.hibernate.criterion.Restrictions;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.util.StringUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.javaindex 7346d8abe6..097aa43cc1 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java@@ -13,9 +13,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AttachmentManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java b/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.javaindex 8d9c121290..7c7af105e5 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java@@ -3,7 +3,7 @@ package com.gitplex.server.web.component.comment;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Element;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.util.markdown.HtmlTransformer;import com.gitplex.server.util.markdown.MentionParser;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java b/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.javaindex d1d23436e4..b59ff61eee 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java@@ -3,7 +3,7 @@ package com.gitplex.server.web.component.comment;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Element;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.markdown.HtmlTransformer;import com.gitplex.server.util.markdown.PullRequestParser;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.javaindex 53e95880d2..2f3946c734 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java@@ -21,11 +21,11 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.DepotAndRevision;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.DepotAndRevision;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.revisionpicker.RevisionSelector;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.javaindex 08c3553949..77570b75ec 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java@@ -27,9 +27,9 @@ import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;import org.joda.time.DateTime;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.ContributorAvatars;diff --git a/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java b/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.javaindex 6149e058f6..41e8ff73d4 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.unbescape.html.HtmlEscape;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.javaindex aff283fa00..4b7d22733b 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java@@ -17,8 +17,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.html.HtmlEscape;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.Highlighter;import com.gitplex.server.util.Transformer;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.javaindex 36a2917afa..7a0ae546cb 100644--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java@@ -3,8 +3,8 @@ package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.ajax.AjaxRequestTarget;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;@SuppressWarnings("serial")public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.javaindex b0c431dcb3..e2adaceacc 100644--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java@@ -3,8 +3,8 @@ package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.ajax.AjaxRequestTarget;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;@SuppressWarnings("serial")public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.javaindex d14dd64749..9eb1c015a3 100644--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.modal.ModalLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.javaindex b534643334..5eaffa759b 100644--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java@@ -11,10 +11,10 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.javaindex 272288abe1..4a0dadc729 100644--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.modal.ModalLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.javaindex 9af3e00b66..e94caea00a 100644--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java@@ -12,10 +12,10 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.javaindex 40e8f128c3..09cf404464 100644--- a/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.model.IModel;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.util.editable.EditableUtils;import com.gitplex.server.web.editable.PropertyContext;import com.gitplex.server.web.editable.PropertyDescriptor;diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.javaindex 67d5bac252..71cb5594c6 100644--- a/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.hibernate.criterion.Order;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.javaindex 34b0025145..fbc628b4bc 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.javaindex fa1757cfc3..02b9168535 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java@@ -9,8 +9,8 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.select2.ChoiceProvider;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javaindex 7533bcbdf0..8f860aad11 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java@@ -38,8 +38,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.Depot;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javaindex 5f91613368..2bf3e6c816 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java@@ -30,8 +30,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.TextRange;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.javaindex 8a24393218..e27c7b5c3c 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java@@ -25,8 +25,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.FileHit;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.TextHit;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.javaindex 973d4a1542..76816520af 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java@@ -8,10 +8,10 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.jsymbol.TokenPosition;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.javaindex fd2fff3c11..e3fbbfe256 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java@@ -49,18 +49,18 @@ import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.CompareContext;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.Blame;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.BlameCommand;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.CompareContext;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.javaindex c0f26af9bd..0ea56a6620 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java@@ -33,9 +33,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobChange;import com.gitplex.server.git.BlobIdent;@@ -45,6 +42,9 @@ import com.gitplex.server.git.exception.GitObjectAlreadyExistsException;import com.gitplex.server.git.exception.NotGitTreeException;import com.gitplex.server.git.exception.ObsoleteCommitException;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;import com.gitplex.server.web.component.diff.revision.DiffViewMode;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.javaindex 3fc7ae9914..1c985628cf 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java@@ -24,14 +24,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Charsets;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobChange;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.PathAndContent;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.ViewStateAwareAjaxLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.javaindex fae6d64524..58cf969dda 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java@@ -30,9 +30,9 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Preconditions;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.PreventDefaultAjaxLink;import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.javaindex e5c5f56006..df2721f072 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java@@ -18,9 +18,9 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.javaindex e6933572e7..6266de68d5 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java@@ -27,8 +27,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.component.PreventDefaultAjaxLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.javaindex 9e9f818e80..96b0b81740 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java@@ -15,12 +15,12 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.diff.DiffEntry.ChangeType;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobChange;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.util.diff.DiffUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.diff.DiffRenderer;diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.javaindex d61cf028ff..feb9738832 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java@@ -4,8 +4,8 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.support.CommentPos;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.support.CommentPos;public interface SourceAware {diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex 3f5d2eef1e..b39cd56e33 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -38,17 +38,17 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.jsyntax.Token;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.Blame;import com.gitplex.server.git.BlobChange;import com.gitplex.server.git.BriefCommit;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.BlameCommand;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.RangeUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.javaindex 5334f1d43f..65ffdd776a 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java@@ -8,8 +8,8 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.support.CommentPos;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.support.CommentPos;public interface BlobCommentSupport extends Serializable {diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.javaindex a1514ec0c7..86850470e5 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java@@ -6,8 +6,8 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.support.CommentPos;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.support.CommentPos;public interface CommentSupport extends Serializable {diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.javaindex 6d397b3bc6..472ca4889e 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java@@ -58,15 +58,15 @@ import com.gitplex.codeassist.InputStatus;import com.gitplex.codeassist.InputSuggestion;import com.gitplex.jsymbol.Range;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.CompareContext;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobChange;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.diff.DiffUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.javaindex ee008d174c..99d4cc81ab 100644--- a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java@@ -12,8 +12,8 @@ import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;import com.gitplex.codeassist.parser.Element;import com.gitplex.server.GitPlex;import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.util.SuggestionUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.javaindex 6f0157bcc0..a97173bced 100644--- a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java@@ -10,7 +10,7 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.fullbranchmatch.FullBranchMatchUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.javaindex d7520918a1..1b569c21c2 100644--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java@@ -17,9 +17,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.TeamAuthorization;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.component.avatar.Avatar;diff --git a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.javaindex 991e4327b9..b77b04e166 100644--- a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java@@ -11,8 +11,8 @@ import com.gitplex.codeassist.InputSuggestion;import com.gitplex.codeassist.ParentedElement;import com.gitplex.codeassist.grammar.ElementSpec;import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeParser;-import com.gitplex.server.entity.Depot;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.javaindex 1ec44a351f..16fd43d745 100644--- a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java@@ -10,7 +10,7 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.javaindex f50ab41e6c..88c19ea790 100644--- a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java@@ -28,8 +28,8 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.component.BlobIcon;import com.gitplex.server.web.component.PreventDefaultAjaxLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.javaindex efc10c332f..3e568167af 100644--- a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java@@ -7,8 +7,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.util.depotaccess.DepotAccess;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.javaindex 7007d32328..9659e28f57 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.annotation.Nullable;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;@SuppressWarnings("serial")public class Assignee implements Serializable {diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.javaindex d52362b14a..3b9d0fe06b 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java@@ -4,8 +4,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.select2.Select2Choice;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.javaindex 224f359e55..dc6cfcb3b3 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java@@ -12,9 +12,9 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.security.SecurityUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.javaindex 1dae189eed..3f1e753cf0 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java@@ -8,10 +8,10 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;import com.gitplex.server.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.RemoveableAvatar;import com.gitplex.server.web.util.model.EntityModel;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.javaindex d171e6d245..7d9a4be792 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java@@ -8,10 +8,10 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;import com.gitplex.server.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.select2.SelectToAddChoice;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.javaindex 069a474d1d..1f990bfeb8 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java@@ -5,8 +5,8 @@ import java.util.List;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;import com.gitplex.server.web.component.select2.Response;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.javaindex 33b35457a6..73986be261 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequest.Status;-import com.gitplex.server.entity.support.CloseInfo;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.support.CloseInfo;@SuppressWarnings("serial")public class RequestStatusPanel extends Panel {diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.javaindex ed47ba52a9..1342d0b66e 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebComponent;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.PullRequestReview;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.web.behavior.dropdown.DropdownHover;import com.gitplex.server.web.component.floating.AlignPlacement;diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.javaindex bc03e02076..a9c724b916 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;import com.gitplex.server.manager.PullRequestReviewManager;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;import com.gitplex.server.security.SecurityUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.javaindex c59d138757..e9652f4b47 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java@@ -17,8 +17,8 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestVerification;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestVerification;import com.gitplex.server.web.component.DropdownLink;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.javaindex 7230920fe7..c29c18ed64 100644--- a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java@@ -15,8 +15,8 @@ import com.gitplex.codeassist.ParentedElement;import com.gitplex.codeassist.grammar.ElementSpec;import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;import com.gitplex.jsymbol.Range;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeParser;-import com.gitplex.server.entity.Depot;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.javaindex c7954fad50..703aafcc76 100644--- a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java@@ -10,7 +10,7 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 7bd06d919b..d78550e374 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.web.component.DepotPicker;import com.gitplex.server.web.util.model.AffinalDepotsModel;diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.javaindex 89c3eb81ec..3c45b4e3d5 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java@@ -9,9 +9,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;@SuppressWarnings("serial")abstract class CreateTagPanel extends Panel {diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.javaindex 488d69a822..920be27b1a 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java@@ -7,9 +7,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.DepotAndRevision;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.DepotAndRevision;import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.modal.ModalPanel;diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.javaindex 990c7ad5b8..0ab091fb86 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java@@ -38,9 +38,9 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Ref;import org.unbescape.html.HtmlEscape;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex d28dbae110..a91381fa93 100644--- a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -31,10 +31,10 @@ import org.eclipse.jgit.lib.ObjectId;import com.gitplex.jsymbol.Symbol;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.IndexConstants;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.javaindex 2dd767017e..b0330d9937 100644--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java@@ -8,8 +8,8 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Team;import com.gitplex.server.web.component.select2.ChoiceProvider;public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<Team> {diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.javaindex 6dfd8cbdcf..e0aec89387 100644--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java@@ -7,9 +7,9 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.javaindex 9432c4038f..9ae537ef64 100644--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Team;+import com.gitplex.server.model.Team;import com.gitplex.server.web.component.select2.Select2MultiChoice;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.javaindex 84cfd4c9f5..399b8af0f6 100644--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Team;+import com.gitplex.server.model.Team;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.javaindex c8acd412d4..b007a3e100 100644--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java@@ -10,8 +10,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;import com.gitplex.server.web.component.accountchoice.AccountMultiChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.javaindex dac88c1d8a..a61707380c 100644--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java@@ -5,8 +5,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 9e69aa4947..a98f199673 100644--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;import com.gitplex.server.web.component.branchchoice.BranchMultiChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 7e9b0083c7..13afc44069 100644--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -4,7 +4,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.javaindex 53bd0b2d5a..eec13c3251 100644--- a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.branchmatch.BranchMatchInput;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;diff --git a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.javaindex 776bc2602d..d9cfab9f5e 100644--- a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.fullbranchmatch.FullBranchMatchInput;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;diff --git a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.javaindex 0a6efc6264..e9509fda7d 100644--- a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.pathmatch.PathMatchInput;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;diff --git a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.javaindex 8ea957ae09..5dda9b3f51 100644--- a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.refmatch.RefMatchInput;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.javaindex 52d904841a..84cd791ba5 100644--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java@@ -11,9 +11,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;import com.gitplex.server.web.component.teamchoice.TeamMultiChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.javaindex 7f0a153771..c3e62ec8bc 100644--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java@@ -6,9 +6,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;import com.gitplex.server.web.component.teamchoice.TeamSingleChoice;import com.gitplex.server.web.editable.ErrorContext;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.javaindex 9f93a3ca7f..0fc514b5ec 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java@@ -8,8 +8,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.page.layout.LayoutPage;import com.gitplex.server.web.util.model.UserModel;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.javaindex b13a39c5f2..26d702cc7a 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java@@ -19,9 +19,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.javaindex 27977d686e..3215d937a6 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java@@ -26,9 +26,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javaindex 6d096095ac..f8015b6515 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java@@ -18,8 +18,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.javaindex 4d158127c4..ac91f1cd1b 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java@@ -15,8 +15,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.javaindex f67e0751dc..b082634eaa 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java@@ -5,9 +5,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.javaindex 470bf3e897..d1f1e096ce 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java@@ -18,8 +18,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.javaindex c5e62d120f..2d903d9d98 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java@@ -27,9 +27,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.javaindex 68e8f7fad1..6b3c2801c4 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java@@ -22,10 +22,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.DropdownLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.javaindex f8c91461ec..80e64b3ab0 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java@@ -6,10 +6,10 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.javaindex 4572f01a28..392f1c1539 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java@@ -25,11 +25,11 @@ import org.json.JSONWriter;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.TeamManager;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.ChoiceProvider;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.javaindex 0b8d0b1c55..538a5111c5 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java@@ -16,11 +16,11 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;import com.gitplex.server.web.component.teamchoice.TeamMultiChoice;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.javaindex 5ea34ae748..fce4016634 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java@@ -12,9 +12,9 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.javaindex 0861d3e8a6..809ff26406 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.select2.Select2MultiChoice;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.javaindex 22b957eca9..a36f5d4e52 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.account.overview;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.page.account.AccountLayoutPage;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.javaindex 0b06270697..dbb7f3219c 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java@@ -18,9 +18,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.javaindex 24ffe5c12e..a0aa73ae37 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.javaindex ea9743a171..31dc65f774 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java@@ -6,10 +6,10 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.javaindex b5573ace28..de6ff9d8fe 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;@SuppressWarnings("serial")public class OrganizationOverviewPanel extends GenericPanel<Account> {diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.javaindex b2e9ff65e0..9268fb6a66 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java@@ -13,8 +13,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.javaindex b3113b20d2..508658b2b8 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.form.upload.FileUploadField;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.util.FileUtils;import com.gitplex.server.web.component.avatar.AvatarChanged;import com.gitplex.server.web.util.avatar.AvatarManager;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.javaindex 7da427f05e..09866249f9 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java@@ -12,8 +12,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.javaindex 284b690ee5..426e460daa 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java@@ -12,8 +12,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.javaindex 52e12f68d7..61b606337a 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java@@ -23,10 +23,10 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestTask;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestTask;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.javaindex 13ba6ae1db..e4389f21cb 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java@@ -5,8 +5,8 @@ import java.util.List;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;import com.gitplex.server.web.component.select2.Response;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.javaindex f826167dde..1fdd576853 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.select2.Select2MultiChoice;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.javaindex 464368e9be..8774a26ece 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java@@ -8,9 +8,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.javaindex 102d1071d8..dad7d744f4 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java@@ -27,11 +27,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamAuthorization;import com.gitplex.server.manager.TeamAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.javaindex c75f54419e..a30724984b 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java@@ -10,9 +10,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.javaindex 1d66082205..d2f2989560 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java@@ -21,11 +21,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.TeamManager;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.page.account.AccountLayoutPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.javaindex cf84a1d7b3..7b2388525f 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java@@ -27,11 +27,11 @@ import org.json.JSONWriter;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.javaindex a2c367372f..370aaaf8ae 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java@@ -16,9 +16,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Team;import com.gitplex.server.manager.TeamManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Team;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.markdown.MarkdownPanel;import com.gitplex.server.web.component.tabbable.PageTab;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.javaindex 9f58f02f60..cc59936ef5 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java@@ -2,7 +2,7 @@ package com.gitplex.server.web.page.admin;import java.io.Serializable;-import com.gitplex.server.entity.support.setting.BackupSetting;+import com.gitplex.server.model.support.setting.BackupSetting;import com.gitplex.server.util.editable.annotation.Editable;@Editablediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.javaindex 4f1a2509fb..bcf89cc236 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java@@ -2,7 +2,7 @@ package com.gitplex.server.web.page.admin;import java.io.Serializable;-import com.gitplex.server.entity.support.setting.MailSetting;+import com.gitplex.server.model.support.setting.MailSetting;import com.gitplex.server.util.editable.annotation.Editable;@Editablediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.javaindex 4af569f87f..f1d761cf3a 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java@@ -14,10 +14,10 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Sets;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;+import com.gitplex.server.model.Account;import com.gitplex.server.util.ExceptionUtils;import com.gitplex.server.web.behavior.testform.TestFormBehavior;import com.gitplex.server.web.behavior.testform.TestResult;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.javaindex f814b61572..90ccd1ac7f 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java@@ -3,8 +3,8 @@ package com.gitplex.server.web.page.admin;import org.apache.wicket.markup.html.form.Form;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.support.setting.SecuritySetting;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.support.setting.SecuritySetting;import com.gitplex.server.web.editable.BeanContext;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.javaindex 8adbd694a7..6aa4a08226 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java@@ -3,8 +3,8 @@ package com.gitplex.server.web.page.admin;import org.apache.wicket.markup.html.form.Form;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.support.setting.SystemSetting;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.web.editable.BeanContext;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.javaindex ce35e97518..68c23723bb 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.form.Form;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.PathSegment;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.javaindex c681946567..aabf34cd8c 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java@@ -16,8 +16,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.javaindex 755d2dc650..18b17c52aa 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java@@ -13,8 +13,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.page.CommonPage;import com.gitplex.server.web.page.init.ServerInitPage;import com.gitplex.server.web.page.security.LoginPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.javaindex fee7d9ba7e..14ba0cfb2e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java@@ -30,10 +30,10 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.tabbable.PageTab;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.javaindex e7923af77a..8527d17955 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javaindex 033f8b2cbf..ef724dc532 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java@@ -48,14 +48,14 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.BranchWatch;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.DepotAndBranch;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.BranchWatchManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.BranchWatch;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.javaindex dedc605dea..1e17249ca4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java@@ -4,10 +4,10 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.CodeCommentRelation;-import com.gitplex.server.entity.support.CompareContext;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.CodeCommentRelation;+import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;import com.gitplex.server.web.page.depot.file.DepotFilePage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.javaindex 3fc52f7746..ad11f2370b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java@@ -8,8 +8,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.manager.CodeCommentInfoManager;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentAware;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.component.comment.CodeCommentListPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javaindex df6755e45e..9ac7388ed3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java@@ -36,15 +36,15 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CommitInfoManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.ContributorAvatars;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javaindex e01daebc8d..dac5fb9703 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java@@ -47,12 +47,12 @@ import org.unbescape.java.JavaEscape;import com.google.common.base.Optional;import com.google.common.base.Throwables;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.DepotAndRevision;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.RevListCommand;import com.gitplex.server.manager.WorkExecutor;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.DepotAndRevision;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.concurrent.PrioritizedCallable;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.javaindex 5a2e38cb70..d2c453f2aa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java@@ -15,9 +15,9 @@ import com.gitplex.codeassist.grammar.ElementSpec;import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;import com.gitplex.jsymbol.Range;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.NameAndEmail;import com.gitplex.server.manager.CommitInfoManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.match.PatternApplied;import com.gitplex.server.util.match.WildcardUtils;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javaindex 081b723f89..2d097810fa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java@@ -32,16 +32,16 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.CompareContext;-import com.gitplex.server.entity.support.DepotAndBranch;-import com.gitplex.server.entity.support.DepotAndRevision;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.CompareContext;+import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.DepotAndRevision;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.component.commitlist.CommitListPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.javaindex 451aee0757..fdfe16d4e0 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java@@ -39,12 +39,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.TextRange;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;@@ -53,6 +47,12 @@ import com.gitplex.server.git.exception.GitObjectNotFoundException;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.TextRange;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.search.IndexManager;import com.gitplex.server.search.SearchManager;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.javaindex 8bb7e4da16..1ae30fa10b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java@@ -9,7 +9,7 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.entity.support.CommentPos;+import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.javaindex dfe73d5242..c2ddc5d120 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java@@ -9,10 +9,10 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.javaindex 5edbae97e2..0d423b1d7c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java@@ -19,9 +19,9 @@ import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.UrlManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.DropdownLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javaindex b64912e2cf..17cb805a8b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java@@ -1,7 +1,7 @@package com.gitplex.server.web.page.depot.pullrequest.newrequest;-import static com.gitplex.server.entity.PullRequest.Status.INTEGRATED;-import static com.gitplex.server.entity.PullRequest.Status.PENDING_UPDATE;+import static com.gitplex.server.model.PullRequest.Status.INTEGRATED;+import static com.gitplex.server.model.PullRequest.Status.PENDING_UPDATE;import java.io.IOException;import java.util.ArrayList;@@ -36,20 +36,20 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;-import com.gitplex.server.entity.PullRequest.Status;-import com.gitplex.server.entity.support.CloseInfo;-import com.gitplex.server.entity.support.CommentPos;-import com.gitplex.server.entity.support.DepotAndBranch;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.support.CloseInfo;+import com.gitplex.server.model.support.CommentPos;+import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.util.diff.WhitespaceOption;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javaindex 2dd2f93274..a8a670a390 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java@@ -8,10 +8,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javaindex 26cae12d63..4407a37be8 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java@@ -7,8 +7,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javaindex ea39b6a038..126de9bee5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java@@ -1,6 +1,6 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import static com.gitplex.server.entity.PullRequest.Status.PENDING_INTEGRATE;+import static com.gitplex.server.model.PullRequest.Status.PENDING_INTEGRATE;import javax.annotation.Nullable;@@ -10,16 +10,16 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReview;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequest.Status;-import com.gitplex.server.entity.support.IntegrationPreview;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestReviewManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReview;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.security.SecurityUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javaindex 7c1a9c1d19..fbae92cb49 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java@@ -1,10 +1,10 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.APPROVE;import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;@@ -57,14 +57,14 @@ import org.apache.wicket.util.visit.IVisitor;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequest.Status;-import com.gitplex.server.entity.support.DepotAndBranch;-import com.gitplex.server.entity.support.IntegrationPreview;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.javaindex 27571d2d2d..dc3d3a5ac5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java@@ -1,9 +1,9 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.model.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -13,12 +13,12 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;-import com.gitplex.server.entity.support.IntegrationPreview;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.security.SecurityUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javaindex 9c2d2316e6..21b9d24faf 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javaindex ab9545fd39..aecf6a1159 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java@@ -34,14 +34,14 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.support.CodeCommentActivity;-import com.gitplex.server.entity.support.CommentPos;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.support.CodeCommentActivity;+import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.DropdownLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javaindex 88a29bd891..69abc04eaa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -7,8 +7,8 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.CodeComment;-import com.gitplex.server.entity.PullRequest;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentAware;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.component.comment.CodeCommentListPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.javaindex 3397c81e9f..b212dee3e5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java@@ -16,9 +16,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.IntegrationPreview;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javaindex fa852f2037..11f44f330b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java@@ -36,19 +36,19 @@ import org.joda.time.DateTime;import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestComment;-import com.gitplex.server.entity.PullRequestReference;-import com.gitplex.server.entity.PullRequestReview;-import com.gitplex.server.entity.PullRequestReviewInvitation;-import com.gitplex.server.entity.PullRequestStatusChange;-import com.gitplex.server.entity.PullRequestUpdate;-import com.gitplex.server.entity.PullRequestWatch;-import com.gitplex.server.entity.PullRequest.IntegrationStrategy;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestComment;+import com.gitplex.server.model.PullRequestReference;+import com.gitplex.server.model.PullRequestReview;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestStatusChange;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.PullRequestWatch;+import com.gitplex.server.model.PullRequest.IntegrationStrategy;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.security.SecurityUtils;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javaindex 0c852c2b31..5e7fd80077 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java@@ -9,8 +9,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.websocket.PullRequestChanged;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.javaindex 697c70632e..89c81e878d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequestComment;import com.gitplex.server.manager.PullRequestCommentManager;+import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javaindex 295f88362d..8b37ebb79c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java@@ -17,10 +17,10 @@ import org.apache.wicket.model.Model;import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestComment;import com.gitplex.server.manager.PullRequestCommentManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;import com.gitplex.server.web.component.AccountLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.javaindex 311d0b50cc..ced2e8cb0f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javaindex 5bec90e79e..d3634ba600 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java@@ -17,9 +17,9 @@ import org.apache.wicket.model.Model;import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.javaindex 79113a68da..a7004f008b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequestReference;import com.gitplex.server.manager.PullRequestReferenceManager;+import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javaindex e262956666..0329cfb7f9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReference;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javaindex d5d3224c52..f48682a427 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequestStatusChange;import com.gitplex.server.manager.PullRequestStatusChangeManager;+import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javaindex ee070232db..6e14edf94e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java@@ -19,10 +19,10 @@ import org.apache.wicket.model.Model;import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestStatusChange;import com.gitplex.server.manager.PullRequestStatusChangeManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;import com.gitplex.server.web.component.AccountLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.javaindex d2a27780b6..ddb74217c5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.PullRequestUpdate;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javaindex 08171213d6..f6f05c1f51 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java@@ -21,11 +21,11 @@ import org.apache.wicket.util.visit.IVisitor;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestUpdate;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.javaindex d7f738a2fc..a0501ac906 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java@@ -33,10 +33,10 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.javaindex 6f3868c47f..82d2a83954 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java@@ -1,9 +1,9 @@package com.gitplex.server.web.page.depot.pullrequest.requestlist;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSource;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSourceDepot;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTarget;-import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTargetDepot;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSource;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSourceDepot;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTarget;+import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTargetDepot;import java.io.Serializable;import java.util.Date;@@ -13,9 +13,9 @@ import javax.validation.constraints.NotNull;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.support.DepotAndBranch;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.util.editable.annotation.AccountChoice;import com.gitplex.server.util.editable.annotation.BranchChoice;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.javaindex 231608262d..dea3d245f3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java@@ -24,11 +24,11 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javaindex b196098b3f..c809526ae9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java@@ -20,10 +20,10 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.UserAuthorization;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.javaindex 711391c4b0..482f7ff11e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java@@ -24,11 +24,11 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.Team;-import com.gitplex.server.entity.TeamAuthorization;import com.gitplex.server.manager.TeamAuthorizationManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Team;+import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.javaindex 46153673a5..88e6b0a736 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java@@ -8,9 +8,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.CommitMessageTransformSetting;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.CommitMessageTransformSetting;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.reflection.ReflectionPropertyEditor;import com.gitplex.server.web.page.depot.setting.DepotSettingPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.javaindex 745644e309..0f0d01626f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java@@ -9,7 +9,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.AndGateKeeper;import com.gitplex.server.gatekeeper.AndOrGateKeeper;import com.gitplex.server.gatekeeper.CompositeGateKeeper;@@ -18,6 +17,7 @@ import com.gitplex.server.gatekeeper.DefaultGateKeeper;import com.gitplex.server.gatekeeper.GateKeeper;import com.gitplex.server.gatekeeper.NotGateKeeper;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.dragdrop.DropBehavior;abstract class GateKeeperDropBehavior extends DropBehavior {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.javaindex 051da1cd86..7ebd9c903c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java@@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.gatekeeper.GateKeeper;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.util.ReflectionUtils;import com.gitplex.server.util.editable.EditableUtils;import com.gitplex.server.web.component.modal.ModalPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.javaindex db590d10ad..ecaa1cfae5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java@@ -18,10 +18,10 @@ import org.apache.wicket.markup.html.panel.Panel;import com.google.common.base.Preconditions;import com.gitplex.launcher.loader.ImplementationRegistry;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.gatekeeper.DefaultGateKeeper;import com.gitplex.server.gatekeeper.GateKeeper;import com.gitplex.server.gatekeeper.TeamAwareGateKeeper;+import com.gitplex.server.model.Account;import com.gitplex.server.util.editable.EditableUtils;import com.gitplex.server.web.behavior.CollapseBehavior;import com.gitplex.server.web.component.AccordionPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.javaindex 24b5bb5a3a..22c9a74543 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java@@ -16,10 +16,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.javaindex c16d199023..e1ac0ffd5b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.server.entity.support.IntegrationPolicy;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.web.editable.BeanContext;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.javaindex 8095ce2a92..16b75ffb81 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java@@ -13,9 +13,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.IntegrationPolicy;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.web.behavior.sortable.SortBehavior;import com.gitplex.server.web.behavior.sortable.SortPosition;import com.gitplex.server.web.page.depot.setting.DepotSettingPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.javaindex f050d224ee..9655eb0108 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.server.entity.support.IntegrationPolicy;+import com.gitplex.server.model.support.IntegrationPolicy;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javaindex 9f7f75e78b..0bb838831d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java@@ -33,9 +33,9 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTag;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;diff --git a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.javaindex 5992cd6195..61900b4055 100644--- a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java@@ -34,8 +34,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.string.Strings;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.Account;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.page.home.DashboardPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.javaindex 9eb60c07ff..2c2487c7d7 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java@@ -18,8 +18,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.page.depot.file.DepotFilePage;diff --git a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.javaindex 1164acabf6..db55d2445d 100644--- a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java@@ -11,8 +11,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.init.InitStage;import com.gitplex.server.util.init.ManualConfig;diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.javaindex 7e02e7e705..ba37a06582 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java@@ -6,10 +6,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;import com.gitplex.server.web.editable.BeanContext;diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javaindex 0d4ee08090..b2c4baf702 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java@@ -26,9 +26,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.launcher.loader.Plugin;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.avatar.Avatar;diff --git a/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java b/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.javaindex 7cbd830033..f9c0d9cba7 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;+import com.gitplex.server.model.Account;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.web.behavior.testform.TestFormBehavior;import com.gitplex.server.web.behavior.testform.TestResult;diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javaindex ec47548d5e..92d8a6d152 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java@@ -20,10 +20,10 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;+import com.gitplex.server.model.Account;import com.gitplex.server.web.WebSession;import com.gitplex.server.web.page.base.BasePage;diff --git a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.javaindex c690671052..09ede0a32c 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java@@ -9,9 +9,9 @@ import org.apache.wicket.markup.html.form.SubmitLink;import org.apache.wicket.markup.html.link.Link;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;diff --git a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.javaindex 4f9e77d47c..84ba9f7a0d 100644--- a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java+++ b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java@@ -13,10 +13,10 @@ import javax.annotation.Nullable;import com.gitplex.codeassist.InputSuggestion;import com.gitplex.jsymbol.Range;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.CommitInfoManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.match.PatternApplied;import com.gitplex.server.util.match.WildcardUtils;diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.javaindex 0821c0cef0..de2732fbbd 100644--- a/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java@@ -7,7 +7,7 @@ import javax.annotation.Nullable;import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;public interface AvatarManager {diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.javaindex b20fe6be96..d0b7e833dd 100644--- a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java@@ -16,8 +16,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.entity.Account;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.model.Account;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.LockUtils;diff --git a/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.javaindex 255317571c..4d93f6da10 100644--- a/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java+++ b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java@@ -1,7 +1,7 @@package com.gitplex.server.web.util.commitmessagetransform;import com.gitplex.launcher.loader.ExtensionPoint;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;@ExtensionPointpublic interface CommitMessageTransformer {diff --git a/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.javaindex 162950b928..95ff01e797 100644--- a/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java+++ b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java@@ -2,8 +2,8 @@ package com.gitplex.server.web.util.commitmessagetransform;import javax.inject.Singleton;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.support.CommitMessageTransformSetting;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.support.CommitMessageTransformSetting;@Singletonpublic class PatternCommitMessageTransformer implements CommitMessageTransformer {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.javaindex c352da8ba1..fb618dd5bf 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java@@ -3,12 +3,12 @@ package com.gitplex.server.web.util.depotaccess;import java.util.ArrayList;import java.util.List;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.Depot;-import com.gitplex.server.entity.OrganizationMembership;-import com.gitplex.server.entity.TeamAuthorization;-import com.gitplex.server.entity.TeamMembership;-import com.gitplex.server.entity.UserAuthorization;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.model.TeamAuthorization;+import com.gitplex.server.model.TeamMembership;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.privilege.DepotPrivilege;public class DepotAccess {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.javaindex d903ebc7c9..d2915123e4 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java@@ -4,8 +4,8 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.UserAuthorization;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.privilege.DepotPrivilege;public class IsDepotCollaborator implements PrivilegeSource {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.javaindex 0d9dfa091f..bce7c77f72 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.UserAuthorization;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.javaindex f3bfef5f55..21959f1365 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java@@ -4,8 +4,8 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.privilege.DepotPrivilege;public class IsOrganizationAdmin implements PrivilegeSource {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.javaindex 83266e2ee8..d79963a6c2 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.OrganizationMembership;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.web.page.account.members.MemberTeamListPage;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.javaindex 30e243b011..4b6b27456e 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java@@ -4,8 +4,8 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.OrganizationMembership;import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.privilege.DepotPrivilege;public class IsOrganizationMember implements PrivilegeSource {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.javaindex 3c6fa8fd74..07edc79035 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java@@ -5,8 +5,8 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.Account;-import com.gitplex.server.entity.OrganizationMembership;+import com.gitplex.server.model.Account;+import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.page.account.setting.ProfileEditPage;diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.javaindex c7f5970fef..a843048bee 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java@@ -4,8 +4,8 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.TeamMembership;import com.gitplex.server.manager.TeamMembershipManager;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.privilege.DepotPrivilege;public class IsTeamMember implements PrivilegeSource {diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.javaindex 45b2b86ea7..9a5d6e528d 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.server.entity.TeamMembership;+import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.page.account.teams.TeamDepotListPage;import com.gitplex.server.web.page.account.teams.TeamMemberListPage;diff --git a/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java b/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.javaindex 462249385c..ae323185a2 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java@@ -8,7 +8,7 @@ import java.util.List;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;diff --git a/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java b/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.javaindex 2fc5bc16ce..d6a5d308a4 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java@@ -10,8 +10,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.RefInfo;+import com.gitplex.server.model.Depot;public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {diff --git a/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java b/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.javaindex 1760b17d2b..0cef3cec4b 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java@@ -1,6 +1,6 @@package com.gitplex.server.web.util.model;-import com.gitplex.server.entity.Depot;+import com.gitplex.server.model.Depot;/** Shortcut for {@link EntityModel}<Repository> */public class DepotModel extends EntityModel<Depot> {diff --git a/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java b/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.javaindex 90f71458eb..50cbddcda2 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java@@ -5,7 +5,7 @@ import javax.annotation.Nullable;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.persistence.AbstractEntity;+import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.ClassUtils;diff --git a/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java b/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.javaindex fb15cbdad7..71dd197e14 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java@@ -6,8 +6,8 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.server.entity.PullRequest;-import com.gitplex.server.entity.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestReviewInvitation;@SuppressWarnings("serial")public class ReviewersModel extends LoadableDetachableModel<List<PullRequestReviewInvitation>>{diff --git a/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java b/web/src/main/java/com/gitplex/server/web/util/model/UserModel.javaindex ff155c2953..36eb3472c9 100644--- a/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java+++ b/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java@@ -1,6 +1,6 @@package com.gitplex.server.web.util.model;-import com.gitplex.server.entity.Account;+import com.gitplex.server.model.Account;public class UserModel extends EntityModel<Account> {diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.javaindex 67e28b6b1c..8b97ca85ec 100644--- a/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java@@ -19,8 +19,8 @@ import org.eclipse.jgit.archive.ZipFormat;import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.javaindex 14317e6267..13e6e324f9 100644--- a/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java+++ b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java@@ -18,9 +18,9 @@ import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.manager.AttachmentManager;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.javaindex 781489d0cf..4142f58452 100644--- a/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java+++ b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java@@ -15,11 +15,11 @@ import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;-import com.gitplex.server.entity.Depot;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;