The Unified and Autonomous Development Platform
Remove organization concept to simplify concepts
robin shen7836193ede1d
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex d479c3e6b9..c16d8ce76c 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -5,7 +5,6 @@ import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Field;import java.lang.reflect.Method;import java.util.ArrayList;-import java.util.Set;import javax.inject.Singleton;import javax.persistence.OneToMany;@@ -45,20 +44,22 @@ import com.gitplex.server.command.RestoreDBCommand;import com.gitplex.server.command.UpgradeCommand;import com.gitplex.server.git.config.GitConfig;import com.gitplex.server.git.jackson.GitObjectMapperConfigurator;-import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.AttachmentManager;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.BranchWatchManager;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentReplyManager;import com.gitplex.server.manager.CodeCommentStatusChangeManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.GroupAuthorizationManager;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.manager.MembershipManager;import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.MarkdownManager;-import com.gitplex.server.manager.OrganizationMembershipManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestReferenceManager;@@ -69,27 +70,27 @@ import com.gitplex.server.manager.PullRequestWatchManager;import com.gitplex.server.manager.ReviewInvitationManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.manager.TeamAuthorizationManager;-import com.gitplex.server.manager.TeamManager;-import com.gitplex.server.manager.TeamMembershipManager;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.manager.WorkExecutor;-import com.gitplex.server.manager.impl.DefaultAccountManager;import com.gitplex.server.manager.impl.DefaultAttachmentManager;import com.gitplex.server.manager.impl.DefaultBatchWorkManager;import com.gitplex.server.manager.impl.DefaultBranchWatchManager;+import com.gitplex.server.manager.impl.DefaultCacheManager;import com.gitplex.server.manager.impl.DefaultCodeCommentManager;import com.gitplex.server.manager.impl.DefaultCodeCommentReplyManager;import com.gitplex.server.manager.impl.DefaultCodeCommentStatusChangeManager;import com.gitplex.server.manager.impl.DefaultCommitInfoManager;import com.gitplex.server.manager.impl.DefaultConfigManager;import com.gitplex.server.manager.impl.DefaultDataManager;-import com.gitplex.server.manager.impl.DefaultDepotManager;+import com.gitplex.server.manager.impl.DefaultGroupAuthorizationManager;+import com.gitplex.server.manager.impl.DefaultGroupManager;+import com.gitplex.server.manager.impl.DefaultMembershipManager;import com.gitplex.server.manager.impl.DefaultMailManager;import com.gitplex.server.manager.impl.DefaultMarkdownManager;import com.gitplex.server.manager.impl.DefaultNotificationManager;-import com.gitplex.server.manager.impl.DefaultOrganizationMembershipManager;+import com.gitplex.server.manager.impl.DefaultProjectManager;import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;import com.gitplex.server.manager.impl.DefaultPullRequestManager;import com.gitplex.server.manager.impl.DefaultPullRequestReferenceManager;@@ -100,10 +101,8 @@ import com.gitplex.server.manager.impl.DefaultPullRequestWatchManager;import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;import com.gitplex.server.manager.impl.DefaultReviewManager;import com.gitplex.server.manager.impl.DefaultStorageManager;-import com.gitplex.server.manager.impl.DefaultTeamAuthorizationManager;-import com.gitplex.server.manager.impl.DefaultTeamManager;-import com.gitplex.server.manager.impl.DefaultTeamMembershipManager;import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;+import com.gitplex.server.manager.impl.DefaultUserManager;import com.gitplex.server.manager.impl.DefaultVisitInfoManager;import com.gitplex.server.manager.impl.DefaultWorkExecutor;import com.gitplex.server.manager.impl.NotificationManager;@@ -137,12 +136,9 @@ import com.gitplex.server.util.jetty.DefaultJettyRunner;import com.gitplex.server.util.jetty.JettyRunner;import com.gitplex.server.util.schedule.DefaultTaskScheduler;import com.gitplex.server.util.schedule.TaskScheduler;-import com.gitplex.server.util.validation.AccountNameReservation;import com.gitplex.server.util.validation.DefaultEntityValidator;-import com.gitplex.server.util.validation.DepotNameReservation;import com.gitplex.server.util.validation.EntityValidator;import com.gitplex.server.util.validation.ValidatorProvider;-import com.google.common.collect.Sets;import com.google.inject.matcher.AbstractMatcher;import com.google.inject.matcher.Matchers;import com.pmease.security.shiro.bcrypt.BCryptPasswordService;@@ -189,28 +185,6 @@ public class CoreModule extends AbstractPluginModule {configurePersistence();- /*- * Contribute empty reservations to avoid Guice complain- */- contribute(AccountNameReservation.class, new AccountNameReservation() {-- @Override- public Set<String> getReserved() {- return Sets.newHashSet();- }- });-- /*- * Contribute empty reservations to avoid Guice complain- */- contribute(DepotNameReservation.class, new DepotNameReservation() {-- @Override- public Set<String> getReserved() {- return Sets.newHashSet();- }- });-bind(GitConfig.class).toProvider(GitConfigProvider.class);/*@@ -224,8 +198,8 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);bind(PullRequestManager.class).to(DefaultPullRequestManager.class);bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);- bind(DepotManager.class).to(DefaultDepotManager.class);- bind(AccountManager.class).to(DefaultAccountManager.class);+ bind(ProjectManager.class).to(DefaultProjectManager.class);+ bind(UserManager.class).to(DefaultUserManager.class);bind(ReviewInvitationManager.class).to(DefaultReviewInvitationManager.class);bind(ReviewManager.class).to(DefaultReviewManager.class);bind(MailManager.class).to(DefaultMailManager.class);@@ -235,10 +209,9 @@ public class CoreModule extends AbstractPluginModule {bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);- bind(TeamManager.class).to(DefaultTeamManager.class);- bind(OrganizationMembershipManager.class).to(DefaultOrganizationMembershipManager.class);- bind(TeamMembershipManager.class).to(DefaultTeamMembershipManager.class);- bind(TeamAuthorizationManager.class).to(DefaultTeamAuthorizationManager.class);+ bind(GroupManager.class).to(DefaultGroupManager.class);+ bind(MembershipManager.class).to(DefaultMembershipManager.class);+ bind(GroupAuthorizationManager.class).to(DefaultGroupAuthorizationManager.class);bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);@@ -247,6 +220,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(NotificationManager.class).to(DefaultNotificationManager.class);+ bind(CacheManager.class).to(DefaultCacheManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/com/gitplex/server/GitPlex.java b/core/src/main/java/com/gitplex/server/GitPlex.javaindex 1a740d88b6..42989e646f 100644--- a/core/src/main/java/com/gitplex/server/GitPlex.java+++ b/core/src/main/java/com/gitplex/server/GitPlex.java@@ -26,7 +26,7 @@ import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.event.lifecycle.SystemStopped;import com.gitplex.server.event.lifecycle.SystemStopping;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;import com.gitplex.server.persistence.PersistManager;@@ -61,7 +61,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {private final DataManager dataManager;- private final AccountManager accountManager;+ private final UserManager userManager;private final ServerConfig serverConfig;@@ -72,7 +72,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {@Injectpublic GitPlex(JettyRunner jettyRunner, TaskScheduler taskScheduler, PersistManager persistManager,Dao dao, UnitOfWork unitOfWork, ServerConfig serverConfig, DataManager dataManager,- ConfigManager configManager, AccountManager accountManager, ListenerRegistry listenerRegistry) {+ ConfigManager configManager, UserManager userManager, ListenerRegistry listenerRegistry) {this.jettyRunner = jettyRunner;this.taskScheduler = taskScheduler;this.persistManager = persistManager;@@ -81,7 +81,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {this.configManager = configManager;this.dataManager = dataManager;this.serverConfig = serverConfig;- this.accountManager = accountManager;+ this.userManager = userManager;this.listenerRegistry = listenerRegistry;initStage = new InitStage("Server is Starting...");@@ -111,7 +111,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {dao.getSession().clear();}- ThreadContext.bind(accountManager.getRoot().asSubject());+ ThreadContext.bind(userManager.getRoot().asSubject());listenerRegistry.post(new SystemStarting());} finally {@@ -178,7 +178,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {@Sessional@Overridepublic void preStop() {- ThreadContext.bind(accountManager.getRoot().asSubject());+ ThreadContext.bind(userManager.getRoot().asSubject());listenerRegistry.post(new SystemStopping());}diff --git a/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.javaindex 92ca60e398..51673c7c0b 100644--- a/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java+++ b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java@@ -11,8 +11,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.launcher.bootstrap.Bootstrap;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.DefaultPersistManager;import com.gitplex.server.persistence.HibernateProperties;import com.gitplex.server.persistence.IdManager;@@ -24,16 +24,16 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {private static final Logger logger = LoggerFactory.getLogger(ResetAdminPasswordCommand.class);- private final AccountManager accountManager;+ private final UserManager userManager;private final PasswordService passwordService;@Injectpublic ResetAdminPasswordCommand(PhysicalNamingStrategy physicalNamingStrategy, HibernateProperties properties,Interceptor interceptor, IdManager idManager, Dao dao,- EntityValidator validator, AccountManager accountManager, PasswordService passwordService) {+ EntityValidator validator, UserManager userManager, PasswordService passwordService) {super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);- this.accountManager = accountManager;+ this.userManager = userManager;this.passwordService = passwordService;}@@ -53,14 +53,14 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {Metadata metadata = buildMetadata();sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();- Account root = accountManager.get(Account.ADMINISTRATOR_ID);+ User root = userManager.get(User.ROOT_ID);if (root == null) {logger.error("Server not set up yet");System.exit(1);}String password = Bootstrap.command.getArgs()[0];root.setPassword(passwordService.encryptPassword(password));- accountManager.save(root);+ userManager.save(root);// wait for a short period to have embedded db flushing datatry {diff --git a/core/src/main/java/com/gitplex/server/event/RefUpdated.java b/core/src/main/java/com/gitplex/server/event/RefUpdated.javaindex 1043f18e00..f07a026975 100644--- a/core/src/main/java/com/gitplex/server/event/RefUpdated.java+++ b/core/src/main/java/com/gitplex/server/event/RefUpdated.java@@ -2,11 +2,11 @@ package com.gitplex.server.event;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public class RefUpdated {- private final Depot depot;+ private final Project project;private final String refName;@@ -14,15 +14,15 @@ public class RefUpdated {private final ObjectId newObjectId;- public RefUpdated(Depot depot, String refName, ObjectId oldObjectId, ObjectId newObjectId) {- this.depot = depot;+ public RefUpdated(Project project, String refName, ObjectId oldObjectId, ObjectId newObjectId) {+ this.project = project;this.refName = refName;this.oldObjectId = oldObjectId;this.newObjectId = newObjectId;}- public Depot getDepot() {- return depot;+ public Project getProject() {+ return project;}public String getRefName() {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.javadeleted file mode 100644index d65babe356..0000000000--- a/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.event.depot;--import com.gitplex.server.model.Depot;--public class DepotDeleted {-- private final Depot depot;-- public DepotDeleted(Depot depot) {- this.depot = depot;- }-- public Depot getDepot() {- return depot;- }--}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.javadeleted file mode 100644index a1f26daeac..0000000000--- a/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java+++ /dev/null@@ -1,24 +0,0 @@-package com.gitplex.server.event.depot;--import com.gitplex.server.model.Depot;--public class DepotRenamed {-- private final Depot depot;-- private final String oldName;-- public DepotRenamed(Depot depot, String oldName) {- this.depot = depot;- this.oldName = oldName;- }-- public Depot getDepot() {- return depot;- }-- public String getOldName() {- return oldName;- }--}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.javadeleted file mode 100644index 5c2df48919..0000000000--- a/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java+++ /dev/null@@ -1,25 +0,0 @@-package com.gitplex.server.event.depot;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;--public class DepotTransferred {-- private final Depot depot;-- private final Account oldAccount;-- public DepotTransferred(Depot depot, Account oldAccount) {- this.depot = depot;- this.oldAccount = oldAccount;- }-- public Depot getDepot() {- return depot;- }-- public Account getOldAccount() {- return oldAccount;- }--}diff --git a/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.java b/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.javanew file mode 100644index 0000000000..289a234de7--- /dev/null+++ b/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.java@@ -0,0 +1,17 @@+package com.gitplex.server.event.project;++import com.gitplex.server.model.Project;++public class ProjectDeleted {++ private final Project project;++ public ProjectDeleted(Project project) {+ this.project = project;+ }++ public Project getProject() {+ return project;+ }++}diff --git a/core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.java b/core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.javanew file mode 100644index 0000000000..39ff85498e--- /dev/null+++ b/core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.java@@ -0,0 +1,24 @@+package com.gitplex.server.event.project;++import com.gitplex.server.model.Project;++public class ProjectRenamed {++ private final Project project;++ private final String oldName;++ public ProjectRenamed(Project project, String oldName) {+ this.project = project;+ this.oldName = oldName;+ }++ public Project getProject() {+ return project;+ }++ public String getOldName() {+ return oldName;+ }++}diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.javaindex 5bd9675d64..b94d3ee580 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java@@ -2,7 +2,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@@ -17,7 +17,7 @@ public class MergePreviewCalculated extends PullRequestEvent {}@Override- public Account getUser() {+ public User getUser() {return null;}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 712109c177..afdd1b7a60 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,7 +2,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.CodeCommentActivity;public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {@@ -24,7 +24,7 @@ public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCod}@Override- public Account getUser() {+ public User getUser() {return activity.getUser();}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 bdc7fa9158..668cb238d9 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@@ -3,7 +3,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;import com.gitplex.server.event.MarkdownAware;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;import com.gitplex.server.util.editable.annotation.Editable;@@ -20,7 +20,7 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent i}@Override- public Account getUser() {+ public User getUser() {return getComment().getUser();}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 c72d9e365c..b8f0958726 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@@ -3,7 +3,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;import com.gitplex.server.event.MarkdownAware;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.util.editable.annotation.Editable;@@ -27,7 +27,7 @@ public class PullRequestCommentCreated extends PullRequestEvent implements Markd}@Override- public Account getUser() {+ public User getUser() {return comment.getUser();}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 2e4cdc683b..41099ed7fd 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@@ -4,7 +4,7 @@ import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;public abstract class PullRequestEvent {@@ -20,7 +20,7 @@ public abstract class PullRequestEvent {}@Nullable- public abstract Account getUser();+ public abstract User getUser();public abstract Date getDate();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 fbfaf75262..8197c46868 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@@ -3,7 +3,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;import com.gitplex.server.event.MarkdownAware;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;@@ -20,8 +20,8 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware}@Override- public Account getUser() {- return Account.getForDisplay(getRequest().getSubmitter(), getRequest().getSubmitterName());+ public User getUser() {+ return User.getForDisplay(getRequest().getSubmitter(), getRequest().getSubmitterName());}@Overridediff --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 3dbfaa93d9..17a66dc922 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@@ -3,7 +3,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;import com.gitplex.server.event.MarkdownAware;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequestStatusChange;public class PullRequestStatusChangeEvent extends PullRequestEvent implements MarkdownAware {@@ -25,7 +25,7 @@ public class PullRequestStatusChangeEvent extends PullRequestEvent implements Ma}@Override- public Account getUser() {+ public User getUser() {return statusChange.getUser();}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 66a5ccd5c4..619ac47907 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,7 +2,7 @@ package com.gitplex.server.event.pullrequest;import java.util.Date;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.util.editable.annotation.Editable;@@ -21,7 +21,7 @@ public class PullRequestUpdated extends PullRequestEvent {}@Override- public Account getUser() {+ public User getUser() {return null;}diff --git a/core/src/main/java/com/gitplex/server/git/BlobIdent.java b/core/src/main/java/com/gitplex/server/git/BlobIdent.javaindex 2f7444f9b7..76289671c1 100644--- a/core/src/main/java/com/gitplex/server/git/BlobIdent.java+++ b/core/src/main/java/com/gitplex/server/git/BlobIdent.java@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.exception.ObjectNotFoundException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.google.common.base.Objects;public class BlobIdent implements Serializable, Comparable<BlobIdent> {@@ -41,13 +41,13 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {public BlobIdent() {}- public BlobIdent(Depot depot, List<String> urlSegments) {+ public BlobIdent(Project project, List<String> urlSegments) {StringBuilder revisionBuilder = new StringBuilder();for (int i=0; i<urlSegments.size(); i++) {if (i != 0)revisionBuilder.append("/");revisionBuilder.append(urlSegments.get(i));- if (depot.getObjectId(revisionBuilder.toString(), false) != null) {+ if (project.getObjectId(revisionBuilder.toString(), false) != null) {revision = revisionBuilder.toString();StringBuilder pathBuilder = new StringBuilder();for (int j=i+1; j<urlSegments.size(); j++) {@@ -57,7 +57,7 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {}if (pathBuilder.length() != 0) {path = pathBuilder.toString();- mode = depot.getMode(revision, path);+ mode = project.getMode(revision, path);} else {mode = FileMode.TREE.getBits();}@@ -67,7 +67,7 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {if (revisionBuilder.length() != 0) {throw new ObjectNotFoundException("Revision not found: " + revisionBuilder.toString());} else {- revision = depot.getDefaultBranch();+ revision = project.getDefaultBranch();mode = FileMode.TREE.getBits();}}diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.javaindex bc80e4b24a..a4db8805c9 100644--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.http.server.GitSmartHttpTools;import org.eclipse.jgit.http.server.ServletUtils;@@ -33,12 +32,12 @@ import com.gitplex.server.git.command.ReceiveCommand;import com.gitplex.server.git.command.UploadCommand;import com.gitplex.server.git.exception.GitException;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;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.model.User;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.model.Project;import com.gitplex.server.util.concurrent.PrioritizedRunnable;import com.gitplex.server.util.serverconfig.ServerConfig;@@ -55,7 +54,7 @@ public class GitFilter implements Filter {private final StorageManager storageManager;- private final DepotManager repositoryManager;+ private final ProjectManager projectManager;private final WorkExecutor workExecutor;@@ -64,11 +63,11 @@ public class GitFilter implements Filter {private final ConfigManager configManager;@Inject- public GitFilter(GitPlex gitPlex, StorageManager storageManager, DepotManager repositoryManager,+ public GitFilter(GitPlex gitPlex, StorageManager storageManager, ProjectManager projectManager,WorkExecutor workManager, ServerConfig serverConfig, ConfigManager configManager) {this.gitPlex = gitPlex;this.storageManager = storageManager;- this.repositoryManager = repositoryManager;+ this.projectManager = projectManager;this.workExecutor = workManager;this.serverConfig = serverConfig;this.configManager = configManager;@@ -79,28 +78,27 @@ public class GitFilter implements Filter {return StringUtils.stripStart(pathInfo, "/");}- private Depot getDepot(HttpServletRequest request, HttpServletResponse response, String depotInfo)+ private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)throws IOException {- depotInfo = StringUtils.stripStart(StringUtils.stripEnd(depotInfo, "/"), "/");-- String accountName = StringUtils.substringBefore(depotInfo, "/");- String repositoryName = StringUtils.substringAfter(depotInfo, "/");+ projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");- if (StringUtils.isBlank(accountName) || StringUtils.isBlank(repositoryName)) {+ if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {String url = request.getRequestURL().toString();String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());- throw new GitException(String.format("Expecting url of format %s<account name>/<repository name>", urlRoot));+ throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));}- if (repositoryName.endsWith(".git"))- repositoryName = repositoryName.substring(0, repositoryName.length()-".git".length());+ String projectName = StringUtils.substringAfter(projectInfo, "/");++ if (projectName.endsWith(".git"))+ projectName = projectName.substring(0, projectName.length()-".git".length());- Depot depot = repositoryManager.find(accountName, repositoryName);- if (depot == null) {- throw new GitException(String.format("Unable to find repository %s under account %s.", repositoryName, accountName));+ Project project = projectManager.find(projectName);+ if (project == null) {+ throw new GitException(String.format("Unable to find project %s", projectName));}- return depot;+ return project;}private void doNotCache(HttpServletResponse response) {@@ -115,8 +113,8 @@ public class GitFilter implements Filter {String service = StringUtils.substringAfterLast(pathInfo, "/");- String depotInfo = StringUtils.substringBeforeLast(pathInfo, "/");- Depot depot = getDepot(request, response, depotInfo);+ String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");+ Project project = getProject(request, response, projectInfo);doNotCache(response);response.setHeader("Content-Type", "application/x-" + service + "-result");@@ -130,13 +128,13 @@ public class GitFilter implements Filter {environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());environments.put("GITPLEX_URL", serverUrl);- environments.put("GITPLEX_USER_ID", Account.getCurrentId().toString());- environments.put("GITPLEX_REPOSITORY_ID", depot.getId().toString());- File gitDir = storageManager.getGitDir(depot);+ environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());+ environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());+ File gitDir = storageManager.getGitDir(project);if (GitSmartHttpTools.isUploadPack(request)) {- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotRead(depot))) {- throw new UnauthorizedException("You do not have permission to pull from this repository.");+ if (!SecurityUtils.canRead(project)) {+ throw new UnauthorizedException("You do not have permission to pull from this project.");}workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@@ -154,8 +152,8 @@ public class GitFilter implements Filter {}).get();} else {- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotWrite(depot))) {- throw new UnauthorizedException("You do not have permission to push to this repository.");+ if (!SecurityUtils.canWrite(project)) {+ throw new UnauthorizedException("You do not have permission to push to this project.");}workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@@ -189,21 +187,21 @@ public class GitFilter implements Filter {String pathInfo = request.getRequestURI().substring(request.getContextPath().length());pathInfo = StringUtils.stripStart(pathInfo, "/");- String depotInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());- Depot depot = getDepot(request, response, depotInfo);+ String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());+ Project project = getProject(request, response, projectInfo);String service = request.getParameter("service");- File gitDir = storageManager.getGitDir(depot);+ File gitDir = storageManager.getGitDir(project);if (service.contains("upload")) {- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotRead(depot))) {- throw new UnauthorizedException("You do not have permission to pull from this repository.");+ if (!SecurityUtils.canRead(project)) {+ throw new UnauthorizedException("You do not have permission to pull from this project.");}writeInitial(response, service);new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();} else {- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotWrite(depot))) {- throw new UnauthorizedException("You do not have permission to push to this repository.");+ if (!SecurityUtils.canWrite(project)) {+ throw new UnauthorizedException("You do not have permission to push to this project.");}writeInitial(response, service);new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();diff --git a/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.javaindex 92df427e38..a622694c95 100644--- a/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java@@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.launcher.loader.LoaderUtils;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.manager.ProjectManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.StringUtils;import com.google.common.base.Preconditions;@@ -37,15 +37,15 @@ public class GitPostReceiveCallback extends HttpServlet {public static final String PATH = "/git-postreceive-callback";- private final DepotManager depotManager;+ private final ProjectManager projectManager;private final ListenerRegistry listenerRegistry;private final UnitOfWork unitOfWork;@Inject- public GitPostReceiveCallback(DepotManager depotManager, UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {- this.depotManager = depotManager;+ public GitPostReceiveCallback(ProjectManager projectManager, UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {+ this.projectManager = projectManager;this.unitOfWork = unitOfWork;this.listenerRegistry = listenerRegistry;}@@ -64,7 +64,7 @@ public class GitPostReceiveCallback extends HttpServlet {List<String> fields = LoaderUtils.splitAndTrim(request.getPathInfo(), "/");Preconditions.checkState(fields.size() == 2);- Long depotId = Long.valueOf(fields.get(0));+ Long projectId = Long.valueOf(fields.get(0));Long userId = Long.valueOf(fields.get(1));ByteArrayOutputStream baos = new ByteArrayOutputStream();@@ -86,9 +86,9 @@ public class GitPostReceiveCallback extends HttpServlet {@Overridepublic void run() {- ThreadContext.bind(Account.asSubject(userId));+ ThreadContext.bind(User.asSubject(userId));try {- Depot depot = depotManager.load(depotId);+ Project project = projectManager.load(projectId);int pos = 0;while (true) {@@ -100,19 +100,19 @@ public class GitPostReceiveCallback extends HttpServlet {ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));if (!newObjectId.equals(ObjectId.zeroId())) {- depot.cacheObjectId(refName, newObjectId);+ project.cacheObjectId(refName, newObjectId);} else {newObjectId = ObjectId.zeroId();- depot.cacheObjectId(refName, null);+ project.cacheObjectId(refName, null);}String branch = GitUtils.ref2branch(refName);- if (branch != null && depot.getDefaultBranch() == null) {- RefUpdate refUpdate = depot.updateRef("HEAD");+ if (branch != null && project.getDefaultBranch() == null) {+ RefUpdate refUpdate = project.updateRef("HEAD");GitUtils.linkRef(refUpdate, refName);}- listenerRegistry.post(new RefUpdated(depot, refName, oldObjectId, newObjectId));+ listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));field = field.substring(40);if (field.length() == 0)diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.javaindex 67c1f8f8e7..860c03cd49 100644--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java@@ -18,17 +18,18 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.launcher.loader.LoaderUtils;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.persistence.annotation.Transactional;-import com.gitplex.server.security.ObjectPermission;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.util.StringUtils;import com.google.common.base.Preconditions;@@ -38,15 +39,15 @@ public class GitPreReceiveCallback extends HttpServlet {public static final String PATH = "/git-prereceive-callback";- private final DepotManager depotManager;+ private final ProjectManager projectManager;- private final AccountManager userManager;+ private final UserManager userManager;private final ReviewManager reviewManager;@Inject- public GitPreReceiveCallback(DepotManager depotManager, AccountManager userManager, ReviewManager reviewManager) {- this.depotManager = depotManager;+ public GitPreReceiveCallback(ProjectManager projectManager, UserManager userManager, ReviewManager reviewManager) {+ this.projectManager = projectManager;this.userManager = userManager;this.reviewManager = reviewManager;}@@ -80,9 +81,9 @@ public class GitPreReceiveCallback extends HttpServlet {List<String> fields = LoaderUtils.splitAndTrim(request.getPathInfo(), "/");Preconditions.checkState(fields.size() == 2);- SecurityUtils.getSubject().runAs(Account.asPrincipal(Long.valueOf(fields.get(1))));+ SecurityUtils.getSubject().runAs(User.asPrincipal(Long.valueOf(fields.get(1))));try {- Depot depot = depotManager.load(Long.valueOf(fields.get(0)));+ Project project = projectManager.load(Long.valueOf(fields.get(0)));ByteArrayOutputStream baos = new ByteArrayOutputStream();IOUtils.copy(request.getInputStream(), baos);@@ -108,12 +109,12 @@ public class GitPreReceiveCallback extends HttpServlet {String field = fields.get(pos);ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));- Account user = userManager.getCurrent();+ User user = userManager.getCurrent();Preconditions.checkNotNull(user);if (refName.startsWith(PullRequest.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {- if (!user.asSubject().isPermitted(ObjectPermission.ofDepotAdmin(depot))) {- error(output, refName, "Only repository administrators can update gitplex refs.");+ if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN))) {+ error(output, refName, "Only project administrators can update gitplex refs.");break;}} else if (refName.startsWith(Constants.R_HEADS)) {@@ -121,15 +122,15 @@ public class GitPreReceiveCallback extends HttpServlet {if (!oldObjectId.equals(ObjectId.zeroId())) {if (newObjectId.equals(ObjectId.zeroId())) {- BranchProtection protection = depot.getBranchProtection(branchName);+ BranchProtection protection = project.getBranchProtection(branchName);if (protection != null && protection.isNoDeletion())error(output, refName, "Can not delete this branch according to branch protection setting");- } else if (!GitUtils.isMergedInto(depot.getRepository(), oldObjectId, newObjectId)) {- BranchProtection protection = depot.getBranchProtection(branchName);+ } else if (!GitUtils.isMergedInto(project.getRepository(), oldObjectId, newObjectId)) {+ BranchProtection protection = project.getBranchProtection(branchName);if (protection != null && protection.isNoForcedPush())error(output, refName, "Can not force-push to this branch according to branch protection setting");} else {- if (!reviewManager.canPush(user, depot, branchName, oldObjectId, newObjectId)) {+ if (!reviewManager.canPush(user, project, branchName, oldObjectId, newObjectId)) {error(output, refName,"Your changes need to be reviewed. Please submit pull request instead");}@@ -138,10 +139,10 @@ public class GitPreReceiveCallback extends HttpServlet {} else if (refName.startsWith(Constants.R_TAGS)) {String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(refName));String errorMessage = null;- TagProtection protection = depot.getTagProtection(tagName);+ TagProtection protection = project.getTagProtection(tagName);if (protection != null) {if (oldObjectId.equals(ObjectId.zeroId())) {- errorMessage = protection.getTagCreator().getNotMatchMessage(depot, user);+ errorMessage = protection.getTagCreator().getNotMatchMessage(project, user);if (errorMessage != null)errorMessage = "Unable to create protected tag: " + errorMessage;} else if (newObjectId.equals(ObjectId.zeroId())) {diff --git a/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.javaindex cd596902d0..a50804350e 100644--- a/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java@@ -2,17 +2,17 @@ package com.gitplex.server.manager;import java.io.File;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public interface AttachmentManager {/**- * Get directory to store attachment of specified depot and uuid+ * Get directory to store attachment of specified project and uuid** @return- * directory to store attachment of specified depot and uuid. The directory may not exist+ * directory to store attachment of specified project and uuid. The directory may not exist* if there is no any attachment saved*/- File getAttachmentDir(Depot depot, String attachmentDirUUID);+ File getAttachmentDir(Project project, String attachmentDirUUID);}diff --git a/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.javaindex 64c4605ed6..8275af8807 100644--- a/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java@@ -2,15 +2,15 @@ package com.gitplex.server.manager;import java.util.Collection;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.BranchWatch;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.dao.EntityManager;public interface BranchWatchManager extends EntityManager<BranchWatch> {- Collection<BranchWatch> find(Account user, Depot depot);+ Collection<BranchWatch> find(User user, Project project);- Collection<BranchWatch> find(Depot depot, String branch);+ Collection<BranchWatch> find(Project project, String branch);}diff --git a/core/src/main/java/com/gitplex/server/manager/CacheManager.java b/core/src/main/java/com/gitplex/server/manager/CacheManager.javanew file mode 100644index 0000000000..9442cecc6c--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/CacheManager.java@@ -0,0 +1,5 @@+package com.gitplex.server.manager;++public interface CacheManager {++}diff --git a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.javaindex 5a3005f82f..3cd30bdc51 100644--- a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java@@ -7,49 +7,49 @@ import java.util.concurrent.Future;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.git.NameAndEmail;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;public interface CommitInfoManager {- Future<?> requestToCollect(Depot depot);+ Future<?> requestToCollect(Project project);- List<String> getFiles(Depot depot);+ List<String> getFiles(Project project);- int getContributions(Depot depot, Account user, String path);+ int getContributions(Project project, User user, String path);- int getCommitCount(Depot depot);+ int getCommitCount(Project project);- List<NameAndEmail> getAuthors(Depot depot);+ List<NameAndEmail> getAuthors(Project project);- List<NameAndEmail> getCommitters(Depot depot);+ List<NameAndEmail> getCommitters(Project project);/*** Given an ancestor commit, get all its descendant commits including the ancestor commit itself.* The result might be incomplete if some commits have not be cached yet*- * @param depot- * repository to get descendant commits+ * @param project+ * project to get descendant commits* @param ancestor* for which commit to get descendants* @return* descendant commits*/- Set<ObjectId> getDescendants(Depot depot, ObjectId ancestor);+ Set<ObjectId> getDescendants(Project project, ObjectId ancestor);/*** Given a parent commit, get all its child commits. The result might be incomplete if some commits* have not be collected yet*- * @param depot- * repository to get descendant commits+ * @param project+ * project to get descendant commits* @param parent* for which commit to get children* @return* child commits*/- Set<ObjectId> getChildren(Depot depot, ObjectId parent);+ Set<ObjectId> getChildren(Project project, ObjectId parent);- void cloneInfo(Depot from, Depot to);+ void cloneInfo(Project from, Project to);}diff --git a/core/src/main/java/com/gitplex/server/manager/DepotManager.java b/core/src/main/java/com/gitplex/server/manager/DepotManager.javadeleted file mode 100644index ed751d351c..0000000000--- a/core/src/main/java/com/gitplex/server/manager/DepotManager.java+++ /dev/null@@ -1,46 +0,0 @@-package com.gitplex.server.manager;--import java.util.Collection;--import javax.annotation.Nullable;--import org.eclipse.jgit.lib.Repository;--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> {-- @Nullable Depot find(String accountName, String depotName);-- @Nullable Depot find(Account account, String depotName);-- @Nullable Depot find(String depotFQN);-- void fork(Depot from, Depot to);-- /**- * Save specified depot. Note that oldName and oldAccountId should not be- * specified together, meaning that you should not rename and transfer- * a depot in a single call- *- * @param depot- * depot to save- * @param oldAccountId- * in case of transfer, this parameter should hold the id of original- * account when above depot object is initially loaded to ensure database- * integrity. Use <tt>null</tt> if account is not changed- * @param oldName- * in case of rename, this parameter should hold the original name- * when above depot object is initially loaded to ensure database- * integrity. Use <tt>null</tt> if original name does not exist,- * or the name is not changed- */- void save(Depot depot, @Nullable Long oldAccountId, @Nullable String oldName);-- Repository getRepository(Depot depot);-- Collection<Depot> findAllAccessible(@Nullable Account account, @Nullable Account user);--}diff --git a/core/src/main/java/com/gitplex/server/manager/GroupAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/GroupAuthorizationManager.javanew file mode 100644index 0000000000..c9329f4497--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/GroupAuthorizationManager.java@@ -0,0 +1,12 @@+package com.gitplex.server.manager;++import java.util.Collection;++import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.persistence.dao.EntityManager;++public interface GroupAuthorizationManager extends EntityManager<GroupAuthorization> {++ void delete(Collection<GroupAuthorization> authorizations);++}diff --git a/core/src/main/java/com/gitplex/server/manager/GroupManager.java b/core/src/main/java/com/gitplex/server/manager/GroupManager.javanew file mode 100644index 0000000000..38d9cda672--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/GroupManager.java@@ -0,0 +1,24 @@+package com.gitplex.server.manager;++import javax.annotation.Nullable;++import com.gitplex.server.model.Group;+import com.gitplex.server.persistence.dao.EntityManager;++public interface GroupManager extends EntityManager<Group> {+ /**+ * Save specified group+ *+ * @param group+ * group to save+ * @param oldName+ * in case of rename, this parameter should hold the original name+ * when above group object is initially loaded to ensure database+ * integrity. Use <tt>null</tt> if original name does not exist,+ * or the name is not changed+ */+ void save(Group group, @Nullable String oldName);++ @Nullable+ Group find(String name);+}diff --git a/core/src/main/java/com/gitplex/server/manager/MembershipManager.java b/core/src/main/java/com/gitplex/server/manager/MembershipManager.javanew file mode 100644index 0000000000..dfc95485d5--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/MembershipManager.java@@ -0,0 +1,11 @@+package com.gitplex.server.manager;++import java.util.Collection;++import com.gitplex.server.model.Membership;+import com.gitplex.server.persistence.dao.EntityManager;++public interface MembershipManager extends EntityManager<Membership> {++ void delete(Collection<Membership> memberships);+}diff --git a/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.javadeleted file mode 100644index 409c923753..0000000000--- a/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java+++ /dev/null@@ -1,26 +0,0 @@-package com.gitplex.server.manager;--import java.util.Collection;--import javax.annotation.Nullable;--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> {-- @Nullable- OrganizationMembership find(Account organization, Account user);-- void save(Collection<OrganizationMembership> organizationMemberships,- Collection<TeamMembership> teamMemberships);-- void delete(Collection<OrganizationMembership> organizationMemberships);-- void save(OrganizationMembership organizationMembership,- Collection<TeamMembership> teamMembershipsToAdd,- Collection<TeamMembership> teamMembershipsToRemove);--}diff --git a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java b/core/src/main/java/com/gitplex/server/manager/ProjectManager.javanew file mode 100644index 0000000000..e3df2c6b3c--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java@@ -0,0 +1,38 @@+package com.gitplex.server.manager;++import java.util.Collection;++import javax.annotation.Nullable;++import org.eclipse.jgit.lib.Repository;++import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.EntityManager;++public interface ProjectManager extends EntityManager<Project> {++ @Nullable Project find(String projectName);++ void fork(Project from, Project to);++ /**+ * Save specified project. Note that oldName and oldUserId should not be+ * specified together, meaning that you should not rename and transfer+ * a project in a single call+ *+ * @param project+ * project to save+ * @param oldName+ * in case of rename, this parameter should hold the original name+ * when above project object is initially loaded to ensure database+ * integrity. Use <tt>null</tt> if original name does not exist,+ * or the name is not changed+ */+ void save(Project project, @Nullable String oldName);++ Repository getRepository(Project project);++ Collection<Project> findAllAccessible(@Nullable User user);++}diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.javaindex 2089fe280a..f85b363c87 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java@@ -4,30 +4,30 @@ import java.util.Collection;import javax.annotation.Nullable;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.persistence.dao.EntityManager;public interface PullRequestManager extends EntityManager<PullRequest> {@Nullable- PullRequest findEffective(DepotAndBranch target, DepotAndBranch source);+ PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source);- Collection<PullRequest> findAllOpenTo(DepotAndBranch target);+ Collection<PullRequest> findAllOpenTo(ProjectAndBranch target);- Collection<PullRequest> findAllOpen(DepotAndBranch sourceOrTarget);+ Collection<PullRequest> findAllOpen(ProjectAndBranch sourceOrTarget);@Nullable- PullRequest find(Depot target, long number);+ PullRequest find(Project target, long number);@NullablePullRequest find(String uuid);@Nullable- PullRequest findLatest(Depot depot, Account submitter);+ PullRequest findLatest(Project project, User submitter);void discard(PullRequest request, @Nullable String note);@@ -63,6 +63,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void saveMergeStrategy(PullRequest request);- int countOpen(Depot depot);+ int countOpen(Project project);}diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.javaindex ef89b84c0b..9aa3747a8e 100644--- a/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java@@ -4,7 +4,7 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.dao.EntityManager;@@ -22,5 +22,5 @@ public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdat@NullablePullRequestUpdate find(String uuid);- List<PullRequestUpdate> findAllAfter(Depot depot, @Nullable String updateUUID);+ List<PullRequestUpdate> findAllAfter(Project project, @Nullable String updateUUID);}diff --git a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java b/core/src/main/java/com/gitplex/server/manager/ReviewManager.javaindex 6b360a8f65..17ff396339 100644--- a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java+++ b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java@@ -4,8 +4,8 @@ import java.util.List;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.Review;import com.gitplex.server.persistence.dao.EntityManager;@@ -26,7 +26,7 @@ public interface ReviewManager extends EntityManager<Review> {*/List<Review> findAll(PullRequest request);- void delete(Account user, PullRequest request);+ void delete(User user, PullRequest request);ReviewStatus checkRequest(PullRequest request);@@ -42,7 +42,7 @@ public interface ReviewManager extends EntityManager<Review> {* @return* result of the check.*/- boolean canModify(Account user, Depot depot, String branch, String file);+ boolean canModify(User user, Project project, String branch, String file);/*** Check if specified user can push specified commit to specified ref.@@ -58,6 +58,6 @@ public interface ReviewManager extends EntityManager<Review> {* @return* result of the check*/- boolean canPush(Account user, Depot depot, String branchName, ObjectId oldObjectId, ObjectId newObjectId);+ boolean canPush(User user, Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId);}diff --git a/core/src/main/java/com/gitplex/server/manager/StorageManager.java b/core/src/main/java/com/gitplex/server/manager/StorageManager.javaindex 24bc60486d..50c334e7fd 100644--- a/core/src/main/java/com/gitplex/server/manager/StorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/StorageManager.java@@ -2,40 +2,40 @@ package com.gitplex.server.manager;import java.io.File;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public interface StorageManager {/**- * Get directory to store git repository of specified depot+ * Get directory to store git repository of specified project** @return* directory to store git repository, the directory will be exist after calling this method*/- File getGitDir(Depot depot);+ File getGitDir(Project project);/**- * Get directory to store Lucene index of specified depot+ * Get directory to store Lucene index of specified project** @return* directory to store lucene index, the directory will be exist after calling this method*/- File getIndexDir(Depot depot);+ File getIndexDir(Project project);/**- * Get directory to store additional info of specified depot+ * Get directory to store additional info of specified project** @return* directory to store additional info, the directory will be exist after calling this method*/- File getInfoDir(Depot depot);+ File getInfoDir(Project project);/**- * Get directory to store attachments of specified depot+ * Get directory to store attachments of specified project** @return* directory store attachments, the directory will be exist after calling this method*/- File getAttachmentDir(Depot depot);+ File getAttachmentDir(Project project);}diff --git a/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.javadeleted file mode 100644index 242d10ef12..0000000000--- a/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java+++ /dev/null@@ -1,14 +0,0 @@-package com.gitplex.server.manager;--import java.util.Collection;--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> {-- void delete(Collection<TeamAuthorization> authorizations);-- Collection<TeamAuthorization> findAll(Account organization);-}diff --git a/core/src/main/java/com/gitplex/server/manager/TeamManager.java b/core/src/main/java/com/gitplex/server/manager/TeamManager.javadeleted file mode 100644index 349542ed64..0000000000--- a/core/src/main/java/com/gitplex/server/manager/TeamManager.java+++ /dev/null@@ -1,25 +0,0 @@-package com.gitplex.server.manager;--import javax.annotation.Nullable;--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> {- /**- * Save specified team in specified organization- *- * @param team- * team to save- * @param oldName- * in case of rename, this parameter should hold the original name- * when above team object is initially loaded to ensure database- * integrity. Use <tt>null</tt> if original name does not exist,- * or the name is not changed- */- void save(Team team, @Nullable String oldName);-- @Nullable- Team find(Account organization, String name);-}diff --git a/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.javadeleted file mode 100644index ae1afa0772..0000000000--- a/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java+++ /dev/null@@ -1,16 +0,0 @@-package com.gitplex.server.manager;--import java.util.Collection;--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> {-- Collection<TeamMembership> findAll(Account organization, Account user);-- Collection<TeamMembership> findAll(Account organization);-- void delete(Collection<TeamMembership> memberships);-}diff --git a/core/src/main/java/com/gitplex/server/manager/UrlManager.java b/core/src/main/java/com/gitplex/server/manager/UrlManager.javaindex 71804ded77..80f15be6da 100644--- a/core/src/main/java/com/gitplex/server/manager/UrlManager.java+++ b/core/src/main/java/com/gitplex/server/manager/UrlManager.java@@ -1,8 +1,7 @@package com.gitplex.server.manager;-import com.gitplex.server.model.Account;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.model.PullRequestStatusChange;@@ -10,9 +9,7 @@ import com.gitplex.server.model.support.CodeCommentActivity;public interface UrlManager {- String urlFor(Account user);-- String urlFor(Depot depot);+ String urlFor(Project project);String urlFor(PullRequest request);diff --git a/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.javaindex 93c484a594..c14f7b890a 100644--- a/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java@@ -2,20 +2,11 @@ package com.gitplex.server.manager;import java.util.Collection;-import javax.annotation.Nullable;--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> {- @Nullable- UserAuthorization find(Account user, Depot depot);-void delete(Collection<UserAuthorization> authorizations);- Collection<UserAuthorization> findAll(Account account);-}\ No newline at end of filediff --git a/core/src/main/java/com/gitplex/server/manager/AccountManager.java b/core/src/main/java/com/gitplex/server/manager/UserManager.javasimilarity index 58%rename from core/src/main/java/com/gitplex/server/manager/AccountManager.javarename to core/src/main/java/com/gitplex/server/manager/UserManager.javaindex c722a6e4b7..eaf59e44ae 100644--- a/core/src/main/java/com/gitplex/server/manager/AccountManager.java+++ b/core/src/main/java/com/gitplex/server/manager/UserManager.java@@ -1,58 +1,56 @@package com.gitplex.server.manager;-import java.util.List;-import javax.annotation.Nullable;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.EntityManager;-public interface AccountManager extends EntityManager<Account> {+public interface UserManager extends EntityManager<User> {/**- * Save specified account+ * Save specified user*- * @param account- * account to save+ * @param user+ * user to save* @param oldName* in case of rename, this parameter should hold the original name- * when above account object is initially loaded to ensure database+ * when above user object is initially loaded to ensure database* integrity. Use <tt>null</tt> if original name does not exist,* or the name is not changed*/- void save(Account account, @Nullable String oldName);+ void save(User user, @Nullable String oldName);- void delete(Account account);+ void delete(User user);/**- * Find root account in the system.+ * Find root user in the system.** @return- * root account of the system. Never be <tt>null</tt>+ * root user of the system. Never be <tt>null</tt>*/- Account getRoot();+ User getRoot();/*** Find user of specified name.* <p>- * @param accountName+ * @param userName* name of the user* @return* matching user, or <tt>null</tt> if not found*/- @Nullable Account findByName(String accountName);+ @Nullable User findByName(String userName);/*** Find user of specified name.* <p>- * @param accountName+ * @param userName* name of the user* @return* matching user, or <tt>null</tt> if not found*/- @Nullable Account findByEmail(String email);+ @Nullable User findByEmail(String email);/*** Find user by person@@ -62,7 +60,7 @@ public interface AccountManager extends EntityManager<Account> {* @return* matching user, or <tt>null</tt> if not found*/- @Nullable Account find(PersonIdent person);+ @Nullable User find(PersonIdent person);/*** Get current authenticated user in Shiro context, or <tt>null</tt> if not@@ -71,10 +69,6 @@ public interface AccountManager extends EntityManager<Account> {* @return* current authenticated user, or <tt>null</tt> for anonymous access*/- @Nullable Account getCurrent();-- List<Account> findAllUsers();+ @Nullable User getCurrent();- List<Account> findAllOrganizations();-}diff --git a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.javaindex d442ef66b7..394727af12 100644--- a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java@@ -4,26 +4,26 @@ import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;public interface VisitInfoManager {- void visit(Account user, Depot depot);+ void visit(User user, Project project);- void visit(Account user, PullRequest request);+ void visit(User user, PullRequest request);- void visit(Account user, CodeComment comment);+ void visit(User user, CodeComment comment);@Nullable- Date getVisitDate(Account user, Depot depot);+ Date getVisitDate(User user, Project project);@Nullable- Date getVisitDate(Account user, PullRequest request);+ Date getVisitDate(User user, PullRequest request);@Nullable- Date getVisitDate(Account user, CodeComment comment);+ Date getVisitDate(User user, CodeComment comment);}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 f936a87b42..01930ab893 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@@ -17,7 +17,7 @@ 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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;@@ -50,30 +50,30 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT}@Override- public File getAttachmentDir(Depot depot, String attachmentDirUUID) {- File attachmentDir = getPermanentAttachmentDir(depot, attachmentDirUUID);+ public File getAttachmentDir(Project project, String attachmentDirUUID) {+ File attachmentDir = getPermanentAttachmentDir(project, attachmentDirUUID);if (attachmentDir.exists())return attachmentDir;else- return getTempAttachmentDir(depot, attachmentDirUUID);+ return getTempAttachmentDir(project, attachmentDirUUID);}- private File getPermanentAttachmentDir(Depot depot, String attachmentDirUUID) {+ private File getPermanentAttachmentDir(Project project, String attachmentDirUUID) {String category = attachmentDirUUID.substring(0, 2);- return new File(storageManager.getAttachmentDir(depot), "permanent/" + category + "/" + attachmentDirUUID);+ return new File(storageManager.getAttachmentDir(project), "permanent/" + category + "/" + attachmentDirUUID);}- private File getTempAttachmentDir(Depot depot) {- return new File(storageManager.getAttachmentDir(depot), "temp");+ private File getTempAttachmentDir(Project project) {+ return new File(storageManager.getAttachmentDir(project), "temp");}- private File getTempAttachmentDir(Depot depot, String attachmentDirUUID) {- return new File(getTempAttachmentDir(depot), attachmentDirUUID);+ private File getTempAttachmentDir(Project project, String attachmentDirUUID) {+ return new File(getTempAttachmentDir(project), attachmentDirUUID);}- private void makeAttachmentPermanent(Depot depot, String attachmentDirUUID) {- File tempAttachmentDir = getTempAttachmentDir(depot, attachmentDirUUID);- File permanentAttachmentDir = getPermanentAttachmentDir(depot, attachmentDirUUID);+ private void makeAttachmentPermanent(Project project, String attachmentDirUUID) {+ File tempAttachmentDir = getTempAttachmentDir(project, attachmentDirUUID);+ File permanentAttachmentDir = getPermanentAttachmentDir(project, attachmentDirUUID);if (tempAttachmentDir.exists() && !permanentAttachmentDir.exists()) {try {FileUtils.moveDirectory(tempAttachmentDir, permanentAttachmentDir);@@ -96,8 +96,8 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Overridepublic void execute() {try {- for (Depot depot: dao.findAll(Depot.class)) {- File tempDir = getTempAttachmentDir(depot);+ for (Project project: dao.findAll(Project.class)) {+ File tempDir = getTempAttachmentDir(project);if (tempDir.exists()) {for (File file: tempDir.listFiles()) {if (System.currentTimeMillis() - file.lastModified() > TEMP_PRESERVE_PERIOD) {@@ -126,7 +126,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Overridepublic void run() {- makeAttachmentPermanent(request.getTargetDepot(), request.getUUID());+ makeAttachmentPermanent(request.getTargetProject(), request.getUUID());}});@@ -136,7 +136,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Overridepublic void run() {- makeAttachmentPermanent(comment.getRequest().getTargetDepot(), comment.getUUID());+ makeAttachmentPermanent(comment.getRequest().getTargetProject(), comment.getUUID());}});@@ -147,12 +147,12 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Transactional@Listenpublic void on(EntityRemoved event) {- if (event.getEntity() instanceof Depot) {- Depot depot = (Depot) event.getEntity();- FileUtils.deleteDir(storageManager.getAttachmentDir(depot));+ if (event.getEntity() instanceof Project) {+ Project project = (Project) event.getEntity();+ FileUtils.deleteDir(storageManager.getAttachmentDir(project));} else if (event.getEntity() instanceof CodeComment) {CodeComment comment = (CodeComment) event.getEntity();- File permanentAttachmentDir = getPermanentAttachmentDir(comment.getRequest().getTargetDepot(), comment.getUUID());+ File permanentAttachmentDir = getPermanentAttachmentDir(comment.getRequest().getTargetProject(), comment.getUUID());if (permanentAttachmentDir.exists())FileUtils.deleteDir(permanentAttachmentDir);}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 69a8d6f44c..dcbda857ec 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@@ -8,9 +8,9 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;import com.gitplex.server.manager.BranchWatchManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.BranchWatch;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;@@ -26,17 +26,17 @@ public class DefaultBranchWatchManager extends AbstractEntityManager<BranchWatch@Sessional@Override- public Collection<BranchWatch> find(Account user, Depot depot) {+ public Collection<BranchWatch> find(User user, Project project) {EntityCriteria<BranchWatch> criteria = EntityCriteria.of(BranchWatch.class);criteria.add(Restrictions.eq("user", user));- criteria.add(Restrictions.eq("depot", depot));+ criteria.add(Restrictions.eq("project", project));return findAll(criteria);}@Override- public Collection<BranchWatch> find(Depot depot, String branch) {+ public Collection<BranchWatch> find(Project project, String branch) {EntityCriteria<BranchWatch> criteria = EntityCriteria.of(BranchWatch.class);- criteria.add(Restrictions.eq("depot", depot));+ criteria.add(Restrictions.eq("project", project));criteria.add(Restrictions.eq("branch", branch));return findAll(criteria);}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.javanew file mode 100644index 0000000000..5787995265--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java@@ -0,0 +1,31 @@+package com.gitplex.server.manager.impl;++import java.util.HashMap;+import java.util.Map;++import javax.inject.Singleton;++import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.model.Membership;+import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;++@Singleton+public class DefaultCacheManager implements CacheManager {++ private final Map<Long, UserFacade> users = new HashMap<>();++ private final Map<Long, ProjectFacade> projects = new HashMap<>();++ private final Map<Long, GroupFacade> groups = new HashMap<>();++ private final Map<Long, MembershipFacade> groupMemberships = new HashMap<>();++ private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();++ private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();+}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 c0ef5ac38c..4a890a43c1 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@@ -38,17 +38,17 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.RefUpdated;-import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.NameAndEmail;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.CommitInfoManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;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.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.BatchWorker;import com.gitplex.server.util.FileUtils;@@ -101,7 +101,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {private final BatchWorkManager batchWorkManager;- private final DepotManager depotManager;+ private final ProjectManager projectManager;private final UnitOfWork unitOfWork;@@ -116,19 +116,19 @@ public class DefaultCommitInfoManager implements CommitInfoManager {private final Map<Long, List<NameAndEmail>> committersCache = new ConcurrentHashMap<>();@Inject- public DefaultCommitInfoManager(DepotManager depotManager, StorageManager storageManager,+ public DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, WorkExecutor workExecutor) {- this.depotManager = depotManager;+ this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;this.workExecutor = workExecutor;}- private void doCollect(Depot depot, List<RevCommit> commits) {- logger.debug("Collecting commits info (repository: {}, commits: {})...", depot, commits.size());+ private void doCollect(Project project, List<RevCommit> commits) {+ logger.debug("Collecting commits info (project: {}, commits: {})...", project, commits.size());- Environment env = getEnv(depot);+ Environment env = getEnv(project);Store defaultStore = getStore(env, DEFAULT_STORE);Store commitsStore = getStore(env, COMMITS_STORE);Store contributionsStore = getStore(env, CONTRIBUTIONS_STORE);@@ -179,7 +179,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {prevFiles = new HashSet<>();Set<String> files = new HashSet<>(prevFiles);- try (RevWalk revWalk = new RevWalk(depot.getRepository());) {+ try (RevWalk revWalk = new RevWalk(project.getRepository());) {revWalk.markStart(commits);if (lastCommitId != null) {RevCommit lastCommit = GitUtils.parseCommit(revWalk, lastCommitId);@@ -241,7 +241,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {String authorEmail = commit.getAuthorIdent().getEmailAddress();if (StringUtils.isNotBlank(authorEmail) && commit.getParentCount() == 1) {- try (TreeWalk treeWalk = new TreeWalk(depot.getRepository())) {+ try (TreeWalk treeWalk = new TreeWalk(project.getRepository())) {treeWalk.setFilter(TreeFilter.ANY_DIFF);treeWalk.addTree(commit.getTree());treeWalk.addTree(commit.getParent(0).getTree());@@ -270,25 +270,25 @@ public class DefaultCommitInfoManager implements CommitInfoManager {if (newCommitCount != prevCommitCount) {bytes = SerializationUtils.serialize(newCommitCount);defaultStore.put(txn, COMMIT_COUNT_KEY, new ArrayByteIterable(bytes));- commitCountCache.put(depot.getId(), newCommitCount);+ commitCountCache.put(project.getId(), newCommitCount);}if (!authors.equals(prevAuthors)) {bytes = SerializationUtils.serialize((Serializable) authors);defaultStore.put(txn, AUTHORS_KEY, new ArrayByteIterable(bytes));- authorsCache.remove(depot.getId());+ authorsCache.remove(project.getId());}if (!committers.equals(prevCommitters)) {bytes = SerializationUtils.serialize((Serializable) committers);defaultStore.put(txn, COMMITTERS_KEY, new ArrayByteIterable(bytes));- committersCache.remove(depot.getId());+ committersCache.remove(project.getId());}if (!files.equals(prevFiles)) {bytes = SerializationUtils.serialize((Serializable) files);defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(bytes));- filesCache.remove(depot.getId());+ filesCache.remove(project.getId());}bytes = new byte[20];@@ -297,7 +297,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}});- logger.debug("Commits info collected (repository: {}, commits: {})", depot, commits.size());+ logger.debug("Commits info collected (project: {}, commits: {})", project, commits.size());}private void updateContribution(Transaction txn, Store contributionsStore, String email, String path) {@@ -316,22 +316,22 @@ public class DefaultCommitInfoManager implements CommitInfoManager {new ArrayByteIterable(byteBuffer.array()));}- private Environment getEnv(final Depot depot) {+ private Environment getEnv(final Project project) {synchronized (envs) {- Environment env = envs.get(depot.getId());+ Environment env = envs.get(project.getId());if (env == null) {EnvironmentConfig config = new EnvironmentConfig();config.setEnvCloseForcedly(true);config.setLogFileSize(64*1024);- env = Environments.newInstance(getInfoDir(depot), config);- envs.put(depot.getId(), env);+ env = Environments.newInstance(getInfoDir(project), config);+ envs.put(project.getId(), env);}return env;}}- private File getInfoDir(Depot depot) {- File infoDir = new File(storageManager.getInfoDir(depot), INFO_DIR);+ private File getInfoDir(Project project) {+ File infoDir = new File(storageManager.getInfoDir(project), INFO_DIR);if (!infoDir.exists())FileUtils.createDir(infoDir);return infoDir;@@ -347,10 +347,10 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public List<NameAndEmail> getAuthors(Depot depot) {- List<NameAndEmail> authors = authorsCache.get(depot.getId());+ public List<NameAndEmail> getAuthors(Project project) {+ List<NameAndEmail> authors = authorsCache.get(project.getId());if (authors == null) {- Environment env = getEnv(depot);+ Environment env = getEnv(project);Store store = getStore(env, DEFAULT_STORE);authors = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -369,16 +369,16 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}});- authorsCache.put(depot.getId(), authors);+ authorsCache.put(project.getId(), authors);}return authors;}@Override- public List<NameAndEmail> getCommitters(Depot depot) {- List<NameAndEmail> committers = committersCache.get(depot.getId());+ public List<NameAndEmail> getCommitters(Project project) {+ List<NameAndEmail> committers = committersCache.get(project.getId());if (committers == null) {- Environment env = getEnv(depot);+ Environment env = getEnv(project);Store store = getStore(env, DEFAULT_STORE);committers = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -397,16 +397,16 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}});- committersCache.put(depot.getId(), committers);+ committersCache.put(project.getId(), committers);}return committers;}@Override- public List<String> getFiles(Depot depot) {- List<String> files = filesCache.get(depot.getId());+ public List<String> getFiles(Project project) {+ List<String> files = filesCache.get(project.getId());if (files == null) {- Environment env = getEnv(depot);+ Environment env = getEnv(project);final Store store = getStore(env, DEFAULT_STORE);files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {@@ -424,7 +424,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}});- filesCache.put(depot.getId(), files);+ filesCache.put(project.getId(), files);}return files;}@@ -434,15 +434,15 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public int getContributions(Depot depot, Account account, String path) {- if (account.getEmail() != null) {- Environment env = getEnv(depot);+ public int getContributions(Project project, User user, String path) {+ if (user.getEmail() != null) {+ Environment env = getEnv(project);Store store = getStore(env, CONTRIBUTIONS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@Overridepublic Integer compute(Transaction tx) {- byte[] contributionKey = getContributionKey(account.getEmail(), path);+ byte[] contributionKey = getContributionKey(user.getEmail(), path);byte[] bytes = getBytes(store.get(tx, new ArrayByteIterable(contributionKey)));if (bytes != null)return ByteBuffer.wrap(bytes).getInt();@@ -456,8 +456,8 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public Set<ObjectId> getDescendants(Depot depot, final ObjectId ancestor) {- Environment env = getEnv(depot);+ public Set<ObjectId> getDescendants(Project project, final ObjectId ancestor) {+ Environment env = getEnv(project);final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -507,8 +507,8 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public Set<ObjectId> getChildren(Depot depot, final ObjectId parent) {- Environment env = getEnv(depot);+ public Set<ObjectId> getChildren(Project project, final ObjectId parent) {+ Environment env = getEnv(project);final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -542,16 +542,16 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Listen- public void on(DepotDeleted event) {- Depot depot = event.getDepot();+ public void on(ProjectDeleted event) {+ Project project = event.getProject();synchronized (envs) {- Environment env = envs.remove(depot.getId());+ Environment env = envs.remove(project.getId());if (env != null)env.close();}- filesCache.remove(depot.getId());- commitCountCache.remove(depot.getId());- authorsCache.remove(depot.getId());+ filesCache.remove(project.getId());+ commitCountCache.remove(project.getId());+ authorsCache.remove(project.getId());}private byte[] getBytes(@Nullable ByteIterable byteIterable) {@@ -561,9 +561,9 @@ public class DefaultCommitInfoManager implements CommitInfoManager {return null;}- private BatchWorker getBatchWorker(Depot depot) {- Long depotId = depot.getId();- return new BatchWorker("repository-" + depotId + "-collectCommitInfo") {+ private BatchWorker getBatchWorker(Project project) {+ Long projectId = project.getId();+ return new BatchWorker("project-" + projectId + "-collectCommitInfo") {@Overridepublic void doWork(Collection<Prioritized> works) {@@ -571,15 +571,15 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic Void call() throws Exception {- Depot depot = depotManager.load(depotId);+ Project project = projectManager.load(projectId);List<RevCommit> commits = new ArrayList<>();- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {for (Prioritized work: works) {CollectingWork collectingWork = (CollectingWork) work;commits.add(revWalk.parseCommit(collectingWork.getCommitId()));}}- doCollect(depot, commits);+ doCollect(project, commits);return null;}@@ -590,22 +590,22 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public Future<?> requestToCollect(Depot depot) {+ public Future<?> requestToCollect(Project project) {return workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@Overridepublic void run() {List<RevCommit> commits = new ArrayList<>();- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {Collection<Ref> refs = new ArrayList<>();- refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());- refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());+ refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());+ refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());for (Ref ref: refs) {RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));if (revObj instanceof RevCommit) {RevCommit commit = (RevCommit) revObj;- Environment env = getEnv(depot);+ Environment env = getEnv(project);Store commitsStore = getStore(env, COMMITS_STORE);boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {@@ -628,7 +628,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}if (!commits.isEmpty())- doCollect(depot, commits);+ doCollect(project, commits);}});@@ -645,19 +645,19 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Listenpublic void on(RefUpdated event) {if (!event.getNewObjectId().equals(ObjectId.zeroId())) {- RevCommit commit = event.getDepot().getRevCommit(event.getNewObjectId(), false);+ RevCommit commit = event.getProject().getRevCommit(event.getNewObjectId(), false);if (commit != null) {CollectingWork refUpdate = new CollectingWork(PRIORITY, commit.getId());- batchWorkManager.submit(getBatchWorker(event.getDepot()), refUpdate);+ batchWorkManager.submit(getBatchWorker(event.getProject()), refUpdate);}}}@Override- public int getCommitCount(Depot depot) {- Integer commitCount = commitCountCache.get(depot.getId());+ public int getCommitCount(Project project) {+ Integer commitCount = commitCountCache.get(project.getId());if (commitCount == null) {- Environment env = getEnv(depot);+ Environment env = getEnv(project);Store store = getStore(env, DEFAULT_STORE);commitCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@@ -672,7 +672,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}});- commitCountCache.put(depot.getId(), commitCount);+ commitCountCache.put(project.getId(), commitCount);}return commitCount;}@@ -699,7 +699,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public void cloneInfo(Depot from, Depot to) {+ public void cloneInfo(Project from, Project to) {BackupStrategy backupStrategy = getEnv(from).getBackupStrategy();try {backupStrategy.beforeBackup();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 78d0cb5f3a..73defd453c 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@@ -22,11 +22,11 @@ import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.launcher.bootstrap.BootstrapUtils;import com.gitplex.server.GitPlex;import com.gitplex.server.event.lifecycle.SystemStarting;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;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.User;import com.gitplex.server.model.Config;import com.gitplex.server.model.Config.Key;import com.gitplex.server.model.support.setting.BackupSetting;@@ -51,7 +51,7 @@ public class DefaultDataManager implements DataManager, Serializable {private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";- private final AccountManager accountManager;+ private final UserManager userManager;private final ConfigManager configManager;@@ -70,11 +70,11 @@ public class DefaultDataManager implements DataManager, Serializable {private String backupTaskId;@Inject- public DefaultDataManager(IdManager idManager, AccountManager accountManager,+ public DefaultDataManager(IdManager idManager, UserManager userManager,ConfigManager configManager, TaskScheduler taskScheduler,PersistManager persistManager, MailManager mailManager,Validator validator, PasswordService passwordService) {- this.accountManager = accountManager;+ this.userManager = userManager;this.configManager = configManager;this.validator = validator;this.idManager = idManager;@@ -89,11 +89,11 @@ public class DefaultDataManager implements DataManager, Serializable {@Overridepublic List<ManualConfig> init() {List<ManualConfig> manualConfigs = new ArrayList<ManualConfig>();- Account administrator = accountManager.get(Account.ADMINISTRATOR_ID);+ User administrator = userManager.get(User.ROOT_ID);if (administrator == null) {- administrator = new Account();- administrator.setId(Account.ADMINISTRATOR_ID);- manualConfigs.add(new ManualConfig("Create Administator Account", administrator,+ administrator = new User();+ administrator.setId(User.ROOT_ID);+ manualConfigs.add(new ManualConfig("Create Administator User", administrator,Sets.newHashSet("description", "defaultPrivilege")) {@Override@@ -103,10 +103,10 @@ public class DefaultDataManager implements DataManager, Serializable {@Overridepublic void complete() {- Account account = (Account) getSetting();- account.setPassword(passwordService.encryptPassword(account.getPassword()));- accountManager.save(account, null);- idManager.init(Account.class);+ User user = (User) getSetting();+ user.setPassword(passwordService.encryptPassword(user.getPassword()));+ userManager.save(user, null);+ idManager.init(User.class);}});@@ -243,7 +243,7 @@ public class DefaultDataManager implements DataManager, Serializable {@Sessionalprotected void notifyBackupError(Exception e) {- Account root = accountManager.getRoot();+ User root = userManager.getRoot();String url = configManager.getSystemSetting().getServerUrl();String body = String.format(""+ "GitPlex url: <a href='%s'>%s</a>"diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupAuthorizationManager.javanew file mode 100644index 0000000000..4ef1521f73--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupAuthorizationManager.java@@ -0,0 +1,30 @@+package com.gitplex.server.manager.impl;++import java.util.Collection;++import javax.inject.Inject;+import javax.inject.Singleton;++import com.gitplex.server.manager.GroupAuthorizationManager;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.AbstractEntityManager;+import com.gitplex.server.persistence.dao.Dao;++@Singleton+public class DefaultGroupAuthorizationManager extends AbstractEntityManager<GroupAuthorization>+ implements GroupAuthorizationManager {++ @Inject+ public DefaultGroupAuthorizationManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void delete(Collection<GroupAuthorization> authorizations) {+ for (GroupAuthorization authorization: authorizations)+ delete(authorization);+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.javanew file mode 100644index 0000000000..98866aca58--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.java@@ -0,0 +1,65 @@+package com.gitplex.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;++import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.support.BranchProtection;+import com.gitplex.server.model.support.TagProtection;+import com.gitplex.server.persistence.annotation.Sessional;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.AbstractEntityManager;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityCriteria;++@Singleton+public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {++ private final ProjectManager projectManager;++ @Inject+ public DefaultGroupManager(Dao dao, ProjectManager projectManager) {+ super(dao);+ this.projectManager = projectManager;+ }++ @Transactional+ @Override+ public void save(Group group, String oldName) {+ if (oldName != null && !oldName.equals(group.getName())) {+ for (Project project: projectManager.findAll()) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onGroupRename(project, oldName, group.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onGroupRename(oldName, group.getName());+ }+ }+ dao.persist(group);+ }++ @Transactional+ @Override+ public void delete(Group group) {+ for (Project project: projectManager.findAll()) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onGroupDelete(project, group.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onGroupDelete(group.getName());+ }+ dao.remove(group);+ }++ @Sessional+ @Override+ public Group find(String name) {+ EntityCriteria<Group> criteria = newCriteria();+ criteria.add(Restrictions.eq("name", name));+ return find(criteria);+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMembershipManager.javanew file mode 100644index 0000000000..16044dc99f--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMembershipManager.java@@ -0,0 +1,29 @@+package com.gitplex.server.manager.impl;++import java.util.Collection;++import javax.inject.Inject;+import javax.inject.Singleton;++import com.gitplex.server.manager.MembershipManager;+import com.gitplex.server.model.Membership;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.AbstractEntityManager;+import com.gitplex.server.persistence.dao.Dao;++@Singleton+public class DefaultMembershipManager extends AbstractEntityManager<Membership> implements MembershipManager {++ @Inject+ public DefaultMembershipManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void delete(Collection<Membership> memberships) {+ for (Membership membership: memberships)+ dao.remove(membership);+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.javaindex e380be47b0..c64ab82995 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java@@ -33,7 +33,7 @@ import com.gitplex.server.manager.PullRequestTaskManager;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.User;import com.gitplex.server.model.BranchWatch;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestStatusChange;@@ -83,7 +83,7 @@ public class DefaultNotificationManager implements NotificationManager {public void on(PullRequestEvent event) {PullRequest request = event.getRequest();- Set<Account> notifiedUsers = new HashSet<>();+ Set<User> notifiedUsers = new HashSet<>();// Update pull request tasksif (event instanceof PullRequestOpened) {@@ -185,7 +185,7 @@ public class DefaultNotificationManager implements NotificationManager {}// handle mentions- Set<Account> mentionUsers = new HashSet<>();+ Set<User> mentionUsers = new HashSet<>();if (event instanceof MarkdownAware) {MarkdownAware markdownAware = (MarkdownAware) event;String markdown = markdownAware.getMarkdown();@@ -219,7 +219,7 @@ public class DefaultNotificationManager implements NotificationManager {+ "-- Sent by GitPlex",subject, markdownManager.escape(markdown), url, url);- mailManager.sendMailAsync(mentionUsers.stream().map(Account::getEmail).collect(Collectors.toList()),+ mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),subject, body);}}@@ -243,13 +243,13 @@ public class DefaultNotificationManager implements NotificationManager {if (event instanceof PullRequestOpened) {for (BranchWatch branchWatch:- branchWatchManager.find(request.getTargetDepot(), request.getTargetBranch())) {+ branchWatchManager.find(request.getTargetProject(), request.getTargetBranch())) {watch(request, branchWatch.getUser(),"You are set to watch this pull request as you are watching the target branch.");}}- for (Account mention: mentionUsers) {+ for (User mention: mentionUsers) {watch(request, mention,"You are set to watch this pull request as you are mentioned in code comment.");}@@ -267,7 +267,7 @@ public class DefaultNotificationManager implements NotificationManager {}if (notifyWatchers) {- Collection<Account> usersToNotify = new HashSet<>();+ Collection<User> usersToNotify = new HashSet<>();for (PullRequestWatch watch: request.getWatches()) {if (!watch.isIgnore() && !watch.getUser().equals(event.getUser())@@ -321,7 +321,7 @@ public class DefaultNotificationManager implements NotificationManager {+ "You receive this email as you are watching the pull request.",activity, request.getNumber(), request.getTitle(), url, url);}- mailManager.sendMailAsync(usersToNotify.stream().map(Account::getEmail).collect(Collectors.toList()), subject, body);+ mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);}}}@@ -350,7 +350,7 @@ public class DefaultNotificationManager implements NotificationManager {mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, body);}- private void watch(PullRequest request, Account user, String reason) {+ private void watch(PullRequest request, User user, String reason) {PullRequestWatch watch = request.getWatch(user);if (watch == null) {watch = new PullRequestWatch();@@ -369,7 +369,7 @@ public class DefaultNotificationManager implements NotificationManager {ReviewInvitation invitation = (ReviewInvitation) event.getEntity();if (!event.isNew()) {PullRequest request = invitation.getRequest();- Account user = invitation.getUser();+ User user = invitation.getUser();if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("user", user)).add(Restrictions.eq("type", REVIEW));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.javadeleted file mode 100644index 643a869b0c..0000000000--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java+++ /dev/null@@ -1,98 +0,0 @@-package com.gitplex.server.manager.impl;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--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;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultOrganizationMembershipManager extends AbstractEntityManager<OrganizationMembership>- implements OrganizationMembershipManager {-- private final AccountManager accountManager;-- private final OrganizationMembershipManager organizationMembershipManager;-- private final TeamMembershipManager teamMembershipManager;-- @Inject- public DefaultOrganizationMembershipManager(Dao dao, AccountManager accountManager,- OrganizationMembershipManager organizationMembershipManager,- TeamMembershipManager teamMembershipManager) {- super(dao);- this.accountManager = accountManager;- this.organizationMembershipManager = organizationMembershipManager;- this.teamMembershipManager = teamMembershipManager;- }-- @Transactional- @Override- public void save(OrganizationMembership membership) {- if (membership.getOrganization().isNew())- accountManager.save(membership.getOrganization(), null);- dao.persist(membership);- }-- @Sessional- @Override- public OrganizationMembership find(Account organization, Account user) {- EntityCriteria<OrganizationMembership> criteria = newCriteria();- criteria.add(Restrictions.eq("organization", organization)).add(Restrictions.eq("user", user));- return find(criteria);- }-- @Transactional- @Override- public void save(Collection<OrganizationMembership> organizationMemberships,- Collection<TeamMembership> teamMemberships) {- for (OrganizationMembership organizationMembership: organizationMemberships)- organizationMembershipManager.save(organizationMembership);- for (TeamMembership teamMembership: teamMemberships)- teamMembershipManager.save(teamMembership);- }-- @Transactional- @Override- public void delete(Collection<OrganizationMembership> organizationMemberships) {- for (OrganizationMembership organizationMembership: organizationMemberships) {- delete(organizationMembership);- }- }-- @Transactional- @Override- public void save(OrganizationMembership organizationMembership, Collection<TeamMembership> teamMembershipsToAdd,- Collection<TeamMembership> teamMembershipsToRemove) {- dao.persist(organizationMembership);- for (TeamMembership teamMembership: teamMembershipsToAdd)- teamMembershipManager.save(teamMembership);- for (TeamMembership teamMembership: teamMembershipsToRemove)- teamMembershipManager.delete(teamMembership);- }-- @Transactional- @Override- public void delete(OrganizationMembership organizationMembership) {- Account organization = organizationMembership.getOrganization();- Account user = organizationMembership.getUser();- for (TeamMembership teamMembership: teamMembershipManager.findAll(organization, user)) {- teamMembershipManager.delete(teamMembership);- }- dao.remove(organizationMembership);- }--}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.javasimilarity index 51%rename from core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.javarename to core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.javaindex 0b03ef119c..1a4d30dd99 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java@@ -28,34 +28,33 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.GitPlex;import com.gitplex.server.event.RefUpdated;-import com.gitplex.server.event.depot.DepotDeleted;-import com.gitplex.server.event.depot.DepotRenamed;-import com.gitplex.server.event.depot.DepotTransferred;import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.event.project.ProjectDeleted;+import com.gitplex.server.event.project.ProjectRenamed;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.CloneCommand;-import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.CommitInfoManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;-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.manager.UserAuthorizationManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Membership;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.util.FileUtils;-import com.gitplex.server.util.Pair;import com.gitplex.server.util.StringUtils;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;@@ -63,40 +62,37 @@ import com.google.common.collect.BiMap;import com.google.common.collect.HashBiMap;@Singleton-public class DefaultDepotManager extends AbstractEntityManager<Depot> implements DepotManager {+public class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultDepotManager.class);+ private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);private static final int INFO_VERSION = 3;private final ListenerRegistry listenerRegistry;- private final AccountManager userManager;-private final CommitInfoManager commitInfoManager;- private final TeamAuthorizationManager teamAuthorizationManager;-private final StorageManager storageManager;+ private final UserAuthorizationManager userAuthorizationManager;+private final String gitReceiveHook;- private final BiMap<Pair<Long, String>, Long> nameToId = HashBiMap.create();+ private final BiMap<String, Long> nameToId = HashBiMap.create();private final ReadWriteLock idLock = new ReentrantReadWriteLock();private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();@Inject- public DefaultDepotManager(Dao dao, AccountManager userManager, TeamAuthorizationManager teamAuthorizationManager,- CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry, StorageManager storageManager) {+ public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry,+ StorageManager storageManager, UserAuthorizationManager userAuthorizationManager) {super(dao);- this.userManager = userManager;- this.teamAuthorizationManager = teamAuthorizationManager;this.commitInfoManager = commitInfoManager;this.listenerRegistry = listenerRegistry;this.storageManager = storageManager;+ this.userAuthorizationManager = userAuthorizationManager;try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {Preconditions.checkNotNull(is);@@ -108,20 +104,20 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements}@Override- public Repository getRepository(Depot depot) {- Repository repository = repositoryCache.get(depot.getId());+ public Repository getRepository(Project project) {+ Repository repository = repositoryCache.get(project.getId());if (repository == null) {synchronized (repositoryCache) {- repository = repositoryCache.get(depot.getId());+ repository = repositoryCache.get(project.getId());if (repository == null) {try {- repository = new FileRepository(depot.getGitDir());+ repository = new FileRepository(project.getGitDir());repository.getConfig().setEnum(ConfigConstants.CONFIG_DIFF_SECTION, null,ConfigConstants.CONFIG_KEY_ALGORITHM, SupportedAlgorithm.HISTOGRAM);} catch (IOException e) {throw new RuntimeException(e);}- repositoryCache.put(depot.getId(), repository);+ repositoryCache.put(project.getId(), repository);}}}@@ -129,33 +125,26 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements}@Override- public void save(Depot depot) {- save(depot, null, null);+ public void save(Project project) {+ save(project, null);}@Transactional@Override- public void save(Depot depot, Long oldAccountId, String oldName) {- Preconditions.checkArgument(oldAccountId==null || oldName==null,- "Can not rename and transfer depot in the same time");-- boolean isNew = depot.isNew();+ public void save(Project project, String oldName) {+ boolean isNew = project.isNew();- dao.persist(depot);-- if (oldAccountId != null && !depot.getAccount().getId().equals(oldAccountId)) {- Account oldAccount = userManager.load(oldAccountId);- listenerRegistry.post(new DepotTransferred(depot, oldAccount));-- for (BranchProtection protection: depot.getBranchProtections()) {- protection.onDepotTransferred(depot);- }- for (TagProtection protection: depot.getTagProtections()) {- protection.onDepotTransferred(depot);- }+ dao.persist(project);+ if (isNew && !SecurityUtils.isAdministrator()) {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setPrivilege(ProjectPrivilege.ADMIN);+ authorization.setProject(project);+ authorization.setUser(SecurityUtils.getUser());+ userAuthorizationManager.save(authorization);}- if (oldName != null && !depot.getName().equals(oldName)) {- listenerRegistry.post(new DepotRenamed(depot, oldName));++ if (oldName != null && !project.getName().equals(oldName)) {+ listenerRegistry.post(new ProjectRenamed(project, oldName));}doAfterCommit(new Runnable() {@@ -164,12 +153,12 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementspublic void run() {idLock.writeLock().lock();try {- nameToId.inverse().put(depot.getId(), new Pair<>(depot.getAccount().getId(), depot.getName()));+ nameToId.inverse().put(project.getId(), project.getName());} finally {idLock.writeLock().unlock();}if (isNew)- checkDirectory(depot);+ checkDirectory(project);}});@@ -177,12 +166,12 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Transactional@Override- public void delete(Depot depot) {- Query query = getSession().createQuery("update Depot set forkedFrom=null where forkedFrom=:forkedFrom");- query.setParameter("forkedFrom", depot);+ public void delete(Project project) {+ Query query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");+ query.setParameter("forkedFrom", project);query.executeUpdate();- dao.remove(depot);+ dao.remove(project);doAfterCommit(new Runnable() {@@ -190,35 +179,25 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementspublic void run() {idLock.writeLock().lock();try {- nameToId.inverse().remove(depot.getId());+ nameToId.inverse().remove(project.getId());} finally {idLock.writeLock().unlock();}- getRepository(depot).close();- repositoryCache.remove(depot.getId());+ getRepository(project).close();+ repositoryCache.remove(project.getId());}});- listenerRegistry.post(new DepotDeleted(depot));+ listenerRegistry.post(new ProjectDeleted(project));}@Sessional@Override- public Depot find(String accountName, String depotName) {- Account user = userManager.findByName(accountName);- if (user != null)- return find(user, depotName);- else- return null;- }-- @Sessional- @Override- public Depot find(Account account, String depotName) {+ public Project find(String projectName) {idLock.readLock().lock();try {- Long id = nameToId.get(new Pair<>(account.getId(), depotName));+ Long id = nameToId.get(projectName);if (id != null)return load(id);else@@ -228,20 +207,9 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements}}- @Sessional- @Override- public Depot find(String depotFQN) {- String userName = StringUtils.substringBefore(depotFQN, Depot.FQN_SEPARATOR);- Account user = userManager.findByName(userName);- if (user != null)- return find(user, StringUtils.substringAfter(depotFQN, Depot.FQN_SEPARATOR));- else- return null;- }-@Transactional@Override- public void fork(Depot from, Depot to) {+ public void fork(Project from, Project to) {save(to);FileUtils.cleanDir(to.getGitDir());new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();@@ -256,8 +224,8 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements});}- private boolean isGitHookValid(Depot depot, String hookName) {- File hookFile = new File(depot.getGitDir(), "hooks/" + hookName);+ private boolean isGitHookValid(Project project, String hookName) {+ File hookFile = new File(project.getGitDir(), "hooks/" + hookName);if (!hookFile.exists())return false;@@ -275,9 +243,9 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsreturn true;}- private void checkDirectory(Depot depot) {- File gitDir = depot.getGitDir();- if (depot.getGitDir().exists() && !GitUtils.isValid(gitDir)) {+ private void checkDirectory(Project project) {+ File gitDir = project.getGitDir();+ if (project.getGitDir().exists() && !GitUtils.isValid(gitDir)) {logger.warn("Directory '" + gitDir + "' is not a valid git repository, removing...");FileUtils.deleteDir(gitDir);}@@ -292,7 +260,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements}}- if (!isGitHookValid(depot, "pre-receive") || !isGitHookValid(depot, "post-receive")) {+ if (!isGitHookValid(project, "pre-receive") || !isGitHookValid(project, "post-receive")) {File hooksDir = new File(gitDir, "hooks");File gitPreReceiveHookFile = new File(hooksDir, "pre-receive");@@ -304,7 +272,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implementsgitPostReceiveHookFile.setExecutable(true);}- File infoVersionFile = new File(storageManager.getInfoDir(depot), "version.txt");+ File infoVersionFile = new File(storageManager.getInfoDir(project), "version.txt");int infoVersion;if (infoVersionFile.exists()) {try {@@ -324,22 +292,22 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Sessional@Listenpublic void on(SystemStarting event) {- for (Depot depot: findAll())- nameToId.inverse().put(depot.getId(), new Pair<>(depot.getAccount().getId(), depot.getName()));+ for (Project project: findAll())+ nameToId.inverse().put(project.getId(), project.getName());}@Transactional@Listenpublic void on(SystemStarted event) {- for (Depot depot: findAll()) {- logger.info("Checking repository {}...", depot.getFQN());- checkDirectory(depot);+ for (Project project: findAll()) {+ logger.info("Checking project {}...", project.getName());+ checkDirectory(project);try {- commitInfoManager.requestToCollect(depot).get();+ commitInfoManager.requestToCollect(project).get();} catch (InterruptedException | ExecutionException e) {throw new RuntimeException(e);}- logger.info("Repository checking finished for {}", depot.getFQN());+ logger.info("Project checking finished for {}", project.getName());}}@@ -356,17 +324,17 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Listenpublic void on(RefUpdated event) {if (event.getNewObjectId().equals(ObjectId.zeroId())) {- Depot depot = event.getDepot();+ Project project = event.getProject();String branch = GitUtils.ref2branch(event.getRefName());if (branch != null) {- for (Iterator<BranchProtection> it = depot.getBranchProtections().iterator(); it.hasNext();) {+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {if (it.next().onBranchDelete(branch))it.remove();}}String tag = GitUtils.ref2tag(event.getRefName());if (tag != null) {- for (Iterator<TagProtection> it = depot.getTagProtections().iterator(); it.hasNext();) {+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {if (it.next().onTagDelete(tag))it.remove();}@@ -376,68 +344,24 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements@Sessional@Override- public Collection<Depot> findAllAccessible(Account account, Account user) {- Collection<Depot> depots;- if (account == null)- depots = GitPlex.getInstance(DepotManager.class).findAll();- else- depots = account.getDepots();-+ public Collection<Project> findAllAccessible(User user) {if (user == null) {- return depots.stream().filter((depot)->depot.isPublicRead()).collect(Collectors.toSet());- } else if (user.isAdministrator() || user.equals(account)) {- return depots;+ return findAll().stream().filter((project)->project.isPublicRead()).collect(Collectors.toSet());+ } else if (user.asSubject().isPermitted(new SystemAdministration())) {+ return findAll();} else {- Collection<Account> adminOrganizations = user.getOrganizations()- .stream()- .filter((membership)->membership.isAdmin())- .map((membership)->membership.getOrganization())- .collect(Collectors.toSet());-- // return fast in special cases- if (adminOrganizations.contains(account)) {- return depots;- }-- Collection<Account> memberOrganizations = user.getOrganizations()- .stream()- .filter((membership)->!membership.isAdmin())- .map((membership)->membership.getOrganization())- .collect(Collectors.toSet());-- // return fast in special cases- if (memberOrganizations.contains(account) && account.getDefaultPrivilege() != DepotPrivilege.NONE) {- return depots;+ Collection<Project> authorizedProjects = user.getAuthorizedProjects();+ for (Membership membership: user.getMemberships()) {+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations())+ authorizedProjects.add(authorization.getProject());}-- Collection<Depot> authorizedDepots = user.getAuthorizedDepots()- .stream()- .map((authorization)->authorization.getDepot())- .collect(Collectors.toSet());- Collection<Team> joinedTeams = user.getJoinedTeams()- .stream()- .map((membership)->membership.getTeam())- .collect(Collectors.toSet());-- Collection<TeamAuthorization> authorizations;- if (account != null)- authorizations = account.getAllTeamAuthorizationsInOrganization();- else- authorizations = teamAuthorizationManager.findAll();-- for (TeamAuthorization authorization: authorizations) {- if (joinedTeams.contains(authorization.getTeam()))- authorizedDepots.add(authorization.getDepot());++ for (Project project: findAll()) {+ if (project.isPublicRead())+ authorizedProjects.add(project);}- return depots.stream()- .filter((depot->depot.isPublicRead()- || depot.getAccount().equals(user)- || authorizedDepots.contains(depot)- || adminOrganizations.contains(depot.getAccount())- || memberOrganizations.contains(depot.getAccount())- && depot.getAccount().getDefaultPrivilege() != DepotPrivilege.NONE))- .collect(Collectors.toSet());+ return authorizedProjects;}}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 817429574a..38282f94c6 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@@ -2,10 +2,10 @@ package com.gitplex.server.manager.impl;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.ofSourceProject;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.CriterionHelper.ofTargetProject;import static com.gitplex.server.model.support.MergeStrategy.ALWAYS_MERGE;import static com.gitplex.server.model.support.MergeStrategy.MERGE_IF_NECESSARY;import static com.gitplex.server.model.support.MergeStrategy.REBASE_MERGE;@@ -43,20 +43,20 @@ import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.GitPlex;import com.gitplex.server.event.RefUpdated;-import com.gitplex.server.event.depot.DepotDeleted;+import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.event.pullrequest.MergePreviewCalculated;import com.gitplex.server.event.pullrequest.PullRequestOpened;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.Review;import com.gitplex.server.model.PullRequestStatusChange;@@ -64,7 +64,7 @@ import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.ReviewInvitation;import com.gitplex.server.model.support.CloseInfo;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;import com.gitplex.server.persistence.UnitOfWork;@@ -91,7 +91,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final PullRequestUpdateManager pullRequestUpdateManager;- private final AccountManager accountManager;+ private final UserManager userManager;private final UnitOfWork unitOfWork;@@ -107,7 +107,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Injectpublic DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,- ReviewInvitationManager reviewInvitationManager, AccountManager accountManager,+ ReviewInvitationManager reviewInvitationManager, UserManager userManager,MarkdownManager markdownManager, BatchWorkManager batchWorkManager,ListenerRegistry listenerRegistry, UnitOfWork unitOfWork,PullRequestStatusChangeManager pullRequestStatusChangeManager) {@@ -115,7 +115,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestthis.pullRequestUpdateManager = pullRequestUpdateManager;this.reviewInvitationManager = reviewInvitationManager;- this.accountManager = accountManager;+ this.userManager = userManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;this.listenerRegistry = listenerRegistry;@@ -141,22 +141,22 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void restoreSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);if (request.getSource().getObjectName(false) == null) {RevCommit latestCommit = request.getHeadCommit();try {- request.getSourceDepot().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();+ request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();} catch (Exception e) {Throwables.propagate(e);}- request.getSourceDepot().cacheObjectId(request.getSourceBranch(), latestCommit.copy());+ request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());PullRequestStatusChange statusChange = new PullRequestStatusChange();statusChange.setDate(new Date());statusChange.setNote(note);statusChange.setRequest(request);statusChange.setType(Type.RESTORED_SOURCE_BRANCH);- statusChange.setUser(accountManager.getCurrent());+ statusChange.setUser(userManager.getCurrent());pullRequestStatusChangeManager.save(statusChange);request.setLastEvent(statusChange);@@ -167,7 +167,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void deleteSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);if (request.getSource().getObjectName(false) != null) {request.getSource().delete();@@ -177,7 +177,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequeststatusChange.setNote(note);statusChange.setRequest(request);statusChange.setType(Type.DELETED_SOURCE_BRANCH);- statusChange.setUser(accountManager.getCurrent());+ statusChange.setUser(userManager.getCurrent());pullRequestStatusChangeManager.save(statusChange);request.setLastEvent(statusChange);@@ -188,7 +188,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void reopen(PullRequest request, String note) {- Account user = accountManager.getCurrent();+ User user = userManager.getCurrent();request.setCloseInfo(null);PullRequestStatusChange statusChange = new PullRequestStatusChange();@@ -207,7 +207,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void discard(PullRequest request, String note) {- Account user = accountManager.getCurrent();+ User user = userManager.getCurrent();Date date = new Date();CloseInfo closeInfo = new CloseInfo();@@ -233,17 +233,17 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString merged = Preconditions.checkNotNull(preview.getMerged());ObjectId mergedId = ObjectId.fromString(merged);- RevCommit mergedCommit = request.getTargetDepot().getRevCommit(mergedId);+ RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId);PersonIdent committer = new PersonIdent(GitPlex.NAME, "");- Depot targetDepot = request.getTargetDepot();+ Project targetProject = request.getTargetProject();MergeStrategy strategy = request.getMergeStrategy();if ((strategy == ALWAYS_MERGE || strategy == MERGE_IF_NECESSARY || strategy == SQUASH_MERGE)&& !preview.getMerged().equals(preview.getRequestHead())&& !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {- try ( RevWalk revWalk = new RevWalk(targetDepot.getRepository());- ObjectInserter inserter = targetDepot.getRepository().newObjectInserter()) {+ try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());+ ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {CommitBuilder newCommit = new CommitBuilder();newCommit.setAuthor(mergedCommit.getAuthorIdent());newCommit.setCommitter(committer);@@ -259,7 +259,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpreview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),preview.getMergeStrategy(), merged);request.setLastMergePreview(preview);- RefUpdate refUpdate = targetDepot.updateRef(request.getMergeRef());+ RefUpdate refUpdate = targetProject.updateRef(request.getMergeRef());refUpdate.setNewObjectId(mergedId);GitUtils.updateRef(refUpdate);}@@ -268,14 +268,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString targetRef = request.getTargetRef();ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());- RefUpdate refUpdate = targetDepot.updateRef(targetRef);+ RefUpdate refUpdate = targetProject.updateRef(targetRef);refUpdate.setRefLogIdent(committer);refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);refUpdate.setExpectedOldObjectId(targetHeadId);refUpdate.setNewObjectId(mergedId);GitUtils.updateRef(refUpdate);- request.getTargetDepot().cacheObjectId(request.getTargetRef(), mergedId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);Long requestId = request.getId();Subject subject = SecurityUtils.getSubject();@@ -287,8 +287,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestThreadContext.bind(subject);try {PullRequest request = load(requestId);- request.getTargetDepot().cacheObjectId(request.getTargetRef(), newTargetHeadId);- listenerRegistry.post(new RefUpdated(request.getTargetDepot(), targetRef,+ request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);+ listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,targetHeadId, newTargetHeadId));} finally {ThreadContext.unbindSubject();@@ -298,15 +298,15 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest});}- private long getNextNumber(Depot depot) {+ private long getNextNumber(Project project) {AtomicLong nextNumber;synchronized (nextNumbers) {- nextNumber = nextNumbers.get(depot.getUUID());+ nextNumber = nextNumbers.get(project.getUUID());}if (nextNumber == null) {long maxNumber;- Query query = getSession().createQuery("select max(number) from PullRequest where targetDepot=:depot");- query.setParameter("depot", depot);+ Query query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");+ query.setParameter("project", project);Object result = query.uniqueResult();if (result != null) {maxNumber = (Long)result;@@ -319,10 +319,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest* if there are limited connections.*/synchronized (nextNumbers) {- nextNumber = nextNumbers.get(depot.getUUID());+ nextNumber = nextNumbers.get(project.getUUID());if (nextNumber == null) {nextNumber = new AtomicLong(maxNumber+1);- nextNumbers.put(depot.getUUID(), nextNumber);+ nextNumbers.put(project.getUUID(), nextNumber);}}}@@ -332,14 +332,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void open(PullRequest request) {- request.setNumber(getNextNumber(request.getTargetDepot()));+ request.setNumber(getNextNumber(request.getTargetProject()));dao.persist(request);- RefUpdate refUpdate = request.getTargetDepot().updateRef(request.getBaseRef());+ RefUpdate refUpdate = request.getTargetProject().updateRef(request.getBaseRef());refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));GitUtils.updateRef(refUpdate);- refUpdate = request.getTargetDepot().updateRef(request.getHeadRef());+ refUpdate = request.getTargetProject().updateRef(request.getHeadRef());refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));GitUtils.updateRef(refUpdate);@@ -383,8 +383,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate void checkUpdate(PullRequest request) {if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {ObjectId mergeBase = GitUtils.getMergeBase(- request.getTargetDepot().getRepository(), request.getTarget().getObjectId(),- request.getSourceDepot().getRepository(), request.getSource().getObjectId(),+ request.getTargetProject().getRepository(), request.getTarget().getObjectId(),+ request.getSourceProject().getRepository(), request.getSource().getObjectId(),GitUtils.branch2ref(request.getSourceBranch()));if (mergeBase != null) {PullRequestUpdate update = new PullRequestUpdate();@@ -394,7 +394,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.addUpdate(update);pullRequestUpdateManager.save(update, true);- RefUpdate refUpdate = request.getTargetDepot().updateRef(request.getHeadRef());+ RefUpdate refUpdate = request.getTargetProject().updateRef(request.getHeadRef());refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));GitUtils.updateRef(refUpdate);}@@ -405,8 +405,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic void check(PullRequest request) {if (request.isOpen()) {- if (request.getSourceDepot() == null) {- discard(request, "Source repository no longer exists");+ if (request.getSourceProject() == null) {+ discard(request, "Source project no longer exists");} else if (request.getSource().getObjectId(false) == null) {discard(request, "Source branch no longer exists");} else if (request.getTarget().getObjectId(false) == null) {@@ -483,50 +483,50 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequesttry {MergePreview preview = request.getLastMergePreview();if (request.isOpen() && !request.isMergeIntoTarget() && (preview == null || preview.isObsolete(request))) {- logger.info("Calculating merge preview of pull request #{} in repository '{}'...",- request.getNumber(), request.getTargetDepot());+ logger.info("Calculating merge preview of pull request #{} in project '{}'...",+ request.getNumber(), request.getTargetProject());String requestHead = request.getHeadCommitHash();String targetHead = request.getTarget().getObjectName();- Depot targetDepot = request.getTargetDepot();+ Project targetProject = request.getTargetProject();preview = new MergePreview(targetHead, requestHead, request.getMergeStrategy(), null);request.setLastMergePreview(preview);String mergeRef = request.getMergeRef();ObjectId requestHeadId = ObjectId.fromString(requestHead);ObjectId targetHeadId = ObjectId.fromString(targetHead);if ((preview.getMergeStrategy() == MERGE_IF_NECESSARY)- && GitUtils.isMergedInto(targetDepot.getRepository(), targetHeadId, requestHeadId)) {+ && GitUtils.isMergedInto(targetProject.getRepository(), targetHeadId, requestHeadId)) {preview.setMerged(requestHead);- RefUpdate refUpdate = targetDepot.updateRef(mergeRef);+ RefUpdate refUpdate = targetProject.updateRef(mergeRef);refUpdate.setNewObjectId(ObjectId.fromString(requestHead));GitUtils.updateRef(refUpdate);} else {PersonIdent user = new PersonIdent(GitPlex.NAME, "");ObjectId merged;if (preview.getMergeStrategy() == REBASE_MERGE) {- merged = GitUtils.rebase(targetDepot.getRepository(), requestHeadId, targetHeadId, user);+ merged = GitUtils.rebase(targetProject.getRepository(), requestHeadId, targetHeadId, user);} else if (preview.getMergeStrategy() == SQUASH_MERGE) {- merged = GitUtils.merge(targetDepot.getRepository(),+ merged = GitUtils.merge(targetProject.getRepository(),requestHeadId, targetHeadId, true, user, request.getCommitMessage());} else {- merged = GitUtils.merge(targetDepot.getRepository(),+ merged = GitUtils.merge(targetProject.getRepository(),requestHeadId, targetHeadId, false, user, request.getCommitMessage());}if (merged != null) {preview.setMerged(merged.name());- RefUpdate refUpdate = targetDepot.updateRef(mergeRef);+ RefUpdate refUpdate = targetProject.updateRef(mergeRef);refUpdate.setNewObjectId(merged);GitUtils.updateRef(refUpdate);} else {- RefUpdate refUpdate = targetDepot.updateRef(mergeRef);+ RefUpdate refUpdate = targetProject.updateRef(mergeRef);GitUtils.deleteRef(refUpdate);}}dao.persist(request);listenerRegistry.post(new MergePreviewCalculated(request));- logger.info("Merge preview of pull request #{} in repository '{}' is calculated.",- request.getNumber(), request.getTargetDepot());+ logger.info("Merge preview of pull request #{} in project '{}' is calculated.",+ request.getNumber(), request.getTargetProject());}} catch (Exception e) {logger.error("Error calculating pull request merge preview", e);@@ -542,15 +542,15 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Listen- public void on(DepotDeleted event) {- for (PullRequest request: event.getDepot().getOutgoingRequests()) {- if (!request.getTargetDepot().equals(event.getDepot()) && request.isOpen())- discard(request, "Source repository is deleted.");+ public void on(ProjectDeleted event) {+ for (PullRequest request: event.getProject().getOutgoingRequests()) {+ if (!request.getTargetProject().equals(event.getProject()) && request.isOpen())+ discard(request, "Source project is deleted.");}- Query query = getSession().createQuery("update PullRequest set sourceDepot=null where "- + "sourceDepot=:depot");- query.setParameter("depot", event.getDepot());+ Query query = getSession().createQuery("update PullRequest set sourceProject=null where "+ + "sourceProject=:project");+ query.setParameter("project", event.getProject());query.executeUpdate();}@@ -559,10 +559,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic void on(RefUpdated event) {String branch = GitUtils.ref2branch(event.getRefName());if (branch != null) {- DepotAndBranch depotAndBranch = new DepotAndBranch(event.getDepot(), branch);+ ProjectAndBranch projectAndBranch = new ProjectAndBranch(event.getProject(), branch);Criterion criterion = Restrictions.and(ofOpen(),- Restrictions.or(ofSource(depotAndBranch), ofTarget(depotAndBranch)));+ Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));for (PullRequest request: findAll(EntityCriteria.of(PullRequest.class).add(criterion))) {check(request);}@@ -571,7 +571,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public PullRequest findEffective(DepotAndBranch target, DepotAndBranch source) {+ public PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);Criterion merged = Restrictions.and(Restrictions.eq("closeInfo.closeStatus", CloseInfo.Status.MERGED),@@ -584,10 +584,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public PullRequest findLatest(Depot depot, Account submitter) {+ public PullRequest findLatest(Project project, User submitter) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);criteria.add(ofOpen());- criteria.add(Restrictions.or(ofSourceDepot(depot), ofTargetDepot(depot)));+ criteria.add(Restrictions.or(ofSourceProject(project), ofTargetProject(project)));criteria.add(ofSubmitter(submitter));criteria.addOrder(Order.desc("id"));return find(criteria);@@ -595,7 +595,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public Collection<PullRequest> findAllOpenTo(DepotAndBranch target) {+ public Collection<PullRequest> findAllOpenTo(ProjectAndBranch target) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);criteria.add(ofTarget(target));criteria.add(ofOpen());@@ -604,7 +604,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public Collection<PullRequest> findAllOpen(DepotAndBranch sourceOrTarget) {+ public Collection<PullRequest> findAllOpen(ProjectAndBranch sourceOrTarget) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);criteria.add(ofOpen());criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));@@ -613,18 +613,18 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public int countOpen(Depot depot) {+ public int countOpen(Project project) {EntityCriteria<PullRequest> criteria = newCriteria();criteria.add(PullRequest.CriterionHelper.ofOpen());- criteria.add(PullRequest.CriterionHelper.ofTargetDepot(depot));+ criteria.add(PullRequest.CriterionHelper.ofTargetProject(project));return count(criteria);}@Sessional@Override- public PullRequest find(Depot target, long number) {+ public PullRequest find(Project target, long number) {EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetDepot", target));+ criteria.add(Restrictions.eq("targetProject", target));criteria.add(Restrictions.eq("number", number));return find(criteria);}@@ -687,7 +687,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequeststatusChange.setDate(new Date());statusChange.setRequest(request);statusChange.setType(Type.CHANGED_MERGE_STRATEGY);- statusChange.setUser(accountManager.getCurrent());+ statusChange.setUser(userManager.getCurrent());pullRequestStatusChangeManager.save(statusChange);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 c07123263f..5b2e863d25 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@@ -10,7 +10,7 @@ import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.MarkdownAware;import com.gitplex.server.event.pullrequest.PullRequestEvent;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestReferenceManager;import com.gitplex.server.model.PullRequest;@@ -27,14 +27,14 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Puprivate final MarkdownManager markdownManager;- private final AccountManager accountManager;+ private final UserManager userManager;@Inject- public DefaultPullRequestReferenceManager(Dao dao, AccountManager accountManager,+ public DefaultPullRequestReferenceManager(Dao dao, UserManager userManager,MarkdownManager markdownManager) {super(dao);this.markdownManager = markdownManager;- this.accountManager = accountManager;+ this.userManager = userManager;}@Transactional@@ -55,7 +55,7 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Pureference.setReferencedBy(event.getRequest());reference.setReferenced(referenced);reference.setDate(new Date());- reference.setUser(accountManager.getCurrent());+ reference.setUser(userManager.getCurrent());save(reference);}}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 106ce10fef..a64570e43d 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@@ -18,7 +18,7 @@ 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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.support.LastEvent;@@ -60,14 +60,14 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRdao.persist(update);ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());- if (!request.getTargetDepot().equals(request.getSourceDepot())) {+ if (!request.getTargetProject().equals(request.getSourceProject())) {try {- request.getTargetDepot().git().fetch()- .setRemote(request.getSourceDepot().getGitDir().getAbsolutePath())+ request.getTargetProject().git().fetch()+ .setRemote(request.getSourceProject().getGitDir().getAbsolutePath()).setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef())).call();- if (!request.getTargetDepot().getObjectId(update.getHeadRef()).equals(updateHeadId)) {- RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());+ if (!request.getTargetProject().getObjectId(update.getHeadRef()).equals(updateHeadId)) {+ RefUpdate refUpdate = request.getTargetProject().updateRef(update.getHeadRef());refUpdate.setNewObjectId(updateHeadId);GitUtils.updateRef(refUpdate);}@@ -75,7 +75,7 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRThrowables.propagate(e);}} else {- RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());+ RefUpdate refUpdate = request.getTargetProject().updateRef(update.getHeadRef());refUpdate.setNewObjectId(updateHeadId);GitUtils.updateRef(refUpdate);}@@ -102,9 +102,9 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR@Sessional@Override- public List<PullRequestUpdate> findAllAfter(Depot depot, String updateUUID) {+ public List<PullRequestUpdate> findAllAfter(Project project, String updateUUID) {EntityCriteria<PullRequestUpdate> criteria = newCriteria();- criteria.createCriteria("request").add(Restrictions.eq("targetDepot", depot));+ criteria.createCriteria("request").add(Restrictions.eq("targetProject", project));criteria.addOrder(Order.asc("id"));if (updateUUID != null) {PullRequestUpdate update = find(updateUUID);diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.javaindex c8eac0241b..8932a1cfc0 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java@@ -8,7 +8,7 @@ import javax.inject.Singleton;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.ReviewInvitation;@@ -42,7 +42,7 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<Reviewsave(invitation);- Account reviewer = invitation.getUser();+ User reviewer = invitation.getUser();if (request.getReviewStatus().getAwaitingReviewers().contains(reviewer)|| request.getReviewStatus().getEffectiveReviews().containsKey(reviewer)) {return false;@@ -51,7 +51,7 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<ReviewstatusChange.setDate(new Date());statusChange.setRequest(request);statusChange.setType(PullRequestStatusChange.Type.REMOVED_REVIEWER);- statusChange.setUser(SecurityUtils.getAccount());+ statusChange.setUser(SecurityUtils.getUser());statusChange.setNote("User '" + reviewer.getDisplayName() + "' is removed from reviewer list");pullRequestStatusChangeManager.save(statusChange);@@ -73,7 +73,7 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<ReviewstatusChange.setRequest(request);statusChange.setType(PullRequestStatusChange.Type.ADDED_REVIEWER);statusChange.setNote("User '" + invitation.getUser().getDisplayName() + "' is added as a reviewer");- statusChange.setUser(SecurityUtils.getAccount());+ statusChange.setUser(SecurityUtils.getUser());pullRequestStatusChangeManager.save(statusChange);request.setLastEvent(statusChange);diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.javaindex 50a5e1dc35..60afb3c8a6 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java@@ -27,20 +27,20 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.Review;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.model.Team;+import com.gitplex.server.model.Group;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.FileProtection;import com.gitplex.server.persistence.annotation.Sessional;@@ -48,9 +48,9 @@ import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.security.ObjectPermission;+import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.util.ReviewStatus;import com.gitplex.server.util.reviewappointment.ReviewAppointment;@@ -62,18 +62,18 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>private static final int MAX_CONTRIBUTION_FILES = 100;- private final AccountManager accountManager;+ private final UserManager userManager;private final PullRequestManager pullRequestManager;private final PullRequestStatusChangeManager pullRequestStatusChangeManager;@Inject- public DefaultReviewManager(Dao dao, AccountManager accountManager,+ public DefaultReviewManager(Dao dao, UserManager userManager,PullRequestManager pullRequestManager, PullRequestStatusChangeManager pullRequestStatusChangeManager) {super(dao);- this.accountManager = accountManager;+ this.userManager = userManager;this.pullRequestManager = pullRequestManager;this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;}@@ -116,7 +116,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>@Transactional@Override- public void delete(Account user, PullRequest request) {+ public void delete(User user, PullRequest request) {for (Iterator<Review> it = request.getReviews().iterator(); it.hasNext();) {Review review = it.next();if (review.getUser().equals(user)) {@@ -130,7 +130,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>statusChange.setRequest(request);statusChange.setType(Type.WITHDRAWED_REVIEW);statusChange.setNote("Review of user '" + user.getDisplayName() + "' is withdrawed");- statusChange.setUser(accountManager.getCurrent());+ statusChange.setUser(userManager.getCurrent());pullRequestStatusChangeManager.save(statusChange);request.setLastEvent(statusChange);@@ -138,27 +138,27 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}@Override- public boolean canModify(Account user, Depot depot, String branch, String file) {- BranchProtection branchProtection = depot.getBranchProtection(branch);+ public boolean canModify(User user, Project project, String branch, String file) {+ BranchProtection branchProtection = project.getBranchProtection(branch);if (branchProtection != null) {- if (branchProtection.getReviewAppointment(depot) != null- && !branchProtection.getReviewAppointment(depot).matches(user)) {+ if (branchProtection.getReviewAppointment(project) != null+ && !branchProtection.getReviewAppointment(project).matches(user)) {return false;}FileProtection fileProtection = branchProtection.getFileProtection(file);- if (fileProtection != null && !fileProtection.getReviewAppointment(depot).matches(user))+ if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))return false;}return true;}- private Set<String> getChangedFiles(Depot depot, ObjectId oldObjectId, ObjectId newObjectId) {+ private Set<String> getChangedFiles(Project project, ObjectId oldObjectId, ObjectId newObjectId) {Set<String> changedFiles = new HashSet<>();- try (TreeWalk treeWalk = new TreeWalk(depot.getRepository())) {+ try (TreeWalk treeWalk = new TreeWalk(project.getRepository())) {treeWalk.setFilter(TreeFilter.ANY_DIFF);treeWalk.setRecursive(true);- RevCommit oldCommit = depot.getRevCommit(oldObjectId);- RevCommit newCommit = depot.getRevCommit(newObjectId);+ RevCommit oldCommit = project.getRevCommit(oldObjectId);+ RevCommit newCommit = project.getRevCommit(newObjectId);treeWalk.addTree(oldCommit.getTree());treeWalk.addTree(newCommit.getTree());while (treeWalk.next()) {@@ -171,17 +171,17 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}@Override- public boolean canPush(Account user, Depot depot, String branch, ObjectId oldObjectId, ObjectId newObjectId) {- BranchProtection branchProtection = depot.getBranchProtection(branch);+ public boolean canPush(User user, Project project, String branch, ObjectId oldObjectId, ObjectId newObjectId) {+ BranchProtection branchProtection = project.getBranchProtection(branch);if (branchProtection != null) {- if (branchProtection.getReviewAppointment(depot) != null- && !branchProtection.getReviewAppointment(depot).matches(user)) {+ if (branchProtection.getReviewAppointment(project) != null+ && !branchProtection.getReviewAppointment(project).matches(user)) {return false;}- for (String changedFile: getChangedFiles(depot, oldObjectId, newObjectId)) {+ for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId)) {FileProtection fileProtection = branchProtection.getFileProtection(changedFile);- if (fileProtection != null && !fileProtection.getReviewAppointment(depot).matches(user))+ if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))return false;}}@@ -192,22 +192,22 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>private final PullRequest request;- private final List<Account> awaitingReviewers = new ArrayList<>();+ private final List<User> awaitingReviewers = new ArrayList<>();- private final Map<Account, Review> effectiveReviews = new HashMap<>();+ private final Map<User, Review> effectiveReviews = new HashMap<>();@Override- public List<Account> getAwaitingReviewers() {+ public List<User> getAwaitingReviewers() {return awaitingReviewers;}@Override- public Map<Account, Review> getEffectiveReviews() {+ public Map<User, Review> getEffectiveReviews() {return effectiveReviews;}@Nullable- private ReviewInvitation getInvitation(Account user) {+ private ReviewInvitation getInvitation(User user) {for (ReviewInvitation invitation: request.getReviewInvitations()) {if (invitation.getUser().equals(user))return invitation;@@ -229,9 +229,9 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}}- BranchProtection branchProtection = request.getTargetDepot().getBranchProtection(request.getTargetBranch());+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch());if (branchProtection != null) {- ReviewAppointment appointment = branchProtection.getReviewAppointment(request.getTargetDepot());+ ReviewAppointment appointment = branchProtection.getReviewAppointment(request.getTargetProject());if (appointment != null)checkReviews(appointment, request.getLatestUpdate());@@ -244,20 +244,20 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>FileProtection fileProtection = branchProtection.getFileProtection(file);if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {checkedFileProtections.add(fileProtection);- checkReviews(fileProtection.getReviewAppointment(request.getTargetDepot()), update);+ checkReviews(fileProtection.getReviewAppointment(request.getTargetProject()), update);}}}}- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(request.getTargetDepot());- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {- Collection<Account> writers = SecurityUtils.findUsersCan(request.getTargetDepot(),- DepotPrivilege.WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(+ new ProjectPermission(request.getTargetProject(), ProjectPrivilege.WRITE))) {+ Collection<User> writers = SecurityUtils.findUsersCan(request.getTargetProject(),+ ProjectPrivilege.WRITE);checkReviews(writers, 1, request.getLatestUpdate(), true);}- for (Iterator<Map.Entry<Account, Review>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {+ for (Iterator<Map.Entry<User, Review>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {Review review = it.next().getValue();if (review.isCheckMerged()) {if (request.getMergePreview() == null@@ -272,7 +272,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {- for (Account user: appointment.getUsers()) {+ for (User user: appointment.getUsers()) {if (!user.equals(request.getSubmitter()) && !awaitingReviewers.contains(user)) {Review effectiveReview = user.getReviewAfter(update);if (effectiveReview == null) {@@ -284,21 +284,21 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}}- for (Map.Entry<Team, Integer> entry: appointment.getTeams().entrySet()) {- Team team = entry.getKey();+ for (Map.Entry<Group, Integer> entry: appointment.getGroups().entrySet()) {+ Group group = entry.getKey();int requiredCount = entry.getValue();- checkReviews(team.getMembers(), requiredCount, update, false);+ checkReviews(group.getMembers(), requiredCount, update, false);}}- private void checkReviews(Collection<Account> users, int requiredCount, PullRequestUpdate update,+ private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update,boolean excludeAutoReviews) {if (requiredCount == 0)requiredCount = users.size();int effectiveCount = 0;- Set<Account> potentialReviewers = new HashSet<>();- for (Account user: users) {+ Set<User> potentialReviewers = new HashSet<>();+ for (User user: users) {if (user.equals(request.getSubmitter())) {effectiveCount++;} else if (awaitingReviewers.contains(user)) {@@ -321,17 +321,17 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}int missingCount = requiredCount - effectiveCount;- Set<Account> reviewers = new HashSet<>();+ Set<User> reviewers = new HashSet<>();- List<Account> candidateReviewers = new ArrayList<>();- for (Account user: potentialReviewers) {+ List<User> candidateReviewers = new ArrayList<>();+ for (User user: potentialReviewers) {ReviewInvitation invitation = getInvitation(user);if (invitation != null && invitation.getType() != ReviewInvitation.Type.EXCLUDE)candidateReviewers.add(user);}sortByContributions(candidateReviewers, update);- for (Account user: candidateReviewers) {+ for (User user: candidateReviewers) {reviewers.add(user);if (reviewers.size() == missingCount)break;@@ -339,13 +339,13 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>if (reviewers.size() < missingCount) {candidateReviewers = new ArrayList<>();- for (Account user: potentialReviewers) {+ for (User user: potentialReviewers) {ReviewInvitation invitation = getInvitation(user);if (invitation == null)candidateReviewers.add(user);}sortByContributions(candidateReviewers, update);- for (Account user: candidateReviewers) {+ for (User user: candidateReviewers) {reviewers.add(user);if (reviewers.size() == missingCount)break;@@ -353,7 +353,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}if (reviewers.size() < missingCount) {List<ReviewInvitation> excludedInvitations = new ArrayList<>();- for (Account user: potentialReviewers) {+ for (User user: potentialReviewers) {ReviewInvitation invitation = getInvitation(user);if (invitation != null && invitation.getType() == ReviewInvitation.Type.EXCLUDE)excludedInvitations.add(invitation);@@ -373,16 +373,16 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>throw new RuntimeException(errorMessage);}- for (Account user: reviewers) {+ for (User user: reviewers) {awaitingReviewers.add(user);inviteReviewer(user);}}- private void sortByContributions(List<Account> users, PullRequestUpdate update) {+ private void sortByContributions(List<User> users, PullRequestUpdate update) {CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);- Map<Account, Integer> contributions = new HashMap<>();- for (Account user: users)+ Map<User, Integer> contributions = new HashMap<>();+ for (User user: users)contributions.put(user, 0);int count = 0;@@ -404,12 +404,12 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>users.sort((user1, user2)-> contributions.get(user2) - contributions.get(user1));}- private int addContributions(Map<Account, Integer> contributions, CommitInfoManager commitInfoManager,+ private int addContributions(Map<User, Integer> contributions, CommitInfoManager commitInfoManager,String file, PullRequestUpdate update) {int addedContributions = 0;- for (Map.Entry<Account, Integer> entry: contributions.entrySet()) {- Account user = entry.getKey();- int fileContribution = commitInfoManager.getContributions(update.getRequest().getTargetDepot(), user,+ for (Map.Entry<User, Integer> entry: contributions.entrySet()) {+ User user = entry.getKey();+ int fileContribution = commitInfoManager.getContributions(update.getRequest().getTargetProject(), user,file);entry.setValue(entry.getValue() + fileContribution);addedContributions += fileContribution;@@ -417,7 +417,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>return addedContributions;}- private void inviteReviewer(Account user) {+ private void inviteReviewer(User user) {ReviewInvitation invitation = getInvitation(user);if (invitation != null) {invitation.setType(ReviewInvitation.Type.RULE);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 6eb2ffd0c6..8b9e6c797e 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.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStarting;+import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.util.FileUtils;@@ -42,65 +42,65 @@ public class DefaultStorageManager implements StorageManager {return storageDir;}- private File getDepotsDir() {- File depotsDir = new File(getStorageDir(), "repositories");- FileUtils.createDir(depotsDir);- return depotsDir;+ private File getProjectsDir() {+ File projectsDir = new File(getStorageDir(), "projects");+ FileUtils.createDir(projectsDir);+ return projectsDir;}- private File getDepotDir(Depot depot) {- File depotDir = new File(getDepotsDir(), String.valueOf(depot.getId()));- FileUtils.createDir(depotDir);- return depotDir;+ private File getProjectDir(Project project) {+ File projectDir = new File(getProjectsDir(), String.valueOf(project.getId()));+ FileUtils.createDir(projectDir);+ return projectDir;}@Override- public File getGitDir(Depot depot) {- File gitDir = new File(getDepotDir(depot), "git");+ public File getGitDir(Project project) {+ File gitDir = new File(getProjectDir(project), "git");FileUtils.createDir(gitDir);return gitDir;}@Override- public File getInfoDir(Depot depot) {- File cacheDir = new File(getDepotDir(depot), "info");+ public File getInfoDir(Project project) {+ File cacheDir = new File(getProjectDir(project), "info");FileUtils.createDir(cacheDir);return cacheDir;}@Override- public File getIndexDir(Depot depot) {- File indexDir = new File(getDepotDir(depot), "index");+ public File getIndexDir(Project project) {+ File indexDir = new File(getProjectDir(project), "index");FileUtils.createDir(indexDir);return indexDir;}@Override- public File getAttachmentDir(Depot depot) {- File attachmentDir = new File(getDepotDir(depot), "attachment");+ public File getAttachmentDir(Project project) {+ File attachmentDir = new File(getProjectDir(project), "attachment");FileUtils.createDir(attachmentDir);return attachmentDir;}@Listenpublic void on(SystemStarting event) {- for (File depotDir: getDepotsDir().listFiles()) {- if (new File(depotDir, DELETE_MARK).exists()) {- logger.info("Deleting directory marked for deletion: " + depotDir);- FileUtils.deleteDir(depotDir);+ for (File projectDir: getProjectsDir().listFiles()) {+ if (new File(projectDir, DELETE_MARK).exists()) {+ logger.info("Deleting directory marked for deletion: " + projectDir);+ FileUtils.deleteDir(projectDir);}}}@Transactional@Listen- public void on(DepotDeleted event) {+ public void on(ProjectDeleted event) {dao.doAfterCommit(new Runnable() {@Overridepublic void run() {try {- new File(getDepotDir(event.getDepot()), DELETE_MARK).createNewFile();+ new File(getProjectDir(event.getProject()), DELETE_MARK).createNewFile();} catch (IOException e) {throw new RuntimeException(e);}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.javadeleted file mode 100644index 177d3f23d1..0000000000--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java+++ /dev/null@@ -1,71 +0,0 @@-package com.gitplex.server.manager.impl;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.Query;-import org.hibernate.criterion.Restrictions;--import com.google.common.base.Preconditions;-import com.gitplex.launcher.loader.Listen;-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;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.security.privilege.DepotPrivilege;--@Singleton-public class DefaultTeamAuthorizationManager extends AbstractEntityManager<TeamAuthorization>- implements TeamAuthorizationManager {-- @Inject- public DefaultTeamAuthorizationManager(Dao dao) {- super(dao);- }-- @Transactional- @Override- public void save(TeamAuthorization entity) {- DepotPrivilege privilege = entity.getPrivilege();-- /*- * Admin privilege is not allowed for team to make permission management consistent.- * That is: the person able to administer a depot can also administer the whole- * account, so that they can edit authorizations either from depot side, or from- * team side- */- Preconditions.checkArgument(privilege == DepotPrivilege.READ || privilege == DepotPrivilege.WRITE);- dao.persist(entity);- }-- @Transactional- @Listen- public void on(DepotTransferred event) {- Query query = getSession().createQuery("delete from TeamAuthorization where depot=:depot");- query.setParameter("depot", event.getDepot());- query.executeUpdate();- }-- @Transactional- @Override- public void delete(Collection<TeamAuthorization> authorizations) {- for (TeamAuthorization authorization: authorizations)- dao.remove(authorization);- }-- @Sessional- @Override- public Collection<TeamAuthorization> findAll(Account organization) {- EntityCriteria<TeamAuthorization> criteria = newCriteria();- criteria.createCriteria("depot").add(Restrictions.eq("account", organization));- return findAll(criteria);- }--}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.javadeleted file mode 100644index 553dc451a7..0000000000--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java+++ /dev/null@@ -1,62 +0,0 @@-package com.gitplex.server.manager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--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.support.BranchProtection;-import com.gitplex.server.model.support.TagProtection;-import com.gitplex.server.persistence.annotation.Sessional;-import com.gitplex.server.persistence.annotation.Transactional;-import com.gitplex.server.persistence.dao.AbstractEntityManager;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {-- @Inject- public DefaultTeamManager(Dao dao) {- super(dao);- }-- @Transactional- @Override- public void save(Team team, String oldName) {- if (oldName != null && !oldName.equals(team.getName())) {- for (Depot depot: team.getOrganization().getDepots()) {- for (BranchProtection protection: depot.getBranchProtections())- protection.onTeamRename(depot, oldName, team.getName());- for (TagProtection protection: depot.getTagProtections())- protection.onTeamRename(oldName, team.getName());- }- }- dao.persist(team);- }-- @Transactional- @Override- public void delete(Team team) {- for (Depot depot: team.getOrganization().getDepots()) {- for (BranchProtection protection: depot.getBranchProtections())- protection.onTeamDelete(depot, team.getName());- for (TagProtection protection: depot.getTagProtections())- protection.onTeamDelete(team.getName());- }- dao.remove(team);- }-- @Sessional- @Override- public Team find(Account organization, String name) {- EntityCriteria<Team> criteria = newCriteria();- criteria.add(Restrictions.eq("organization", organization)).add(Restrictions.eq("name", name));- return find(criteria);- }--}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.javadeleted file mode 100644index 5f828f0e1d..0000000000--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java+++ /dev/null@@ -1,52 +0,0 @@-package com.gitplex.server.manager.impl;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--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;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultTeamMembershipManager extends AbstractEntityManager<TeamMembership>- implements TeamMembershipManager {-- @Inject- public DefaultTeamMembershipManager(Dao dao) {- super(dao);- }-- @Sessional- @Override- public Collection<TeamMembership> findAll(Account organization, Account user) {- EntityCriteria<TeamMembership> criteria = newCriteria();- criteria.add(Restrictions.eq("user", user));- criteria.createCriteria("team").add(Restrictions.eq("organization", organization));- return findAll(criteria);- }-- @Sessional- @Override- public Collection<TeamMembership> findAll(Account organization) {- EntityCriteria<TeamMembership> criteria = newCriteria();- criteria.createCriteria("team").add(Restrictions.eq("organization", organization));- return findAll(criteria);- }-- @Transactional- @Override- public void delete(Collection<TeamMembership> memberships) {- for (TeamMembership membership: memberships)- dao.remove(membership);- }--}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 34670e3323..57af59298f 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@@ -5,19 +5,11 @@ import java.util.Collection;import javax.inject.Inject;import javax.inject.Singleton;-import org.hibernate.criterion.Restrictions;-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;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.security.privilege.DepotPrivilege;-import com.google.common.base.Preconditions;@Singletonpublic class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>@@ -28,38 +20,6 @@ public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAsuper(dao);}- @Transactional- @Override- public void save(UserAuthorization entity) {- DepotPrivilege privilege = entity.getPrivilege();-- /*- * Admin privilege is not allowed for team to make permission management consistent.- * That is: the person able to administer a depot can also administer the whole- * account, so that they can edit authorizations either from depot side, or from- * team side- */- Preconditions.checkArgument(privilege == DepotPrivilege.READ || privilege == DepotPrivilege.WRITE);-- dao.persist(entity);- }-- @Sessional- @Override- public UserAuthorization find(Account user, Depot depot) {- EntityCriteria<UserAuthorization> criteria = newCriteria();- criteria.add(Restrictions.eq("user", user)).add(Restrictions.eq("depot", depot));- return find(criteria);- }-- @Sessional- @Override- public Collection<UserAuthorization> findAll(Account account) {- EntityCriteria<UserAuthorization> criteria = newCriteria();- criteria.createCriteria("depot").add(Restrictions.eq("account", account));- return findAll(criteria);- }-@Transactional@Overridepublic void delete(Collection<UserAuthorization> authorizations) {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.javasimilarity index 55%rename from core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.javarename to core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.javaindex 70944bf10e..796d415c3a 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java@@ -1,6 +1,5 @@package com.gitplex.server.manager.impl;-import java.util.List;import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;@@ -11,26 +10,24 @@ import org.apache.shiro.authc.credential.PasswordService;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.Query;import org.hibernate.ReplicationMode;-import org.hibernate.criterion.Restrictions;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.event.lifecycle.SystemStarting;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;import com.google.common.collect.BiMap;import com.google.common.collect.HashBiMap;@Singleton-public class DefaultAccountManager extends AbstractEntityManager<Account> implements AccountManager {+public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {private final PasswordService passwordService;@@ -41,7 +38,7 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implemprivate final BiMap<String, Long> nameToId = HashBiMap.create();@Inject- public DefaultAccountManager(Dao dao, PasswordService passwordService) {+ public DefaultUserManager(Dao dao, PasswordService passwordService) {super(dao);this.passwordService = passwordService;@@ -49,19 +46,19 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem@Transactional@Override- public void save(Account account, String oldName) {- if (account.isAdministrator()) {- getSession().replicate(account, ReplicationMode.OVERWRITE);+ public void save(User user, String oldName) {+ if (user.isRoot()) {+ getSession().replicate(user, ReplicationMode.OVERWRITE);} else {- dao.persist(account);+ dao.persist(user);}- if (oldName != null && !oldName.equals(account.getName())) {- for (Depot depot: dao.findAll(Depot.class)) {- for (BranchProtection protection: depot.getBranchProtections())- protection.onAccountRename(depot, oldName, account.getName());- for (TagProtection protection: depot.getTagProtections())- protection.onAccountRename(oldName, account.getName());+ if (oldName != null && !oldName.equals(user.getName())) {+ for (Project project: dao.findAll(Project.class)) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onUserRename(project, oldName, user.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onUserRename(oldName, user.getName());}}@@ -71,9 +68,9 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implempublic void run() {idLock.writeLock().lock();try {- nameToId.inverse().put(account.getId(), account.getName());- if (account.getEmail() != null)- emailToId.inverse().put(account.getId(), account.getEmail());+ nameToId.inverse().put(user.getId(), user.getName());+ if (user.getEmail() != null)+ emailToId.inverse().put(user.getId(), user.getEmail());} finally {idLock.writeLock().unlock();}@@ -83,80 +80,80 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem}@Override- public void save(Account account) {- save(account, null);+ public void save(User user) {+ save(user, null);}@Sessional@Override- public Account getRoot() {- return load(Account.ADMINISTRATOR_ID);+ public User getRoot() {+ return load(User.ROOT_ID);}@Transactional@Override- public void delete(Account account) {+ public void delete(User user) {Query query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "+ "where submitter=:submitter");- query.setParameter("submitter", account);- query.setParameter("submitterName", account.getDisplayName());+ query.setParameter("submitter", user);+ query.setParameter("submitterName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update PullRequest set closeInfo.closedBy=null, "+ "closeInfo.closedByName=:closedByName where closeInfo.closedBy=:closedBy");- query.setParameter("closedBy", account);- query.setParameter("closedByName", account.getDisplayName());+ query.setParameter("closedBy", user);+ query.setParameter("closedByName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update PullRequest set lastEvent.user=null, "+ "lastEvent.userName=:lastEventUserName where lastEvent.user=:lastEventUser");- query.setParameter("lastEventUser", account);- query.setParameter("lastEventUserName", account.getDisplayName());+ query.setParameter("lastEventUser", user);+ query.setParameter("lastEventUserName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update PullRequestStatusChange set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update PullRequestComment set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update PullRequestReference set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update CodeComment set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update CodeComment set lastEvent.user=null, "+ "lastEvent.userName=:lastEventUserName where lastEvent.user=:lastEventUser");- query.setParameter("lastEventUser", account);- query.setParameter("lastEventUserName", account.getDisplayName());+ query.setParameter("lastEventUser", user);+ query.setParameter("lastEventUserName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();query = getSession().createQuery("update CodeCommentStatusChange set user=null, userName=:userName where user=:user");- query.setParameter("user", account);- query.setParameter("userName", account.getDisplayName());+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());query.executeUpdate();- dao.remove(account);+ dao.remove(user);- for (Depot depot: dao.findAll(Depot.class)) {- for (BranchProtection protection: depot.getBranchProtections())- protection.onAccountDelete(depot, account.getName());- for (TagProtection protection: depot.getTagProtections())- protection.onAccountDelete(account.getName());+ for (Project project: dao.findAll(Project.class)) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onUserDelete(project, user.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onUserDelete(user.getName());}doAfterCommit(new Runnable() {@@ -165,8 +162,8 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implempublic void run() {idLock.writeLock().lock();try {- emailToId.inverse().remove(account.getId());- nameToId.inverse().remove(account.getId());+ emailToId.inverse().remove(user.getId());+ nameToId.inverse().remove(user.getId());} finally {idLock.writeLock().unlock();}@@ -177,7 +174,7 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem@Sessional@Override- public Account findByName(String userName) {+ public User findByName(String userName) {idLock.readLock().lock();try {Long id = nameToId.get(userName);@@ -192,7 +189,7 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem@Sessional@Override- public Account findByEmail(String email) {+ public User findByEmail(String email) {idLock.readLock().lock();try {Long id = emailToId.get(email);@@ -207,7 +204,7 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem@Sessional@Override- public Account find(PersonIdent person) {+ public User find(PersonIdent person) {idLock.readLock().lock();try {Long id = emailToId.get(person.getEmailAddress());@@ -221,10 +218,10 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem}@Override- public Account getCurrent() {- Long userId = Account.getCurrentId();+ public User getCurrent() {+ Long userId = User.getCurrentId();if (userId != 0L) {- Account user = get(userId);+ User user = get(userId);if (user != null)return user;}@@ -234,37 +231,21 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem@Sessional@Listenpublic void on(SystemStarting event) {- for (Account user: findAll()) {+ for (User user: findAll()) {if (user.getEmail() != null)emailToId.inverse().put(user.getId(), user.getEmail());nameToId.inverse().put(user.getId(), user.getName());}}- @Sessional- @Override- public List<Account> findAllUsers() {- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);- criteria.add(Restrictions.eq("organization", false));- return findRange(criteria, 0, 0);- }-- @Sessional- @Override- public List<Account> findAllOrganizations() {- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);- criteria.add(Restrictions.eq("organization", true));- return findRange(criteria, 0, 0);- }-@Listenpublic void on(SystemStarted event) {// Fix a critical issue that password of self-registered users are not hashed- for (Account account: findAll()) {- if (account.getPassword() != null && !account.getPassword().startsWith("$2a$10")- && !account.getPassword().startsWith("@hash^prefix@")) {- account.setPassword(passwordService.encryptPassword(account.getPassword()));- save(account);+ for (User user: findAll()) {+ if (user.getPassword() != null && !user.getPassword().startsWith("$2a$10")+ && !user.getPassword().startsWith("@hash^prefix@")) {+ user.setPassword(passwordService.encryptPassword(user.getPassword()));+ save(user);}}}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 d2c3bf4979..2a29a4d3f3 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,8 +12,8 @@ import javax.inject.Inject;import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;@@ -21,9 +21,9 @@ 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.User;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.persistence.annotation.Transactional;@@ -64,19 +64,19 @@ public class DefaultVisitInfoManager implements VisitInfoManager {this.storageManager = storageManager;}- private synchronized Environment getEnv(Depot depot) {- Environment env = envs.get(depot.getId());+ private synchronized Environment getEnv(Project project) {+ Environment env = envs.get(project.getId());if (env == null) {EnvironmentConfig config = new EnvironmentConfig();config.setEnvCloseForcedly(true);- env = Environments.newInstance(getInfoDir(depot), config);- envs.put(depot.getId(), env);+ env = Environments.newInstance(getInfoDir(project), config);+ envs.put(project.getId(), env);}return env;}- private File getInfoDir(Depot depot) {- File infoDir = new File(storageManager.getInfoDir(depot), INFO_DIR);+ private File getInfoDir(Project project) {+ File infoDir = new File(storageManager.getInfoDir(project), INFO_DIR);if (!infoDir.exists())FileUtils.createDir(infoDir);return infoDir;@@ -99,8 +99,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public void visit(Account user, Depot depot) {- Environment env = getEnv(depot);+ public void visit(User user, Project project) {+ Environment env = getEnv(project);Store store = getStore(env, DEFAULT_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -114,8 +114,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public void visit(Account user, PullRequest request) {- Environment env = getEnv(request.getTargetDepot());+ public void visit(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject());Store store = getStore(env, PULL_REQUEST_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -129,8 +129,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public void visit(Account user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetDepot());+ public void visit(User user, CodeComment comment) {+ Environment env = getEnv(comment.getRequest().getTargetProject());Store store = getStore(env, CODE_COMMENT_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -144,8 +144,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public Date getVisitDate(Account user, Depot depot) {- Environment env = getEnv(depot);+ public Date getVisitDate(User user, Project project) {+ Environment env = getEnv(project);Store store = getStore(env, DEFAULT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -162,8 +162,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public Date getVisitDate(Account user, PullRequest request) {- Environment env = getEnv(request.getTargetDepot());+ public Date getVisitDate(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject());Store store = getStore(env, PULL_REQUEST_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -180,8 +180,8 @@ public class DefaultVisitInfoManager implements VisitInfoManager {}@Override- public Date getVisitDate(Account user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetDepot());+ public Date getVisitDate(User user, CodeComment comment) {+ Environment env = getEnv(comment.getRequest().getTargetProject());Store store = getStore(env, CODE_COMMENT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -243,14 +243,14 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Transactional@Listen- public void on(DepotDeleted event) {- Long depotId = event.getDepot().getId();+ public void on(ProjectDeleted event) {+ Long projectId = event.getProject().getId();dao.doAfterCommit(new Runnable() {@Overridepublic void run() {synchronized (envs) {- Environment env = envs.remove(depotId);+ Environment env = envs.remove(projectId);if (env != null)env.close();}diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.javaindex 093cacbd20..dd2f9bdc0f 100644--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java@@ -32,7 +32,7 @@ public class DatabaseMigrator {private void migrate2(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Depots.xml")) {+ if (file.getName().startsWith("depots.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {Element gateKeeperElement = element.element("gateKeeper");@@ -73,7 +73,7 @@ public class DatabaseMigrator {private void migrate4(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Accounts.xml")) {+ if (file.getName().startsWith("Users.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {Element avatarUploadDateElement = element.element("avatarUploadDate");@@ -170,13 +170,13 @@ public class DatabaseMigrator {}}dom.writeToFile(file, false);- } else if (file.getName().startsWith("Accounts.xml")) {+ } else if (file.getName().startsWith("Users.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {element.element("reviewEffort").detach();}dom.writeToFile(file, false);- } else if (file.getName().startsWith("Depots.xml")) {+ } else if (file.getName().startsWith("depots.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {element.element("gateKeepers").detach();diff --git a/core/src/main/java/com/gitplex/server/migration/MigrationHelper.java b/core/src/main/java/com/gitplex/server/migration/MigrationHelper.javaindex 8d678fc33f..1ae8f31b44 100644--- a/core/src/main/java/com/gitplex/server/migration/MigrationHelper.java+++ b/core/src/main/java/com/gitplex/server/migration/MigrationHelper.java@@ -25,9 +25,6 @@ public class MigrationHelper {private static final Pattern migrateMethodPattern =Pattern.compile("^migrate(\\d+)$");- // caches the analysis result to speed up migration process (there might be many- // bean data need to be migrated, such as various repository/builder/step- // definitions, etc).private static Map<String, MigratorAnalyzeResult> migratorAnalyzeResults =new ConcurrentHashMap<String, MigratorAnalyzeResult>();diff --git a/core/src/main/java/com/gitplex/server/model/Account.java b/core/src/main/java/com/gitplex/server/model/Account.javadeleted file mode 100644index 7b275e8c5f..0000000000--- a/core/src/main/java/com/gitplex/server/model/Account.java+++ /dev/null@@ -1,434 +0,0 @@-package com.gitplex.server.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.Map;-import java.util.Set;-import java.util.UUID;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.Version;-import javax.validation.constraints.NotNull;--import org.apache.shiro.SecurityUtils;-import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.SimplePrincipalCollection;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.web.mgt.WebSecurityManager;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;--import com.gitplex.launcher.loader.AppLoader;-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.security.privilege.DepotPrivilege;-import com.gitplex.server.security.protectedobject.AccountBelonging;-import com.gitplex.server.security.protectedobject.ProtectedObject;-import com.gitplex.server.util.StringUtils;-import com.gitplex.server.util.editable.annotation.Editable;-import com.gitplex.server.util.editable.annotation.ExcludeValues;-import com.gitplex.server.util.editable.annotation.Password;-import com.gitplex.server.util.validation.annotation.AccountName;-import com.google.common.base.Objects;-import com.google.common.base.Preconditions;-import com.google.common.collect.Sets;--@Entity-@Table(indexes={- @Index(columnList="email"), @Index(columnList="fullName"),- @Index(columnList="noSpaceName"), @Index(columnList="noSpaceFullName")})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@Editable-public class Account extends AbstractEntity implements AuthenticationInfo, ProtectedObject {-- private static final long serialVersionUID = 1L;-- public static final Long ADMINISTRATOR_ID = 1L;-- @Column(unique=true, nullable=false)- private String name;-- @Column(length=1024)- private String password;-- private boolean organization;-- private String fullName;-- /* used by user account */- @Column(unique=true)- private String email;-- /* used by organization account */- @Column(nullable=false)- private DepotPrivilege defaultPrivilege = DepotPrivilege.NONE;-- @Column(nullable=false)- private String noSpaceName;-- private String noSpaceFullName;-- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- /*- * Optimistic lock is necessary to ensure database integrity when update- * branch and tag protection settings upon account renaming/deletion- */- @Version- private long version;-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<OrganizationMembership> organizations = new ArrayList<>();-- @OneToMany(mappedBy="organization", cascade=CascadeType.REMOVE)- private Collection<OrganizationMembership> organizationMembers = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<TeamMembership> joinedTeams = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizedDepots = new ArrayList<>();-- @OneToMany(mappedBy="account")- private Collection<Depot> depots = new ArrayList<>();-- /* used by organization account */- @OneToMany(mappedBy="organization", cascade=CascadeType.REMOVE)- private Collection<Team> definedTeams = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<Review> reviews = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<BranchWatch> branchWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestWatch> requestWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestTask> requestTasks = new ArrayList<>();-- private transient Collection<TeamAuthorization> allTeamAuthorizationsInOrganization;-- private transient Collection<TeamMembership> allTeamMembershipsInOrganiation;-- private transient Collection<UserAuthorization> allUserAuthorizationsInOrganization;-- private transient Map<Account, OrganizationMembership> organizationMembersMap;-- @Override- public PrincipalCollection getPrincipals() {- return new SimplePrincipalCollection(getId(), "");- }-- @Override- public Object getCredentials() {- return password;- }-- public Subject asSubject() {- return asSubject(getId());- }-- public static Long getCurrentId() {- Object principal = SecurityUtils.getSubject().getPrincipal();- Preconditions.checkNotNull(principal);- return (Long) principal;- }-- public static PrincipalCollection asPrincipal(Long userId) {- return new SimplePrincipalCollection(userId, "");- }-- public static Subject asSubject(Long userId) {- WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();- }-- @Editable(name="Account Name", order=100)- @AccountName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- noSpaceName = StringUtils.deleteWhitespace(name);- }-- @Editable(order=150, autocomplete="new-password")- @Password(confirmative=true)- @NotEmpty- public String getPassword() {- return password;- }-- /**- * Set password of this user.- *- * @param password- * password to set- */- public void setPassword(String password) {- if (password != null) {- this.password = password;- } else {- this.password = null;- }- }-- @Editable(order=200)- public String getFullName() {- return fullName;- }-- public void setFullName(String fullName) {- this.fullName = fullName;- noSpaceFullName = StringUtils.deleteWhitespace(fullName);- }-- public boolean isOrganization() {- return organization;- }-- public void setOrganization(boolean organization) {- this.organization = organization;- }-- @Editable(order=300)- @NotEmpty- public String getEmail() {- return email;- }-- public void setEmail(String email) {- this.email = email;- }-- @Editable(order=370, description=""- + "Members will have this minimal privilege on all repositories "- + "in this organization. "- + "<ul>"- + "<li>None: No any permissions granted on repositories"- + "<li>Read: Able to pull and browse repositories"- + "<li>Write: Has full read privilege, and can also push to "- + "repositories unless gatekeeper prevents")- @ExcludeValues("ADMIN")- @NotNull- public DepotPrivilege getDefaultPrivilege() {- return defaultPrivilege;- }-- public void setDefaultPrivilege(DepotPrivilege defaultPrivilege) {- this.defaultPrivilege = defaultPrivilege;- }-- public Collection<OrganizationMembership> getOrganizations() {- return organizations;- }-- public void setOrganizations(Collection<OrganizationMembership> organizations) {- this.organizations = organizations;- }-- public Collection<OrganizationMembership> getOrganizationMembers() {- return organizationMembers;- }-- public void setOrganizationMemberships(Collection<OrganizationMembership> organizationMembers) {- this.organizationMembers = organizationMembers;- }-- public Collection<TeamMembership> getJoinedTeams() {- return joinedTeams;- }-- public void setJoinedTeams(Collection<TeamMembership> joinedTeams) {- this.joinedTeams = joinedTeams;- }-- public Collection<Depot> getDepots() {- return depots;- }-- public void setDepots(Collection<Depot> depots) {- this.depots = depots;- }-- public Collection<Team> getDefinedTeams() {- return definedTeams;- }-- public void setDefinedTeams(Collection<Team> definedTeams) {- this.definedTeams = definedTeams;- }-- public Collection<PullRequestTask> getRequestTasks() {- return requestTasks;- }-- public void setRequestTasks(Collection<PullRequestTask> requestTasks) {- this.requestTasks = requestTasks;- }-- @Override- public boolean has(ProtectedObject object) {- if (object instanceof Account) {- Account user = (Account) object;- return user.equals(this);- } else if (object instanceof AccountBelonging) {- AccountBelonging userBelonging = (AccountBelonging) object;- return userBelonging.getAccount().equals(this);- } else {- return false;- }- }-- @Nullable- public Review getReviewAfter(PullRequestUpdate update) {- for (Review review: update.getRequest().getReviews()) {- if (review.getUser().equals(this) && review.getUpdate() != null- && review.getUpdate().getId()>=update.getId()) {- return review;- }- }- return null;- }-- @Override- public String toString() {- return Objects.toStringHelper(this)- .add("name", getName())- .toString();- }-- public PersonIdent asPerson() {- return new PersonIdent(getName(), getEmail());- }-- public String getDisplayName() {- if (getFullName() != null)- return getFullName();- else- return getName();- }-- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getName().toLowerCase().contains(searchTerm)- || fullName!=null && fullName.toLowerCase().contains(searchTerm);- }-- public boolean isAdministrator() {- return ADMINISTRATOR_ID.equals(getId());- }-- public String getNoSpaceName() {- return noSpaceName;- }-- public String getNoSpaceFullName() {- return noSpaceFullName;- }-- public long getVersion() {- return version;- }-- public Collection<UserAuthorization> getAuthorizedDepots() {- return authorizedDepots;- }-- public void setAuthorizedDepots(Collection<UserAuthorization> authorizedDepots) {- this.authorizedDepots = authorizedDepots;- }-- public Collection<TeamAuthorization> getAllTeamAuthorizationsInOrganization() {- if (allTeamAuthorizationsInOrganization == null) {- allTeamAuthorizationsInOrganization = GitPlex.getInstance(TeamAuthorizationManager.class).findAll(this);- }- return allTeamAuthorizationsInOrganization;- }-- public Collection<UserAuthorization> getAllUserAuthorizationsInOrganization() {- if (allUserAuthorizationsInOrganization == null) {- allUserAuthorizationsInOrganization = GitPlex.getInstance(UserAuthorizationManager.class).findAll(this);- }- return allUserAuthorizationsInOrganization;- }-- public Collection<TeamMembership> getAllTeamMembershipsInOrganiation() {- if (allTeamMembershipsInOrganiation == null) {- allTeamMembershipsInOrganiation = GitPlex.getInstance(TeamMembershipManager.class).findAll(this);- }- return allTeamMembershipsInOrganiation;- }-- public Map<Account, OrganizationMembership> getOrganizationMembersMap() {- if (organizationMembersMap == null) {- organizationMembersMap = new HashMap<>();- for (OrganizationMembership membership: getOrganizationMembers()) {- organizationMembersMap.put(membership.getUser(), membership);- }- }- return organizationMembersMap;- }-- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-- @Override- public int compareTo(AbstractEntity entity) {- Account account = (Account) entity;- if (getDisplayName().equals(account.getDisplayName())) {- return getId().compareTo(entity.getId());- } else {- return getDisplayName().compareTo(account.getDisplayName());- }- }-- public static Set<String> getOrganizationExcludeProperties() {- return Sets.newHashSet("email", "password");- }-- public static Set<String> getUserExcludeProperties() {- return Sets.newHashSet("defaultPrivilege", "description");- }-- public static Account getForDisplay(@Nullable Account account, @Nullable String accountName) {- if (account == null && accountName != null) {- account = new Account();- account.setName(accountName);- }- return account;- }--}diff --git a/core/src/main/java/com/gitplex/server/model/BranchWatch.java b/core/src/main/java/com/gitplex/server/model/BranchWatch.javaindex 4811690f4a..419f9cc1f4 100644--- a/core/src/main/java/com/gitplex/server/model/BranchWatch.java+++ b/core/src/main/java/com/gitplex/server/model/BranchWatch.java@@ -11,8 +11,8 @@ import javax.persistence.UniqueConstraint;@Entity@Table(- indexes={@Index(columnList="g_depot_id"), @Index(columnList="g_user_id"), @Index(columnList="branch")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_depot_id", "branch", "g_user_id"})+ indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id"), @Index(columnList="branch")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "branch", "g_user_id"})})public class BranchWatch extends AbstractEntity {@@ -20,21 +20,21 @@ public class BranchWatch extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Depot depot;+ private Project project;@Column(nullable=false)private String branch;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;- public Depot getDepot() {- return depot;+ public Project getProject() {+ return project;}- public void setDepot(Depot depot) {- this.depot = depot;+ public void setProject(Project project) {+ this.project = project;}public String getBranch() {@@ -45,11 +45,11 @@ public class BranchWatch extends AbstractEntity {this.branch = branch;}- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}}diff --git a/core/src/main/java/com/gitplex/server/model/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.javaindex ac0616dbbf..1a2d4d6428 100644--- a/core/src/main/java/com/gitplex/server/model/CodeComment.java+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java@@ -65,7 +65,7 @@ public class CodeComment extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account user;+ private User user;private String userName;@@ -106,11 +106,11 @@ public class CodeComment extends AbstractEntity {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(@Nullable Account user) {+ public void setUser(@Nullable User user) {this.user = user;}@@ -200,7 +200,7 @@ public class CodeComment extends AbstractEntity {}public boolean isVisitedAfter(Date date) {- Account user = SecurityUtils.getAccount();+ User user = SecurityUtils.getUser();if (user != null) {Date visitDate = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();@@ -224,9 +224,9 @@ public class CodeComment extends AbstractEntity {if (request.getHeadCommitHash().equals(markPos.getCommit())) {codeChanged = false;} else {- Depot depot = request.getTargetDepot();- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {- TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), markPos.getPath(),+ Project project = request.getTargetProject();+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {+ TreeWalk treeWalk = TreeWalk.forPath(project.getRepository(), markPos.getPath(),request.getHeadCommit().getTree());if (treeWalk != null) {ObjectId blobId = treeWalk.getObjectId(0);@@ -234,7 +234,7 @@ public class CodeComment extends AbstractEntity {BlobIdent blobIdent = new BlobIdent(request.getHeadCommitHash(), markPos.getPath(),treeWalk.getRawMode(0));Blob newBlob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());- Blob oldBlob = depot.getBlob(new BlobIdent(markPos.getCommit(),+ Blob oldBlob = project.getBlob(new BlobIdent(markPos.getCommit(),markPos.getPath(), FileMode.REGULAR_FILE.getBits()));Preconditions.checkState(oldBlob != null && oldBlob.getText() != null);diff --git a/core/src/main/java/com/gitplex/server/model/Group.java b/core/src/main/java/com/gitplex/server/model/Group.javanew file mode 100644index 0000000000..2e6d16c56c--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/Group.java@@ -0,0 +1,133 @@+package com.gitplex.server.model;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.OneToMany;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;++@Entity+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class Group extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @Column(unique=true, nullable=false)+ private String name;++ private String description;++ private boolean administrator;++ private boolean canCreateProjects = true;++ @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ private Collection<GroupAuthorization> authorizations = new ArrayList<>();++ @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ private Collection<Membership> memberships = new ArrayList<>();++ private transient Collection<User> members;++ private transient Collection<Project> authorizedProjects;++ @Editable(order=100)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200, description="Optionally describe the group")+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=300)+ public boolean isAdministrator() {+ return administrator;+ }++ public void setAdministrator(boolean administrator) {+ this.administrator = administrator;+ }++ @Editable(order=400)+ public boolean isCanCreateProjects() {+ return canCreateProjects;+ }++ public void setCanCreateProjects(boolean canCreateProjects) {+ this.canCreateProjects = canCreateProjects;+ }++ public Collection<GroupAuthorization> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizations(Collection<GroupAuthorization> authorizations) {+ this.authorizations = authorizations;+ }++ public Collection<Membership> getMemberships() {+ return memberships;+ }++ public void setMemberships(Collection<Membership> memberships) {+ this.memberships = memberships;+ }++ public boolean matches(@Nullable String searchTerm) {+ if (searchTerm == null)+ searchTerm = "";+ else+ searchTerm = searchTerm.toLowerCase().trim();++ return getName().toLowerCase().contains(searchTerm);+ }++ public Collection<User> getMembers() {+ if (members == null) {+ members = new HashSet<>();+ for (Membership membership: getMemberships()) {+ members.add(membership.getUser());+ }+ }+ return members;+ }++ public Collection<Project> getAuthorizedProjects() {+ if (authorizedProjects == null) {+ authorizedProjects = new HashSet<>();+ for (GroupAuthorization authorization: getAuthorizations()) {+ authorizedProjects.add(authorization.getProject());+ }+ }+ return authorizedProjects;+ }++ @Override+ public int compareTo(AbstractEntity entity) {+ Group group = (Group) entity;+ return getName().compareTo(group.getName());+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/GroupAuthorization.java b/core/src/main/java/com/gitplex/server/model/GroupAuthorization.javanew file mode 100644index 0000000000..46a92d2a5b--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/GroupAuthorization.java@@ -0,0 +1,58 @@+package com.gitplex.server.model;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import com.gitplex.server.security.ProjectPrivilege;++@Entity+@Table(+ indexes={@Index(columnList="g_group_id"), @Index(columnList="g_project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_group_id", "g_project_id"})+})+public class GroupAuthorization extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Group group;++ @Column(nullable=false)+ private ProjectPrivilege privilege = ProjectPrivilege.READ;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public Group getGroup() {+ return group;+ }++ public void setGroup(Group group) {+ this.group = group;+ }++ public ProjectPrivilege getPrivilege() {+ return privilege;+ }++ public void setPrivilege(ProjectPrivilege privilege) {+ this.privilege = privilege;+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/TeamMembership.java b/core/src/main/java/com/gitplex/server/model/Membership.javasimilarity index 70%rename from core/src/main/java/com/gitplex/server/model/TeamMembership.javarename to core/src/main/java/com/gitplex/server/model/Membership.javaindex 57362bd6e9..4d5e241acc 100644--- a/core/src/main/java/com/gitplex/server/model/TeamMembership.java+++ b/core/src/main/java/com/gitplex/server/model/Membership.java@@ -10,35 +10,35 @@ import javax.persistence.UniqueConstraint;@Entity@Table(- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_team_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_team_id"})+ indexes={@Index(columnList="g_user_id"), @Index(columnList="g_group_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_group_id"})})-public class TeamMembership extends AbstractEntity {+public class Membership extends AbstractEntity {private static final long serialVersionUID = 1L;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Team team;+ private Group group;- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}- public Team getTeam() {- return team;+ public Group getGroup() {+ return group;}- public void setTeam(Team team) {- this.team = team;+ public void setGroup(Group group) {+ this.group = group;}}diff --git a/core/src/main/java/com/gitplex/server/model/OrganizationMembership.java b/core/src/main/java/com/gitplex/server/model/OrganizationMembership.javadeleted file mode 100644index 5a71aa2d77..0000000000--- a/core/src/main/java/com/gitplex/server/model/OrganizationMembership.java+++ /dev/null@@ -1,54 +0,0 @@-package com.gitplex.server.model;--import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--@Entity-@Table(- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_organization_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_organization_id"})-})-public class OrganizationMembership extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Account user;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Account organization;-- private boolean admin;-- public Account getUser() {- return user;- }-- public void setUser(Account user) {- this.user = user;- }-- public Account getOrganization() {- return organization;- }-- public void setOrganization(Account organization) {- this.organization = organization;- }-- public boolean isAdmin() {- return admin;- }-- public void setAdmin(boolean admin) {- this.admin = admin;- }--}diff --git a/core/src/main/java/com/gitplex/server/model/Depot.java b/core/src/main/java/com/gitplex/server/model/Project.javasimilarity index 84%rename from core/src/main/java/com/gitplex/server/model/Depot.javarename to core/src/main/java/com/gitplex/server/model/Project.javaindex 739a600bc5..8b2554960b 100644--- a/core/src/main/java/com/gitplex/server/model/Depot.java+++ b/core/src/main/java/com/gitplex/server/model/Project.java@@ -28,7 +28,6 @@ import javax.persistence.Lob;import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;-import javax.persistence.UniqueConstraint;import javax.persistence.Version;import javax.validation.Valid;@@ -73,7 +72,7 @@ import com.gitplex.server.git.Submodule;import com.gitplex.server.git.exception.NotFileException;import com.gitplex.server.git.exception.ObjectNotFoundException;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.support.BranchProtection;@@ -81,45 +80,33 @@ import com.gitplex.server.model.support.CommitMessageTransformSetting;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.protectedobject.AccountBelonging;-import com.gitplex.server.security.protectedobject.ProtectedObject;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.LockUtils;import com.gitplex.server.util.PathUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Markdown;-import com.gitplex.server.util.validation.annotation.DepotName;+import com.gitplex.server.util.validation.annotation.ProjectName;import com.google.common.base.Optional;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;@Entity-@Table(- indexes={@Index(columnList="g_forkedFrom_id"), @Index(columnList="g_account_id"), @Index(columnList="name")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_account_id", "name"})})+@Table(indexes={@Index(columnList="g_forkedFrom_id")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@DynamicUpdate@Editable-public class Depot extends AbstractEntity implements AccountBelonging {+public class Project extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String FQN_SEPARATOR = "/";-- public static final String REF_FQN_SEPARATOR = ":";-private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Account account;-@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=true)- private Depot forkedFrom;+ private Project forkedFrom;- @Column(nullable=false)+ @Column(nullable=false, unique=true)private String name;@Lob@@ -137,7 +124,7 @@ public class Depot extends AbstractEntity implements AccountBelonging {/** Optimistic lock is necessary to ensure database integrity when update- * branch and tag protection settings upon depot renaming/deletion+ * branch and tag protection settings upon project renaming/deletion*/@Versionprivate long version;@@ -153,20 +140,20 @@ public class Depot extends AbstractEntity implements AccountBelonging {@Column(nullable=false)private Date createdAt = new Date();- @OneToMany(mappedBy="targetDepot", cascade=CascadeType.REMOVE)+ @OneToMany(mappedBy="targetProject", cascade=CascadeType.REMOVE)private Collection<PullRequest> incomingRequests = new ArrayList<>();- @OneToMany(mappedBy="sourceDepot")+ @OneToMany(mappedBy="sourceProject")private Collection<PullRequest> outgoingRequests = new ArrayList<>();@OneToMany(mappedBy="forkedFrom")- private Collection<Depot> forks = new ArrayList<>();+ private Collection<Project> forks = new ArrayList<>();- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)- private Collection<TeamAuthorization> authorizedTeams = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizedUsers = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();private transient Repository repository;@@ -180,17 +167,12 @@ public class Depot extends AbstractEntity implements AccountBelonging {private transient Optional<String> defaultBranch;- @Override- public Account getAccount() {- return account;- }-- public void setAccount(Account account) {- this.account = account;- }-+ private transient Collection<Group> authorizedGroups;++ private transient Collection<User> authorizedUsers;+@Editable(order=100)- @DepotName+ @ProjectName@NotEmptypublic String getName() {return name;@@ -200,7 +182,7 @@ public class Depot extends AbstractEntity implements AccountBelonging {this.name = name;}- @Editable(order=200, description="Optionally describe the repository")+ @Editable(order=200, description="Optionally describe the project")@Markdownpublic String getDescription() {return description;@@ -210,7 +192,7 @@ public class Depot extends AbstractEntity implements AccountBelonging {this.description = description;}- @Editable(order=300, name="Public", description="Whether or not this repository can be read by everyone")+ @Editable(order=300, name="Public", description="Whether or not code of this project can be accessed by everyone")public boolean isPublicRead() {return publicRead;}@@ -277,19 +259,19 @@ public class Depot extends AbstractEntity implements AccountBelonging {this.outgoingRequests = outgoingRequests;}- public Depot getForkedFrom() {+ public Project getForkedFrom() {return forkedFrom;}- public void setForkedFrom(Depot forkedFrom) {+ public void setForkedFrom(Project forkedFrom) {this.forkedFrom = forkedFrom;}- public Collection<Depot> getForks() {+ public Collection<Project> getForks() {return forks;}- public void setForks(Collection<Depot> forks) {+ public void setForks(Collection<Project> forks) {this.forks = forks;}@@ -316,33 +298,6 @@ public class Depot extends AbstractEntity implements AccountBelonging {}}- @Override- public boolean has(ProtectedObject object) {- if (object instanceof Depot) {- Depot depot = (Depot) object;- return depot.getId().equals(getId());- } else {- return false;- }- }-- public String getFQN() {- return getAccount().getName() + FQN_SEPARATOR + getName();- }-- public static String getNameByFQN(String repositoryFQN) {- return StringUtils.substringAfterLast(repositoryFQN, FQN_SEPARATOR);- }-- public static String getUserNameByFQN(String repositoryFQN) {- return StringUtils.substringBeforeLast(repositoryFQN, FQN_SEPARATOR);- }-- @Override- public String toString() {- return getFQN();- }-public Git git() {return Git.wrap(getRepository());}@@ -352,12 +307,12 @@ public class Depot extends AbstractEntity implements AccountBelonging {}/**- * Find fork root of this repository.+ * Find fork root of this project.** @return- * fork root of this repository+ * fork root of this project*/- public Depot getForkRoot() {+ public Project getForkRoot() {if (forkedFrom != null)return forkedFrom.getForkRoot();else@@ -365,16 +320,16 @@ public class Depot extends AbstractEntity implements AccountBelonging {}/**- * Get all descendant repositories forking from current repository.+ * Get all descendant projects forking from current project.** @return- * all descendant repositories forking from current repository+ * all descendant projects forking from current project*/- public List<Depot> getForkDescendants() {- List<Depot> descendants = new ArrayList<>();+ public List<Project> getForkDescendants() {+ List<Project> descendants = new ArrayList<>();if (getDefaultBranch() != null)descendants.add(this);- for (Depot fork: getForks()) {+ for (Project fork: getForks()) {descendants.addAll(fork.getForkDescendants());}@@ -383,13 +338,13 @@ public class Depot extends AbstractEntity implements AccountBelonging {public Repository getRepository() {if (repository == null) {- repository = GitPlex.getInstance(DepotManager.class).getRepository(this);+ repository = GitPlex.getInstance(ProjectManager.class).getRepository(this);}return repository;}public String getUrl() {- return GitPlex.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/" + getFQN();+ return GitPlex.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/" + getName();}@Nullable@@ -731,9 +686,9 @@ public class Depot extends AbstractEntity implements AccountBelonging {public void run() {ThreadContext.bind(subject);try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());+ Project project = GitPlex.getInstance(ProjectManager.class).load(getId());GitPlex.getInstance(ListenerRegistry.class).post(- new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));+ new RefUpdated(project, refName, commitId, ObjectId.zeroId()));} finally {ThreadContext.unbindSubject();}@@ -782,9 +737,9 @@ public class Depot extends AbstractEntity implements AccountBelonging {public void run() {ThreadContext.bind(subject);try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());+ Project project = GitPlex.getInstance(ProjectManager.class).load(getId());GitPlex.getInstance(ListenerRegistry.class).post(- new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));+ new RefUpdated(project, refName, commitId, ObjectId.zeroId()));} finally {ThreadContext.unbindSubject();}@@ -793,20 +748,20 @@ public class Depot extends AbstractEntity implements AccountBelonging {});}- public Collection<TeamAuthorization> getAuthorizedTeams() {- return authorizedTeams;+ public Collection<GroupAuthorization> getGroupAuthorizations() {+ return groupAuthorizations;}- public void setAuthorizedTeams(Collection<TeamAuthorization> authorizedTeams) {- this.authorizedTeams = authorizedTeams;+ public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {+ this.groupAuthorizations = groupAuthorizations;}- public Collection<UserAuthorization> getAuthorizedUsers() {- return authorizedUsers;+ public Collection<UserAuthorization> getUserAuthorizations() {+ return userAuthorizations;}- public void setAuthorizedUsers(Collection<UserAuthorization> authorizedUsers) {- this.authorizedUsers = authorizedUsers;+ public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {+ this.userAuthorizations = userAuthorizations;}public long getVersion() {@@ -822,15 +777,6 @@ public class Depot extends AbstractEntity implements AccountBelonging {return getName().toLowerCase().contains(searchTerm);}- public boolean matchesFQN(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getFQN().toLowerCase().contains(searchTerm);- }-public RefUpdate updateRef(String refName) {try {return getRepository().updateRef(refName);@@ -839,16 +785,6 @@ public class Depot extends AbstractEntity implements AccountBelonging {}}- @Override- public int compareTo(AbstractEntity entity) {- Depot depot = (Depot) entity;- if (getAccount().equals(depot.getAccount())) {- return getName().compareTo(depot.getName());- } else {- return getAccount().compareTo(depot.getAccount());- }- }-public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {Repository repository = getRepository();try (RevWalk revWalk = new RevWalk(repository)) {@@ -876,11 +812,11 @@ public class Depot extends AbstractEntity implements AccountBelonging {}}- public static int compareLastVisit(Depot depot1, Depot depot2) {- Account user = SecurityUtils.getAccount();+ public static int compareLastVisit(Project project1, Project project2) {+ User user = SecurityUtils.getUser();if (user != null) {- Date date1 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot1);- Date date2 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot2);+ Date date1 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, project1);+ Date date2 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, project2);if (date1 != null) {if (date2 != null)return date2.compareTo(date1);@@ -890,10 +826,10 @@ public class Depot extends AbstractEntity implements AccountBelonging {if (date2 != null)return 1;else- return depot1.compareTo(depot2);+ return project1.compareTo(project2);}} else {- return depot1.compareTo(depot2);+ return project1.compareTo(project2);}}@@ -933,5 +869,25 @@ public class Depot extends AbstractEntity implements AccountBelonging {}return null;}++ public Collection<Group> getAuthorizedGroups() {+ if (authorizedGroups == null) {+ authorizedGroups = new HashSet<>();+ for (GroupAuthorization authorization: getGroupAuthorizations()) {+ authorizedGroups.add(authorization.getGroup());+ }+ }+ return authorizedGroups;+ }++ public Collection<User> getAuthorizedUsers() {+ if (authorizedUsers == null) {+ authorizedUsers = new HashSet<>();+ for (UserAuthorization authorization: getUserAuthorizations()) {+ authorizedUsers.add(authorization.getUser());+ }+ }+ return authorizedUsers;+ }}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.javaindex 552ed60dbf..2380a39246 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java@@ -44,12 +44,12 @@ import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.support.CloseInfo;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;+import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.util.ReviewStatus;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.util.editable.EditableUtils;@@ -67,9 +67,9 @@ import com.google.common.base.Preconditions;indexes={@Index(columnList="title"), @Index(columnList="uuid"),@Index(columnList="numberStr"), @Index(columnList="noSpaceTitle"),- @Index(columnList="number"), @Index(columnList="g_targetDepot_id"),- @Index(columnList="g_sourceDepot_id"), @Index(columnList="g_submitter_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_targetDepot_id", "number"})})+ @Index(columnList="number"), @Index(columnList="g_targetProject_id"),+ @Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_targetProject_id", "number"})})public class PullRequest extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -90,19 +90,19 @@ public class PullRequest extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account submitter;+ private User submitter;private String submitterName;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Depot targetDepot;+ private Project targetProject;@Column(nullable=false)private String targetBranch;@ManyToOne(fetch=FetchType.LAZY)- private Depot sourceDepot;+ private Project sourceProject;@Column(nullable=false)private String sourceBranch;@@ -214,11 +214,11 @@ public class PullRequest extends AbstractEntity {* the user submitting the pull request*/@Nullable- public Account getSubmitter() {+ public User getSubmitter() {return submitter;}- public void setSubmitter(Account submitter) {+ public void setSubmitter(User submitter) {this.submitter = submitter;}@@ -231,26 +231,26 @@ public class PullRequest extends AbstractEntity {this.submitterName = submitterName;}- public Depot getTargetDepot() {- return targetDepot;+ public Project getTargetProject() {+ return targetProject;}- public DepotAndBranch getTarget() {- return new DepotAndBranch(getTargetDepot(), getTargetBranch());+ public ProjectAndBranch getTarget() {+ return new ProjectAndBranch(getTargetProject(), getTargetBranch());}- public void setTarget(DepotAndBranch target) {- setTargetDepot(target.getDepot());+ public void setTarget(ProjectAndBranch target) {+ setTargetProject(target.getProject());setTargetBranch(target.getBranch());}- public void setSource(DepotAndBranch source) {- setSourceDepot(source.getDepot());+ public void setSource(ProjectAndBranch source) {+ setSourceProject(source.getProject());setSourceBranch(source.getBranch());}- public void setTargetDepot(Depot targetDepot) {- this.targetDepot = targetDepot;+ public void setTargetProject(Project targetProject) {+ this.targetProject = targetProject;}public String getTargetBranch() {@@ -262,12 +262,12 @@ public class PullRequest extends AbstractEntity {}@Nullable- public Depot getSourceDepot() {- return sourceDepot;+ public Project getSourceProject() {+ return sourceProject;}- public void setSourceDepot(Depot sourceDepot) {- this.sourceDepot = sourceDepot;+ public void setSourceProject(Project sourceProject) {+ this.sourceProject = sourceProject;}public String getSourceBranch() {@@ -279,10 +279,10 @@ public class PullRequest extends AbstractEntity {}@Nullable- public DepotAndBranch getSource() {- Depot sourceDepot = getSourceDepot();- if (sourceDepot != null)- return new DepotAndBranch(sourceDepot, getSourceBranch());+ public ProjectAndBranch getSource() {+ Project sourceProject = getSourceProject();+ if (sourceProject != null)+ return new ProjectAndBranch(sourceProject, getSourceBranch());elsereturn null;}@@ -295,11 +295,11 @@ public class PullRequest extends AbstractEntity {return GitUtils.branch2ref(getSourceBranch());}- public Depot getWorkDepot() {+ public Project getWorkProject() {if (isNew())- return getSourceDepot();+ return getSourceProject();else- return getTargetDepot();+ return getTargetProject();}public String getBaseCommitHash() {@@ -315,11 +315,11 @@ public class PullRequest extends AbstractEntity {}public RevCommit getBaseCommit() {- return getTargetDepot().getRevCommit(ObjectId.fromString(getBaseCommitHash()));+ return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()));}public RevCommit getHeadCommit() {- return getTargetDepot().getRevCommit(ObjectId.fromString(getHeadCommitHash()));+ return getTargetProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()));}/**@@ -515,9 +515,9 @@ public class PullRequest extends AbstractEntity {* Delete refs of this pull request, without touching refs of its updates.*/public void deleteRefs() {- GitUtils.deleteRef(getTargetDepot().updateRef(getBaseRef()));- GitUtils.deleteRef(getTargetDepot().updateRef(getMergeRef()));- GitUtils.deleteRef(getTargetDepot().updateRef(getHeadRef()));+ GitUtils.deleteRef(getTargetProject().updateRef(getBaseRef()));+ GitUtils.deleteRef(getTargetProject().updateRef(getMergeRef()));+ GitUtils.deleteRef(getTargetProject().updateRef(getHeadRef()));}public static class CriterionHelper {@@ -529,27 +529,27 @@ public class PullRequest extends AbstractEntity {return Restrictions.isNotNull("closeInfo");}- public static Criterion ofTarget(DepotAndBranch target) {+ public static Criterion ofTarget(ProjectAndBranch target) {return Restrictions.and(- Restrictions.eq("targetDepot", target.getDepot()),+ Restrictions.eq("targetProject", target.getProject()),Restrictions.eq("targetBranch", target.getBranch()));}- public static Criterion ofTargetDepot(Depot target) {- return Restrictions.eq("targetDepot", target);+ public static Criterion ofTargetProject(Project target) {+ return Restrictions.eq("targetProject", target);}- public static Criterion ofSource(DepotAndBranch source) {+ public static Criterion ofSource(ProjectAndBranch source) {return Restrictions.and(- Restrictions.eq("sourceDepot", source.getDepot()),+ Restrictions.eq("sourceProject", source.getProject()),Restrictions.eq("sourceBranch", source.getBranch()));}- public static Criterion ofSourceDepot(Depot source) {- return Restrictions.eq("sourceDepot", source);+ public static Criterion ofSourceProject(Project source) {+ return Restrictions.eq("sourceProject", source);}- public static Criterion ofSubmitter(Account submitter) {+ public static Criterion ofSubmitter(User submitter) {return Restrictions.eq("submitter", submitter);}@@ -572,8 +572,8 @@ public class PullRequest extends AbstractEntity {public Collection<RevCommit> getPendingCommits() {if (pendingCommits == null) {pendingCommits = new HashSet<>();- Depot depot = getTargetDepot();- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {+ Project project = getTargetProject();+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash())));revWalk.markUninteresting(revWalk.parseCommit(getTarget().getObjectId()));revWalk.forEach(c->pendingCommits.add(c));@@ -593,8 +593,8 @@ public class PullRequest extends AbstractEntity {public Collection<RevCommit> getMergedCommits() {if (mergedCommits == null) {mergedCommits = new HashSet<>();- Depot depot = getTargetDepot();- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {+ Project project = getTargetProject();+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {revWalk.markStart(revWalk.parseCommit(getTarget().getObjectId(false)));revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash())));revWalk.forEach(c->mergedCommits.add(c));@@ -614,7 +614,7 @@ public class PullRequest extends AbstractEntity {}@Nullable- public PullRequestWatch getWatch(Account user) {+ public PullRequestWatch getWatch(User user) {for (PullRequestWatch watch: getWatches()) {if (watch.getUser().equals(user))return watch;@@ -682,7 +682,7 @@ public class PullRequest extends AbstractEntity {}public boolean isVisitedAfter(Date date) {- Account user = SecurityUtils.getAccount();+ User user = SecurityUtils.getUser();if (user != null) {Date visitDate = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();@@ -701,7 +701,7 @@ public class PullRequest extends AbstractEntity {public boolean isMergeIntoTarget() {if (mergedIntoTarget == null) {- mergedIntoTarget = GitUtils.isMergedInto(getTargetDepot().getRepository(), ObjectId.fromString(getHeadCommitHash()),+ mergedIntoTarget = GitUtils.isMergedInto(getTargetProject().getRepository(), ObjectId.fromString(getHeadCommitHash()),getTarget().getObjectId());}return mergedIntoTarget;@@ -726,22 +726,22 @@ public class PullRequest extends AbstractEntity {@Nullablepublic ObjectId getSourceHead() {- DepotAndBranch depotAndBranch = getSource();- if (depotAndBranch != null)- return depotAndBranch.getObjectId(false);+ ProjectAndBranch projectAndBranch = getSource();+ if (projectAndBranch != null)+ return projectAndBranch.getObjectId(false);elsereturn null;}- public List<Account> getRemainingReviewers() {+ public List<User> getRemainingReviewers() {ReviewStatus checkStatus = getReviewStatus();- Collection<Account> users = SecurityUtils.findUsersCan(getTargetDepot(), DepotPrivilege.READ);+ Collection<User> users = SecurityUtils.findUsersCan(getTargetProject(), ProjectPrivilege.READ);users.removeAll(checkStatus.getAwaitingReviewers());for (Review review: checkStatus.getEffectiveReviews().values())users.remove(review.getUser());- users.remove(SecurityUtils.getAccount());- List<Account> userList = new ArrayList<>(users);- userList.sort(Comparator.comparing(Account::getName));+ users.remove(SecurityUtils.getUser());+ List<User> userList = new ArrayList<>(users);+ userList.sort(Comparator.comparing(User::getName));return userList;}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestComment.java b/core/src/main/java/com/gitplex/server/model/PullRequestComment.javaindex 82153042b6..8bf1a60485 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestComment.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestComment.java@@ -37,7 +37,7 @@ public class PullRequestComment extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account user;+ private User user;private String userName;@@ -57,11 +57,11 @@ public class PullRequestComment extends AbstractEntity {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(@Nullable Account user) {+ public void setUser(@Nullable User user) {this.user = user;}@@ -90,8 +90,8 @@ public class PullRequestComment extends AbstractEntity {return date;}- public Depot getDepot() {- return request.getTargetDepot();+ public Project getProject() {+ return request.getTargetProject();}public String getAnchor() {diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestReference.java b/core/src/main/java/com/gitplex/server/model/PullRequestReference.javaindex 825d60d07c..fc467f3bb2 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestReference.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestReference.java@@ -39,7 +39,7 @@ public class PullRequestReference extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account user;+ private User user;private String userName;@@ -68,11 +68,11 @@ public class PullRequestReference extends AbstractEntity {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.java b/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.javaindex 7c20fc3055..582c0a064e 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestStatusChange.java@@ -66,7 +66,7 @@ public class PullRequestStatusChange extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account user;+ private User user;private String userName;@@ -100,11 +100,11 @@ public class PullRequestStatusChange extends AbstractEntity {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestTask.java b/core/src/main/java/com/gitplex/server/model/PullRequestTask.javaindex e1dc953e2d..b43335d1ee 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestTask.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestTask.java@@ -43,7 +43,7 @@ public class PullRequestTask extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;@Column(nullable=false)private Type type;@@ -59,11 +59,11 @@ public class PullRequestTask extends AbstractEntity {this.request = request;}- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.javaindex a9fc50b625..fb16d19663 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java@@ -98,7 +98,7 @@ public class PullRequestUpdate extends AbstractEntity {}public void deleteRefs() {- GitUtils.deleteRef(getRequest().getTargetDepot().updateRef(getHeadRef()));+ GitUtils.deleteRef(getRequest().getTargetProject().updateRef(getHeadRef()));}/**@@ -110,7 +110,7 @@ public class PullRequestUpdate extends AbstractEntity {if (changedFiles == null) {changedFiles = new HashSet<>();- Repository repository = getRequest().getWorkDepot().getRepository();+ Repository repository = getRequest().getWorkProject().getRepository();try ( RevWalk revWalk = new RevWalk(repository);TreeWalk treeWalk = new TreeWalk(repository)) {RevCommit mergeBaseCommit = revWalk.parseCommit(ObjectId.fromString(getMergeBaseCommitHash()));@@ -222,7 +222,7 @@ public class PullRequestUpdate extends AbstractEntity {if (commits == null) {commits = new ArrayList<>();- try (RevWalk revWalk = new RevWalk(getRequest().getWorkDepot().getRepository())) {+ try (RevWalk revWalk = new RevWalk(getRequest().getWorkProject().getRepository())) {revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash())));revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash())));@@ -245,7 +245,7 @@ public class PullRequestUpdate extends AbstractEntity {}public RevCommit getHeadCommit() {- return request.getWorkDepot().getRevCommit(ObjectId.fromString(getHeadCommitHash()));+ return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()));}}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestWatch.java b/core/src/main/java/com/gitplex/server/model/PullRequestWatch.javaindex b55a1ad8d1..10fbb5849b 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequestWatch.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequestWatch.java@@ -24,7 +24,7 @@ public class PullRequestWatch extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;private String reason;@@ -38,11 +38,11 @@ public class PullRequestWatch extends AbstractEntity {this.request = request;}- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/Review.java b/core/src/main/java/com/gitplex/server/model/Review.javaindex 29a9daa711..7a818720a0 100644--- a/core/src/main/java/com/gitplex/server/model/Review.java+++ b/core/src/main/java/com/gitplex/server/model/Review.java@@ -25,7 +25,7 @@ public class Review extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;@Column(nullable=false)private String commit;@@ -52,11 +52,11 @@ public class Review extends AbstractEntity {this.commit = commit;}- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java b/core/src/main/java/com/gitplex/server/model/ReviewInvitation.javaindex c013f20b64..6d4f072382 100644--- a/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java+++ b/core/src/main/java/com/gitplex/server/model/ReviewInvitation.java@@ -23,7 +23,7 @@ public class ReviewInvitation extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@@ -33,11 +33,11 @@ public class ReviewInvitation extends AbstractEntity {private Date date = new Date();- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/Team.java b/core/src/main/java/com/gitplex/server/model/Team.javadeleted file mode 100644index 61aed91742..0000000000--- a/core/src/main/java/com/gitplex/server/model/Team.java+++ /dev/null@@ -1,124 +0,0 @@-package com.gitplex.server.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;--import com.gitplex.server.util.editable.annotation.Editable;-import com.gitplex.server.util.editable.annotation.Markdown;-import com.gitplex.server.util.validation.annotation.DepotName;--@Entity-@Table(- indexes={@Index(columnList="g_organization_id"), @Index(columnList="name")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_organization_id", "name"})})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@Editable-public class Team extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Account organization;-- @Column(nullable=false)- private String name;-- private String description;-- @OneToMany(mappedBy="team", cascade=CascadeType.REMOVE)- private Collection<TeamAuthorization> authorizations = new ArrayList<>();-- @OneToMany(mappedBy="team", cascade=CascadeType.REMOVE)- private Collection<TeamMembership> memberships = new ArrayList<>();-- private transient Collection<Account> members;-- public Account getOrganization() {- return organization;- }-- public void setOrganization(Account organization) {- this.organization = organization;- }-- @Editable(order=100)- @DepotName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=200, description="Optionally describe the team")- @Markdown- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-- public Collection<TeamAuthorization> getAuthorizations() {- return authorizations;- }-- public void setAuthorizations(Collection<TeamAuthorization> authorizations) {- this.authorizations = authorizations;- }-- public Collection<TeamMembership> getMemberships() {- return memberships;- }-- public void setMemberships(Collection<TeamMembership> memberships) {- this.memberships = memberships;- }-- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getName().toLowerCase().contains(searchTerm);- }-- public Collection<Account> getMembers() {- if (members == null) {- members = new HashSet<>();- for (TeamMembership membership: getMemberships()) {- members.add(membership.getUser());- }- }- return members;- }-- @Override- public int compareTo(AbstractEntity entity) {- Team team = (Team) entity;- return getName().compareTo(team.getName());- }--}diff --git a/core/src/main/java/com/gitplex/server/model/TeamAuthorization.java b/core/src/main/java/com/gitplex/server/model/TeamAuthorization.javadeleted file mode 100644index b2db345a04..0000000000--- a/core/src/main/java/com/gitplex/server/model/TeamAuthorization.java+++ /dev/null@@ -1,58 +0,0 @@-package com.gitplex.server.model;--import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import com.gitplex.server.security.privilege.DepotPrivilege;--@Entity-@Table(- indexes={@Index(columnList="g_team_id"), @Index(columnList="g_depot_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_team_id", "g_depot_id"})-})-public class TeamAuthorization extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Depot depot;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Team team;-- @Column(nullable=false)- private DepotPrivilege privilege = DepotPrivilege.READ;-- public Depot getDepot() {- return depot;- }-- public void setDepot(Depot depot) {- this.depot = depot;- }-- public Team getTeam() {- return team;- }-- public void setTeam(Team team) {- this.team = team;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- public void setPrivilege(DepotPrivilege privilege) {- this.privilege = privilege;- }--}diff --git a/core/src/main/java/com/gitplex/server/model/User.java b/core/src/main/java/com/gitplex/server/model/User.javanew file mode 100644index 0000000000..78e7eaa231--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/User.java@@ -0,0 +1,308 @@+package com.gitplex.server.model;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.UUID;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.Version;++import org.apache.shiro.SecurityUtils;+import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.shiro.subject.SimplePrincipalCollection;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.web.mgt.WebSecurityManager;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.Email;+import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.launcher.loader.AppLoader;+import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.Password;+import com.gitplex.server.util.validation.annotation.UserName;+import com.google.common.base.Objects;+import com.google.common.base.Preconditions;++@Entity+@Table(indexes={+ @Index(columnList="email"), @Index(columnList="fullName"),+ @Index(columnList="noSpaceName"), @Index(columnList="noSpaceFullName")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class User extends AbstractEntity implements AuthenticationInfo {++ private static final long serialVersionUID = 1L;++ public static final Long ROOT_ID = 1L;++ @Column(unique=true, nullable=false)+ private String name;++ @Column(length=1024)+ private String password;++ private String fullName;++ @Column(unique=true)+ private String email;++ @Column(nullable=false)+ private String noSpaceName;++ private String noSpaceFullName;++ @Column(nullable=false)+ private String uuid = UUID.randomUUID().toString();++ /*+ * Optimistic lock is necessary to ensure database integrity when update+ * branch and tag protection settings upon user renaming/deletion+ */+ @Version+ private long version;++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<Membership> memberships = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> authorizations = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<Review> reviews = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<BranchWatch> branchWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestWatch> requestWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestTask> requestTasks = new ArrayList<>();++ private transient Collection<Project> authorizedProjects;++ private transient Collection<Group> groups;++ @Override+ public PrincipalCollection getPrincipals() {+ return new SimplePrincipalCollection(getId(), "");+ }++ @Override+ public Object getCredentials() {+ return password;+ }++ public Subject asSubject() {+ return asSubject(getId());+ }++ public static Long getCurrentId() {+ Object principal = SecurityUtils.getSubject().getPrincipal();+ Preconditions.checkNotNull(principal);+ return (Long) principal;+ }++ public static PrincipalCollection asPrincipal(Long userId) {+ return new SimplePrincipalCollection(userId, "");+ }++ public static Subject asSubject(Long userId) {+ WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);+ return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();+ }++ @Editable(name="User Name", order=100)+ @UserName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ noSpaceName = StringUtils.deleteWhitespace(name);+ }++ @Editable(order=150, autocomplete="new-password")+ @Password(confirmative=true)+ @NotEmpty+ public String getPassword() {+ return password;+ }++ /**+ * Set password of this user.+ *+ * @param password+ * password to set+ */+ public void setPassword(String password) {+ if (password != null) {+ this.password = password;+ } else {+ this.password = null;+ }+ }++ @Editable(order=200)+ public String getFullName() {+ return fullName;+ }++ public void setFullName(String fullName) {+ this.fullName = fullName;+ noSpaceFullName = StringUtils.deleteWhitespace(fullName);+ }++ @Editable(order=300)+ @NotEmpty+ public String getEmail() {+ return email;+ }++ public void setEmail(String email) {+ this.email = email;+ }++ public Collection<Membership> getMemberships() {+ return memberships;+ }++ public void setGroups(Collection<Membership> memberships) {+ this.memberships = memberships;+ }++ public Collection<PullRequestTask> getRequestTasks() {+ return requestTasks;+ }++ public void setRequestTasks(Collection<PullRequestTask> requestTasks) {+ this.requestTasks = requestTasks;+ }++ @Nullable+ public Review getReviewAfter(PullRequestUpdate update) {+ for (Review review: update.getRequest().getReviews()) {+ if (review.getUser().equals(this) && review.getUpdate() != null+ && review.getUpdate().getId()>=update.getId()) {+ return review;+ }+ }+ return null;+ }++ @Override+ public String toString() {+ return Objects.toStringHelper(this)+ .add("name", getName())+ .toString();+ }++ public PersonIdent asPerson() {+ return new PersonIdent(getName(), getEmail());+ }++ public String getDisplayName() {+ if (getFullName() != null)+ return getFullName();+ else+ return getName();+ }++ public boolean matches(@Nullable String searchTerm) {+ if (searchTerm == null)+ searchTerm = "";+ else+ searchTerm = searchTerm.toLowerCase().trim();++ return getName().toLowerCase().contains(searchTerm)+ || fullName!=null && fullName.toLowerCase().contains(searchTerm);+ }++ public boolean isRoot() {+ return ROOT_ID.equals(getId());+ }++ public String getNoSpaceName() {+ return noSpaceName;+ }++ public String getNoSpaceFullName() {+ return noSpaceFullName;+ }++ public long getVersion() {+ return version;+ }++ public Collection<UserAuthorization> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizedProjects(Collection<UserAuthorization> authorizations) {+ this.authorizations = authorizations;+ }++ public String getUUID() {+ return uuid;+ }++ public void setUUID(String uuid) {+ this.uuid = uuid;+ }++ @Override+ public int compareTo(AbstractEntity entity) {+ User user = (User) entity;+ if (getDisplayName().equals(user.getDisplayName())) {+ return getId().compareTo(entity.getId());+ } else {+ return getDisplayName().compareTo(user.getDisplayName());+ }+ }++ public static User getForDisplay(@Nullable User user, @Nullable String userName) {+ if (user == null && userName != null) {+ user = new User();+ user.setName(userName);+ }+ return user;+ }++ public Collection<Project> getAuthorizedProjects() {+ if (authorizedProjects == null) {+ authorizedProjects = new HashSet<>();+ for (UserAuthorization authorization: getAuthorizations()) {+ authorizedProjects.add(authorization.getProject());+ }+ }+ return authorizedProjects;+ }++ public Collection<Group> getGroups() {+ if (groups == null) {+ groups = new HashSet<>();+ for (Membership membership: getMemberships()) {+ groups.add(membership.getGroup());+ }+ }+ return groups;+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/UserAuthorization.java b/core/src/main/java/com/gitplex/server/model/UserAuthorization.javaindex 13e46841b1..3bf164fdf4 100644--- a/core/src/main/java/com/gitplex/server/model/UserAuthorization.java+++ b/core/src/main/java/com/gitplex/server/model/UserAuthorization.java@@ -9,12 +9,12 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.security.ProjectPrivilege;@Entity@Table(- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_depot_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_depot_id"})+ indexes={@Index(columnList="g_user_id"), @Index(columnList="g_project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_project_id"})})public class UserAuthorization extends AbstractEntity {@@ -22,36 +22,36 @@ public class UserAuthorization extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Depot depot;+ private Project project;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Account user;+ private User user;@Column(nullable=false)- private DepotPrivilege privilege = DepotPrivilege.READ;+ private ProjectPrivilege privilege = ProjectPrivilege.READ;- public Depot getDepot() {- return depot;+ public Project getProject() {+ return project;}- public void setDepot(Depot depot) {- this.depot = depot;+ public void setProject(Project project) {+ this.project = project;}- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}- public DepotPrivilege getPrivilege() {+ public ProjectPrivilege getPrivilege() {return privilege;}- public void setPrivilege(DepotPrivilege privilege) {+ public void setPrivilege(ProjectPrivilege privilege) {this.privilege = privilege;}diff --git a/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java b/core/src/main/java/com/gitplex/server/model/support/BranchProtection.javaindex a146d6f990..1cca02dbe7 100644--- a/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java+++ b/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java@@ -12,9 +12,9 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.Team;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.Group;import com.gitplex.server.util.PathUtils;import com.gitplex.server.util.editable.annotation.BranchPattern;import com.gitplex.server.util.editable.annotation.Editable;@@ -100,56 +100,33 @@ public class BranchProtection implements Serializable {}@Nullable- public ReviewAppointment getReviewAppointment(Depot depot) {+ public ReviewAppointment getReviewAppointment(Project project) {if (reviewAppointmentOpt == null) {if (reviewAppointmentExpr != null)- reviewAppointmentOpt = Optional.of(new ReviewAppointment(depot, reviewAppointmentExpr));+ reviewAppointmentOpt = Optional.of(new ReviewAppointment(project, reviewAppointmentExpr));elsereviewAppointmentOpt = Optional.empty();}return reviewAppointmentOpt.orElse(null);}- public void onDepotTransferred(Depot depot) {- ReviewAppointment reviewAppointment = getReviewAppointment(depot);+ public void onGroupRename(Project project, String oldName, String newName) {+ ReviewAppointment reviewAppointment = getReviewAppointment(project);if (reviewAppointment != null) {- reviewAppointment.getTeams().clear();- setReviewAppointmentExpr(reviewAppointment.toExpr());- }-- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {- FileProtection fileProtection = it.next();- reviewAppointment = fileProtection.getReviewAppointment(depot);- if (reviewAppointment != null) {- reviewAppointment.getTeams().clear();- String reviewAppointmentExpr = reviewAppointment.toExpr();- if (reviewAppointmentExpr != null)- fileProtection.setReviewAppointmentExpr(reviewAppointmentExpr);- else- it.remove();- } else {- it.remove();- }- }- }-- public void onTeamRename(Depot depot, String oldName, String newName) {- ReviewAppointment reviewAppointment = getReviewAppointment(depot);- if (reviewAppointment != null) {- for (Team team: reviewAppointment.getTeams().keySet()) {- if (team.getName().equals(oldName))- team.setName(newName);+ for (Group group: reviewAppointment.getGroups().keySet()) {+ if (group.getName().equals(oldName))+ group.setName(newName);}setReviewAppointmentExpr(reviewAppointment.toExpr());}for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection fileProtection = it.next();- reviewAppointment = fileProtection.getReviewAppointment(depot);+ reviewAppointment = fileProtection.getReviewAppointment(project);if (reviewAppointment != null) {- for (Team team: reviewAppointment.getTeams().keySet()) {- if (team.getName().equals(oldName))- team.setName(newName);+ for (Group group: reviewAppointment.getGroups().keySet()) {+ if (group.getName().equals(oldName))+ group.setName(newName);}fileProtection.setReviewAppointmentExpr(reviewAppointment.toExpr());} else {@@ -158,13 +135,13 @@ public class BranchProtection implements Serializable {}}- public void onTeamDelete(Depot depot, String teamName) {- ReviewAppointment reviewAppointment = getReviewAppointment(depot);+ public void onGroupDelete(Project project, String groupName) {+ ReviewAppointment reviewAppointment = getReviewAppointment(project);if (reviewAppointment != null) {- for (Iterator<Map.Entry<Team, Integer>> it = reviewAppointment.getTeams().entrySet().iterator();+ for (Iterator<Map.Entry<Group, Integer>> it = reviewAppointment.getGroups().entrySet().iterator();it.hasNext();) {- Team team = it.next().getKey();- if (team.getName().equals(teamName))+ Group group = it.next().getKey();+ if (group.getName().equals(groupName))it.remove();}setReviewAppointmentExpr(reviewAppointment.toExpr());@@ -172,13 +149,13 @@ public class BranchProtection implements Serializable {for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection fileProtection = it.next();- reviewAppointment = fileProtection.getReviewAppointment(depot);+ reviewAppointment = fileProtection.getReviewAppointment(project);if (reviewAppointment != null) {- for (Iterator<Map.Entry<Team, Integer>> itTeam = reviewAppointment.getTeams().entrySet().iterator();- itTeam.hasNext();) {- Team team = itTeam.next().getKey();- if (team.getName().equals(teamName))- itTeam.remove();+ for (Iterator<Map.Entry<Group, Integer>> itGroup = reviewAppointment.getGroups().entrySet().iterator();+ itGroup.hasNext();) {+ Group group = itGroup.next().getKey();+ if (group.getName().equals(groupName))+ itGroup.remove();}String reviewAppointmentExpr = reviewAppointment.toExpr();if (reviewAppointmentExpr != null)@@ -191,10 +168,10 @@ public class BranchProtection implements Serializable {}}- public void onAccountRename(Depot depot, String oldName, String newName) {- ReviewAppointment reviewAppointment = getReviewAppointment(depot);+ public void onUserRename(Project project, String oldName, String newName) {+ ReviewAppointment reviewAppointment = getReviewAppointment(project);if (reviewAppointment != null) {- for (Account user: reviewAppointment.getUsers()) {+ for (User user: reviewAppointment.getUsers()) {if (user.getName().equals(oldName))user.setName(newName);}@@ -203,9 +180,9 @@ public class BranchProtection implements Serializable {for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection fileProtection = it.next();- reviewAppointment = fileProtection.getReviewAppointment(depot);+ reviewAppointment = fileProtection.getReviewAppointment(project);if (reviewAppointment != null) {- for (Account user: reviewAppointment.getUsers()) {+ for (User user: reviewAppointment.getUsers()) {if (user.getName().equals(oldName))user.setName(newName);}@@ -216,12 +193,12 @@ public class BranchProtection implements Serializable {}}- public void onAccountDelete(Depot depot, String accountName) {- ReviewAppointment reviewAppointment = getReviewAppointment(depot);+ public void onUserDelete(Project project, String userName) {+ ReviewAppointment reviewAppointment = getReviewAppointment(project);if (reviewAppointment != null) {- for (Iterator<Account> it = reviewAppointment.getUsers().iterator(); it.hasNext();) {- Account user = it.next();- if (user.getName().equals(accountName))+ for (Iterator<User> it = reviewAppointment.getUsers().iterator(); it.hasNext();) {+ User user = it.next();+ if (user.getName().equals(userName))it.remove();}setReviewAppointmentExpr(reviewAppointment.toExpr());@@ -229,11 +206,11 @@ public class BranchProtection implements Serializable {for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection fileProtection = it.next();- reviewAppointment = fileProtection.getReviewAppointment(depot);+ reviewAppointment = fileProtection.getReviewAppointment(project);if (reviewAppointment != null) {- for (Iterator<Account> itUser = reviewAppointment.getUsers().iterator(); itUser.hasNext();) {- Account user = itUser.next();- if (user.getName().equals(accountName))+ for (Iterator<User> itUser = reviewAppointment.getUsers().iterator(); itUser.hasNext();) {+ User user = itUser.next();+ if (user.getName().equals(userName))itUser.remove();}String reviewAppointmentExpr = reviewAppointment.toExpr();diff --git a/core/src/main/java/com/gitplex/server/model/support/CloseInfo.java b/core/src/main/java/com/gitplex/server/model/support/CloseInfo.javaindex 42d8de7ae5..cc17f96f58 100644--- a/core/src/main/java/com/gitplex/server/model/support/CloseInfo.java+++ b/core/src/main/java/com/gitplex/server/model/support/CloseInfo.java@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;import org.hibernate.annotations.OptimisticLock;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;@Embeddablepublic class CloseInfo implements Serializable {@@ -20,7 +20,7 @@ public class CloseInfo implements Serializable {@OptimisticLock(excluded=true)@ManyToOne(fetch=FetchType.LAZY)- private Account closedBy;+ private User closedBy;@OptimisticLock(excluded=true)private String closedByName;@@ -31,11 +31,11 @@ public class CloseInfo implements Serializable {@OptimisticLock(excluded=true)private Status closeStatus;- public Account getClosedBy() {+ public User getClosedBy() {return closedBy;}- public void setClosedBy(Account closedBy) {+ public void setClosedBy(User closedBy) {this.closedBy = closedBy;}diff --git a/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.javaindex 5545c73140..529bd36788 100644--- a/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java+++ b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java@@ -11,7 +11,7 @@ import javax.persistence.MappedSuperclass;import javax.persistence.Version;import com.gitplex.server.model.AbstractEntity;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;@MappedSuperclass@@ -25,7 +25,7 @@ public abstract class CodeCommentActivity extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn- private Account user;+ private User user;private String userName;@@ -44,11 +44,11 @@ public abstract class CodeCommentActivity extends AbstractEntity {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.java b/core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.javadeleted file mode 100644index dc02f40ed6..0000000000--- a/core/src/main/java/com/gitplex/server/model/support/DepotAndBranch.java+++ /dev/null@@ -1,32 +0,0 @@-package com.gitplex.server.model.support;--import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;--public class DepotAndBranch extends DepotAndRevision {-- private static final long serialVersionUID = 1L;-- public DepotAndBranch(Long depotId, String branch) {- super(depotId, branch);- }-- public DepotAndBranch(Depot depot, String branch) {- super(depot, branch);- }-- public DepotAndBranch(String depotAndBranch) {- super(depotAndBranch);- }-- @Override- public String getBranch() {- return getRevision();- }-- @Override- protected String normalizeRevision() {- return GitUtils.branch2ref(getBranch());- }--}diff --git a/core/src/main/java/com/gitplex/server/model/support/FileProtection.java b/core/src/main/java/com/gitplex/server/model/support/FileProtection.javaindex 11268321c2..9706910992 100644--- a/core/src/main/java/com/gitplex/server/model/support/FileProtection.java+++ b/core/src/main/java/com/gitplex/server/model/support/FileProtection.java@@ -4,7 +4,7 @@ import java.io.Serializable;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.PathPattern;import com.gitplex.server.util.reviewappointment.ReviewAppointment;@@ -44,9 +44,9 @@ public class FileProtection implements Serializable {this.reviewAppointmentExpr = reviewAppointmentExpr;}- public ReviewAppointment getReviewAppointment(Depot depot) {+ public ReviewAppointment getReviewAppointment(Project project) {if (reviewAppointment == null)- reviewAppointment = new ReviewAppointment(depot, reviewAppointmentExpr);+ reviewAppointment = new ReviewAppointment(project, reviewAppointmentExpr);return reviewAppointment;}diff --git a/core/src/main/java/com/gitplex/server/model/support/LastEvent.java b/core/src/main/java/com/gitplex/server/model/support/LastEvent.javaindex f438f94df2..7c6aa284fe 100644--- a/core/src/main/java/com/gitplex/server/model/support/LastEvent.java+++ b/core/src/main/java/com/gitplex/server/model/support/LastEvent.java@@ -10,7 +10,7 @@ import javax.persistence.FetchType;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;@Embeddablepublic class LastEvent implements Serializable {@@ -19,7 +19,7 @@ public class LastEvent implements Serializable {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(name="LAST_EVENT_USER")- private Account user;+ private User user;@Column(name="LAST_EVENT_USER_NAME")private String userName;@@ -47,11 +47,11 @@ public class LastEvent implements Serializable {}@Nullable- public Account getUser() {+ public User getUser() {return user;}- public void setUser(Account user) {+ public void setUser(User user) {this.user = user;}diff --git a/core/src/main/java/com/gitplex/server/model/support/MergePreview.java b/core/src/main/java/com/gitplex/server/model/support/MergePreview.javaindex 7db5179c1c..a84af431d2 100644--- a/core/src/main/java/com/gitplex/server/model/support/MergePreview.java+++ b/core/src/main/java/com/gitplex/server/model/support/MergePreview.java@@ -80,7 +80,7 @@ public class MergePreview implements Serializable {if (getRequestHead().equals(request.getHeadCommitHash())&& getTargetHead().equals(request.getTarget().getObjectName())&& getMergeStrategy() == request.getMergeStrategy()- && (getMerged() == null || ObjectId.fromString(getMerged()).equals((request.getTargetDepot().getObjectId(request.getMergeRef(), false))))) {+ && (getMerged() == null || ObjectId.fromString(getMerged()).equals((request.getTargetProject().getObjectId(request.getMergeRef(), false))))) {return false;} else {return true;diff --git a/core/src/main/java/com/gitplex/server/model/support/ProjectAndBranch.java b/core/src/main/java/com/gitplex/server/model/support/ProjectAndBranch.javanew file mode 100644index 0000000000..85b47c5b57--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/support/ProjectAndBranch.java@@ -0,0 +1,32 @@+package com.gitplex.server.model.support;++import com.gitplex.server.git.GitUtils;+import com.gitplex.server.model.Project;++public class ProjectAndBranch extends ProjectAndRevision {++ private static final long serialVersionUID = 1L;++ public ProjectAndBranch(Long projectId, String branch) {+ super(projectId, branch);+ }++ public ProjectAndBranch(Project project, String branch) {+ super(project, branch);+ }++ public ProjectAndBranch(String projectAndBranch) {+ super(projectAndBranch);+ }++ @Override+ public String getBranch() {+ return getRevision();+ }++ @Override+ protected String normalizeRevision() {+ return GitUtils.branch2ref(getBranch());+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.java b/core/src/main/java/com/gitplex/server/model/support/ProjectAndRevision.javasimilarity index 55%rename from core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.javarename to core/src/main/java/com/gitplex/server/model/support/ProjectAndRevision.javaindex ecfde42c5f..aad5230a4c 100644--- a/core/src/main/java/com/gitplex/server/model/support/DepotAndRevision.java+++ b/core/src/main/java/com/gitplex/server/model/support/ProjectAndRevision.java@@ -13,36 +13,36 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;-public class DepotAndRevision implements Serializable {+public class ProjectAndRevision implements Serializable {private static final long serialVersionUID = 1L;public static final String SEPARATOR = ":";- private final Long depotId;+ private final Long projectId;private final String revision;- public DepotAndRevision(Long depotId, String revision) {- this.depotId = depotId;+ public ProjectAndRevision(Long projectId, String revision) {+ this.projectId = projectId;this.revision = revision;}- public DepotAndRevision(Depot depot, String revision) {- this.depotId = depot.getId();+ public ProjectAndRevision(Project project, String revision) {+ this.projectId = project.getId();this.revision = revision;}- public DepotAndRevision(String depotAndRevision) {- this(Long.valueOf(StringUtils.substringBefore(depotAndRevision, SEPARATOR)),- StringUtils.substringAfter(depotAndRevision, SEPARATOR));+ public ProjectAndRevision(String projectAndRevision) {+ this(Long.valueOf(StringUtils.substringBefore(projectAndRevision, SEPARATOR)),+ StringUtils.substringAfter(projectAndRevision, SEPARATOR));}- public Long getDepotId() {- return depotId;+ public Long getProjectId() {+ return projectId;}public String getRevision() {@@ -51,7 +51,7 @@ public class DepotAndRevision implements Serializable {@Nullablepublic String getBranch() {- Ref branchRef = getDepot().getBranchRef(getRevision());+ Ref branchRef = getProject().getBranchRef(getRevision());if (branchRef != null)return GitUtils.ref2branch(branchRef.getName());else@@ -60,7 +60,7 @@ public class DepotAndRevision implements Serializable {@Nullablepublic String getTag() {- Ref tagRef = getDepot().getTagRef(getRevision());+ Ref tagRef = getProject().getTagRef(getRevision());if (tagRef != null)return GitUtils.ref2tag(tagRef.getName());else@@ -69,7 +69,7 @@ public class DepotAndRevision implements Serializable {@Nullablepublic ObjectId getObjectId(boolean mustExist) {- return getDepot().getObjectId(normalizeRevision(), mustExist);+ return getProject().getObjectId(normalizeRevision(), mustExist);}public ObjectId getObjectId() {@@ -77,7 +77,7 @@ public class DepotAndRevision implements Serializable {}public RevCommit getCommit(boolean mustExist) {- return getDepot().getRevCommit(getObjectId(mustExist), mustExist);+ return getProject().getRevCommit(getObjectId(mustExist), mustExist);}public RevCommit getCommit() {@@ -94,19 +94,19 @@ public class DepotAndRevision implements Serializable {}public String getFQN() {- return getDepot().getFQN() + SEPARATOR + revision;+ return getProject().getName() + SEPARATOR + revision;}public boolean isDefault() {- return getRevision().equals(getDepot().getDefaultBranch());+ return getRevision().equals(getProject().getDefaultBranch());}public void delete() {- getDepot().deleteBranch(getRevision());+ getProject().deleteBranch(getRevision());}- public Depot getDepot() {- return GitPlex.getInstance(DepotManager.class).load(depotId);+ public Project getProject() {+ return GitPlex.getInstance(ProjectManager.class).load(projectId);}protected String normalizeRevision() {@@ -115,25 +115,25 @@ public class DepotAndRevision implements Serializable {@Overridepublic boolean equals(Object other) {- if (!(other instanceof DepotAndRevision))+ if (!(other instanceof ProjectAndRevision))return false;if (this == other)return true;- DepotAndRevision otherDepotAndRevision = (DepotAndRevision) other;+ ProjectAndRevision otherProjectAndRevision = (ProjectAndRevision) other;return new EqualsBuilder()- .append(depotId, otherDepotAndRevision.depotId)- .append(revision, otherDepotAndRevision.revision)+ .append(projectId, otherProjectAndRevision.projectId)+ .append(revision, otherProjectAndRevision.revision).isEquals();}@Overridepublic int hashCode() {- return new HashCodeBuilder(17, 37).append(depotId).append(revision).toHashCode();+ return new HashCodeBuilder(17, 37).append(projectId).append(revision).toHashCode();}@Overridepublic String toString() {- return depotId + SEPARATOR + revision;+ return projectId + SEPARATOR + revision;}}diff --git a/core/src/main/java/com/gitplex/server/model/support/TagProtection.java b/core/src/main/java/com/gitplex/server/model/support/TagProtection.javaindex 25813c43bf..960712c501 100644--- a/core/src/main/java/com/gitplex/server/model/support/TagProtection.java+++ b/core/src/main/java/com/gitplex/server/model/support/TagProtection.java@@ -6,9 +6,8 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.support.tagcreator.DepotWriters;-import com.gitplex.server.model.support.tagcreator.SpecifiedTeam;+import com.gitplex.server.model.support.tagcreator.ProjectWriters;+import com.gitplex.server.model.support.tagcreator.SpecifiedGroup;import com.gitplex.server.model.support.tagcreator.SpecifiedUser;import com.gitplex.server.model.support.tagcreator.TagCreator;import com.gitplex.server.util.editable.annotation.Editable;@@ -25,7 +24,7 @@ public class TagProtection implements Serializable {private boolean noDeletion = true;- private TagCreator tagCreator = new DepotWriters();+ private TagCreator tagCreator = new ProjectWriters();@Editable(order=100, description="Specify tag to be protected. Wildcard can be used to match multiple tags")@TagPattern@@ -66,28 +65,23 @@ public class TagProtection implements Serializable {this.tagCreator = tagCreator;}- public void onDepotTransferred(Depot depot) {- if (getTagCreator() instanceof SpecifiedTeam)- setTagCreator(new DepotWriters());- }-- public void onTeamRename(String oldName, String newName) {- if (getTagCreator() instanceof SpecifiedTeam) {- SpecifiedTeam specifiedTeam = (SpecifiedTeam) getTagCreator();- if (specifiedTeam.getTeamName().equals(oldName))- specifiedTeam.setTeamName(newName);+ public void onGroupRename(String oldName, String newName) {+ if (getTagCreator() instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getTagCreator();+ if (specifiedGroup.getGroupName().equals(oldName))+ specifiedGroup.setGroupName(newName);}}- public void onTeamDelete(String teamName) {- if (getTagCreator() instanceof SpecifiedTeam) {- SpecifiedTeam specifiedTeam = (SpecifiedTeam) getTagCreator();- if (specifiedTeam.getTeamName().equals(teamName))- setTagCreator(new DepotWriters());+ public void onGroupDelete(String groupName) {+ if (getTagCreator() instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getTagCreator();+ if (specifiedGroup.getGroupName().equals(groupName))+ setTagCreator(new ProjectWriters());}}- public void onAccountRename(String oldName, String newName) {+ public void onUserRename(String oldName, String newName) {if (getTagCreator() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getTagCreator();if (specifiedUser.getUserName().equals(oldName))@@ -95,11 +89,11 @@ public class TagProtection implements Serializable {}}- public void onAccountDelete(String accountName) {+ public void onUserDelete(String userName) {if (getTagCreator() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getTagCreator();- if (specifiedUser.getUserName().equals(accountName))- setTagCreator(new DepotWriters());+ if (specifiedUser.getUserName().equals(userName))+ setTagCreator(new ProjectWriters());}}diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javaindex d8b787522c..1bc7a9d333 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java@@ -11,7 +11,7 @@ public class SecuritySetting implements Serializable {private boolean enableSelfRegister = true;- @Editable(description="User can self-register accounts if this option is enabled")+ @Editable(description="User can self-register users if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;}diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.javaindex 729f6c690c..4944d74c47 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java@@ -45,7 +45,7 @@ public class SystemSetting implements Serializable, Validatable {this.serverUrl = serverUrl;}- @Editable(name="Storage Directory", order=100, description="Specify directory to store GitPlex data such as Git repositories.")+ @Editable(name="Storage Directory", order=100, description="Specify directory to store GitPlex data such as Git projects.")@Directory(absolute=true, outsideOfInstallDir=true, writeable=true)@NotEmptypublic String getStoragePath() {@@ -56,7 +56,7 @@ public class SystemSetting implements Serializable, Validatable {this.storagePath = storagePath;}- @Editable(order=200, description="GitPlex relies on git command line to manage repositories. The minimum "+ @Editable(order=200, description="GitPlex relies on git command line to manage projects. The minimum "+ "required version is 1.8.0.")@Valid@NotNulldiff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotAdministrators.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotAdministrators.javadeleted file mode 100644index a29321795d..0000000000--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotAdministrators.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.model.support.tagcreator;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.security.ObjectPermission;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable(order=200, name="Repository Administrators")-public class DepotAdministrators implements TagCreator {-- private static final long serialVersionUID = 1L;-- @Override- public String getNotMatchMessage(Depot depot, Account user) {- if (!user.asSubject().isPermitted(ObjectPermission.ofDepotAdmin(depot))) {- return "This operation can only be performed by repository administrators";- } else {- return null;- }- }--}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotWriters.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotWriters.javadeleted file mode 100644index 0513acfac1..0000000000--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/DepotWriters.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.model.support.tagcreator;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.security.ObjectPermission;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable(order=100, name="All Users Able to Write to the Repository")-public class DepotWriters implements TagCreator {-- private static final long serialVersionUID = 1L;-- @Override- public String getNotMatchMessage(Depot depot, Account user) {- if (!user.asSubject().isPermitted(ObjectPermission.ofDepotWrite(depot))) {- return "This operation can only be performed by repository writers";- } else {- return null;- }- }--}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.javanew file mode 100644index 0000000000..cbfec3bd0d--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.java@@ -0,0 +1,23 @@+package com.gitplex.server.model.support.tagcreator;++import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.permission.ProjectPermission;+import com.gitplex.server.util.editable.annotation.Editable;++@Editable(order=200, name="Repository Administrators")+public class ProjectAdministrators implements TagCreator {++ private static final long serialVersionUID = 1L;++ @Override+ public String getNotMatchMessage(Project project, User user) {+ if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN))) {+ return "This operation can only be performed by project administrators";+ } else {+ return null;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.javanew file mode 100644index 0000000000..d161732712--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.java@@ -0,0 +1,23 @@+package com.gitplex.server.model.support.tagcreator;++import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.permission.ProjectPermission;+import com.gitplex.server.util.editable.annotation.Editable;++@Editable(order=100, name="All Users Able to Write to the Repository")+public class ProjectWriters implements TagCreator {++ private static final long serialVersionUID = 1L;++ @Override+ public String getNotMatchMessage(Project project, User user) {+ if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE))) {+ return "This operation can only be performed by project writers";+ } else {+ return null;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedGroup.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedGroup.javanew file mode 100644index 0000000000..c62ddf34b1--- /dev/null+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedGroup.java@@ -0,0 +1,42 @@+package com.gitplex.server.model.support.tagcreator;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.Group;+import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.GroupChoice;+import com.google.common.base.Preconditions;++@Editable(order=300, name="Specified Group")+public class SpecifiedGroup implements TagCreator {++ private static final long serialVersionUID = 1L;++ private String groupName;++ @Editable(name="Group")+ @GroupChoice+ @NotEmpty+ public String getGroupName() {+ return groupName;+ }++ public void setGroupName(String groupName) {+ this.groupName = groupName;+ }++ @Override+ public String getNotMatchMessage(Project project, User user) {+ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ Group group = Preconditions.checkNotNull(groupManager.find(groupName));+ if (!group.getMembers().contains(user))+ return "This operation can only be performed by group: " + groupName;+ else+ return null;+ }++}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedTeam.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedTeam.javadeleted file mode 100644index c0a0f573e1..0000000000--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedTeam.java+++ /dev/null@@ -1,42 +0,0 @@-package com.gitplex.server.model.support.tagcreator;--import org.hibernate.validator.constraints.NotEmpty;--import com.gitplex.server.GitPlex;-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.util.editable.annotation.Editable;-import com.gitplex.server.util.editable.annotation.TeamChoice;-import com.google.common.base.Preconditions;--@Editable(order=300, name="Specified Team")-public class SpecifiedTeam implements TagCreator {-- private static final long serialVersionUID = 1L;-- private String teamName;-- @Editable(name="Team")- @TeamChoice- @NotEmpty- public String getTeamName() {- return teamName;- }-- public void setTeamName(String teamName) {- this.teamName = teamName;- }-- @Override- public String getNotMatchMessage(Depot depot, Account user) {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- Team team = Preconditions.checkNotNull(teamManager.find(depot.getAccount(), teamName));- if (!team.getMembers().contains(user))- return "This operation can only be performed by team: " + teamName;- else- return null;- }--}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.javaindex 2c72ecb5db..63a6e126a0 100644--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java@@ -3,10 +3,10 @@ package com.gitplex.server.model.support.tagcreator;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.util.editable.annotation.AccountChoice;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.editable.annotation.Editable;import com.google.common.base.Preconditions;@@ -18,7 +18,7 @@ public class SpecifiedUser implements TagCreator {private String userName;@Editable(name="User")- @AccountChoice(type=AccountChoice.Type.DEPOT_WRITER)+ @UserChoice(type=UserChoice.Type.DEPOT_WRITER)@NotEmptypublic String getUserName() {return userName;@@ -29,9 +29,9 @@ public class SpecifiedUser implements TagCreator {}@Override- public String getNotMatchMessage(Depot depot, Account user) {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account specifiedUser = Preconditions.checkNotNull(accountManager.findByName(userName));+ public String getNotMatchMessage(Project project, User user) {+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName));if (!specifiedUser.equals(user))return "This operation can only be performed by user: " + userName;elsediff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/TagCreator.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/TagCreator.javaindex afeee8e917..38814068da 100644--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/TagCreator.java+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/TagCreator.java@@ -4,14 +4,14 @@ import java.io.Serializable;import javax.annotation.Nullable;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.util.editable.annotation.Editable;@Editablepublic interface TagCreator extends Serializable {@Nullable- String getNotMatchMessage(Depot depot, Account user);+ String getNotMatchMessage(Project project, User user);}diff --git a/core/src/main/java/com/gitplex/server/security/ObjectPermission.java b/core/src/main/java/com/gitplex/server/security/ObjectPermission.javadeleted file mode 100644index d3bb6806eb..0000000000--- a/core/src/main/java/com/gitplex/server/security/ObjectPermission.java+++ /dev/null@@ -1,82 +0,0 @@-package com.gitplex.server.security;--import org.apache.shiro.authz.Permission;--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;-import com.gitplex.server.security.privilege.SystemAdmin;-import com.gitplex.server.security.protectedobject.ProtectedObject;-import com.gitplex.server.security.protectedobject.SystemObject;--/**- * This class represents permissions to operate an account and its belongings.- *- * @author robin- *- */-public class ObjectPermission implements Permission {-- private ProtectedObject object;-- private Privilege privilege;-- public ObjectPermission(ProtectedObject object, Privilege privilege) {- this.object = object;- this.privilege = privilege;- }-- public ProtectedObject getObject() {- return object;- }-- public Privilege getPrivilege() {- return privilege;- }-- public void setPrivilege(Privilege privilege) {- this.privilege = privilege;- }-- public void setObject(ProtectedObject object) {- this.object = object;- }-- @Override- public boolean implies(Permission permission) {- if (permission instanceof ObjectPermission) {- ObjectPermission objectPermission = (ObjectPermission) permission;- return getObject().has(objectPermission.getObject())- && getPrivilege().can(objectPermission.getPrivilege());- } else {- return false;- }- }-- public static ObjectPermission ofDepotAdmin(Depot depot) {- return new ObjectPermission(depot, DepotPrivilege.ADMIN);- }-- public static ObjectPermission ofDepotRead(Depot depot) {- return new ObjectPermission(depot, DepotPrivilege.READ);- }-- public static ObjectPermission ofDepotWrite(Depot depot) {- return new ObjectPermission(depot, DepotPrivilege.WRITE);- }-- public static ObjectPermission ofAccountAdmin(Account account) {- return new ObjectPermission(account, AccountPrivilege.ADMIN);- }-- public static ObjectPermission ofAccountAccess(Account account) {- return new ObjectPermission(account, AccountPrivilege.ACCESS);- }-- public static ObjectPermission ofSystemAdmin() {- return new ObjectPermission(new SystemObject(), new SystemAdmin());- }--}diff --git a/core/src/main/java/com/gitplex/server/security/ProjectPrivilege.java b/core/src/main/java/com/gitplex/server/security/ProjectPrivilege.javanew file mode 100644index 0000000000..d40580b80a--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/ProjectPrivilege.java@@ -0,0 +1,43 @@+package com.gitplex.server.security;++public enum ProjectPrivilege {++ READ("Read") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == READ;+ }++ },+ WRITE("Write") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return privilege == WRITE || READ.implies(privilege);+ }++ },+ ADMIN("Admin") {++ @Override+ public boolean implies(ProjectPrivilege privilege) {+ return true;+ }++ };++ public abstract boolean implies(ProjectPrivilege privilege);++ private final String displayName;++ ProjectPrivilege(String displayName) {+ this.displayName = displayName;+ }++ @Override+ public String toString() {+ return displayName;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/SecurityRealm.javaindex 99c5e35277..e2a2ccb474 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java@@ -3,7 +3,6 @@ package com.gitplex.server.security;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -20,47 +19,36 @@ import org.apache.shiro.realm.AuthorizingRealm;import org.apache.shiro.subject.PrincipalCollection;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.GitPlex;-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.manager.MembershipManager;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Membership;+import com.gitplex.server.model.User;import com.gitplex.server.model.UserAuthorization;-import com.gitplex.server.security.privilege.AccountPrivilege;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.security.permission.CreateProjects;+import com.gitplex.server.security.permission.ProjectPermission;+import com.gitplex.server.security.permission.PublicPermission;+import com.gitplex.server.security.permission.SystemAdministration;+import com.gitplex.server.security.permission.UserAdministration;@Singletonpublic class SecurityRealm extends AuthorizingRealm {- private final AccountManager accountManager;-- private final OrganizationMembershipManager organizationMembershipManager;-- private final TeamMembershipManager teamMembershipManager;+ private final UserManager userManager;@Inject- public SecurityRealm(AccountManager userManager,- OrganizationMembershipManager organizationMembershipManager,- TeamMembershipManager teamMembershipManager) {+ public SecurityRealm(UserManager userManager, MembershipManager groupMembershipManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);- this.accountManager = userManager;- this.organizationMembershipManager = organizationMembershipManager;- this.teamMembershipManager = teamMembershipManager;+ this.userManager = userManager;}@SuppressWarnings("serial")@Overrideprotected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {- final Long userId = (Long) principals.getPrimaryPrincipal();+ Long userId = (Long) principals.getPrimaryPrincipal();return new AuthorizationInfo() {@@ -76,127 +64,39 @@ public class SecurityRealm extends AuthorizingRealm {@Overridepublic Collection<Permission> getObjectPermissions() {- return permissionsOf(userId);+ Collection<Permission> permissions = new ArrayList<>();+ permissions.add(new PublicPermission());+ if (userId != 0L) {+ User user = userManager.get(userId);+ if (user != null) {+ if (user.isRoot())+ permissions.add(new SystemAdministration());+ permissions.add(new UserAdministration(user));+ for (Membership membership: user.getMemberships()) {+ if (membership.getGroup().isAdministrator())+ permissions.add(new SystemAdministration());+ if (membership.getGroup().isCanCreateProjects())+ permissions.add(new CreateProjects());+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {+ permissions.add(new ProjectPermission(+ authorization.getProject(), authorization.getPrivilege()));+ }+ }+ for (UserAuthorization authorization: user.getAuthorizations()) {+ permissions.add(new ProjectPermission(+ authorization.getProject(), authorization.getPrivilege()));+ }+ }+ }+ return permissions;}};}@Override- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {- return accountManager.findByName(((UsernamePasswordToken) token).getUsername());+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)+ throws AuthenticationException {+ return userManager.findByName(((UsernamePasswordToken) token).getUsername());}- /**- * Get collection of permissions for specified user identifier.- *- * @param userId- * identifier of user to get permissions for. Specifically, value <tt>0</tt> stands for- * anonymous user- * @return- * collection of permissions associated with specified user identifier- */- protected Collection<Permission> permissionsOf(Long userId) {- Collection<Permission> permissions = new ArrayList<>();-- /*- * Instead of returning all permissions of the user, we return a customized- * permission object so that we can control the authorization procedure for- * optimization purpose. For instance, we may check information contained- * in the permission being checked and if it means authorization of certain- * object, we can then only load authorization information of that object.- */- permissions.add(new Permission() {-- @Override- public boolean implies(Permission permission) {- if (permission instanceof ObjectPermission) {- ObjectPermission objectPermission = (ObjectPermission) permission;- Depot checkDepot = getDepot(objectPermission);- if (checkDepot != null- && checkDepot.isPublicRead()- && DepotPrivilege.READ.can(objectPermission.getPrivilege())) {- return true;- }- if (userId != 0L) {- Account user = accountManager.get(userId);- if (user != null) {- // administrator can do anything- if (user.isAdministrator())- return true;-- Account checkAccount = getAccount(objectPermission);-- // if permission is to check privilege of account belongings- if (checkAccount != null) {- // I can do anything against my own account- if (checkAccount.equals(user))- return true;-- OrganizationMembership organizationMembership =- organizationMembershipManager.find(checkAccount, user);- if (organizationMembership != null) {- AccountPrivilege accountPrivilege;- if (organizationMembership.isAdmin())- accountPrivilege = AccountPrivilege.ADMIN;- else- accountPrivilege = AccountPrivilege.ACCESS;- if (accountPrivilege.can(objectPermission.getPrivilege()))- return true;- }- if (checkDepot != null) {- if (organizationMembership != null- && checkAccount.getDefaultPrivilege().can(objectPermission.getPrivilege())) {- return true;- }- UserAuthorizationManager userAuthorizationManager =- GitPlex.getInstance(UserAuthorizationManager.class);- UserAuthorization userAuthorization = userAuthorizationManager.find(user, checkDepot);- if (userAuthorization != null- && userAuthorization.getPrivilege().can(objectPermission.getPrivilege())) {- return true;- }-- Set<Team> teams = new HashSet<>();- for (TeamMembership teamMembership:- teamMembershipManager.findAll(checkAccount, user)) {- teams.add(teamMembership.getTeam());- }- for (TeamAuthorization authorization: checkDepot.getAuthorizedTeams()) {- if (authorization.getPrivilege().can(objectPermission.getPrivilege())- && teams.contains(authorization.getTeam())) {- return true;- }- }- }- }- }- }- }- return false;- }- });-- return permissions;- }-- private Account getAccount(ObjectPermission permission) {- if (permission.getObject() instanceof Depot) {- Depot depot = (Depot) permission.getObject();- return depot.getAccount();- } else if (permission.getObject() instanceof Account) {- return (Account) permission.getObject();- } else {- return null;- }- }-- private Depot getDepot(ObjectPermission permission) {- if (permission.getObject() instanceof Depot) {- Depot depot = (Depot) permission.getObject();- return depot;- } else {- return null;- }- }-}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.javaindex b4cf5d91db..5a99113845 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java@@ -9,76 +9,78 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.Review;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.model.support.TagProtection;-import com.gitplex.server.security.privilege.DepotPrivilege;-import com.gitplex.server.security.privilege.Privilege;+import com.gitplex.server.security.permission.CreateProjects;+import com.gitplex.server.security.permission.ProjectPermission;+import com.gitplex.server.security.permission.SystemAdministration;+import com.gitplex.server.security.permission.UserAdministration;public class SecurityUtils extends org.apache.shiro.SecurityUtils {- public static Collection<Account> findUsersCan(Depot depot, DepotPrivilege operation) {- Set<Account> authorizedUsers = new HashSet<Account>();- for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {- if (!account.isOrganization() && account.asSubject().isPermitted(new ObjectPermission(depot, operation))) {- authorizedUsers.add(account);+ public static Collection<User> findUsersCan(Project project, ProjectPrivilege privilege) {+ Set<User> authorizedUsers = new HashSet<User>();+ for (User user: GitPlex.getInstance(UserManager.class).findAll()) {+ if (user.asSubject().isPermitted(new ProjectPermission(project, privilege))) {+ authorizedUsers.add(user);}}return authorizedUsers;}public static boolean canModify(PullRequest request) {- Depot depot = request.getTargetDepot();- if (canManage(depot)) {+ Project project = request.getTargetProject();+ if (canManage(project)) {return true;} else {- Account currentUser = getAccount();+ User currentUser = getUser();return currentUser != null && currentUser.equals(request.getSubmitter());}}- public static Account getAccount() {- return GitPlex.getInstance(AccountManager.class).getCurrent();+ public static User getUser() {+ return GitPlex.getInstance(UserManager.class).getCurrent();}public static boolean canModify(Review review) {- Depot depot = review.getRequest().getTargetDepot();- if (canManage(depot)) {+ Project project = review.getRequest().getTargetProject();+ if (canManage(project)) {return true;} else {- return review.getUser().equals(getAccount());+ return review.getUser().equals(getUser());}}public static boolean canModify(CodeComment comment) {- Account currentUser = getAccount();+ User currentUser = getUser();if (currentUser == null) {return false;} else {- return currentUser.equals(comment.getUser()) || canManage(comment.getRequest().getTargetDepot());+ return currentUser.equals(comment.getUser()) || canManage(comment.getRequest().getTargetProject());}}public static boolean canModify(CodeCommentActivity activity) {- Account currentUser = getAccount();+ User currentUser = getUser();if (currentUser == null) {return false;} else {- return currentUser.equals(activity.getUser()) || canManage(activity.getComment().getRequest().getTargetDepot());+ return currentUser.equals(activity.getUser()) || canManage(activity.getComment().getRequest().getTargetProject());}}public static boolean canModify(PullRequestComment comment) {- Account currentUser = getAccount();+ User currentUser = getUser();if (currentUser == null) {return false;} else {@@ -87,7 +89,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canModify(PullRequestStatusChange statusChange) {- Account currentUser = getAccount();+ User currentUser = getUser();if (currentUser == null) {return false;} else {@@ -95,27 +97,27 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}}- public static boolean canDeleteBranch(Depot depot, String branchName) {- if (canWrite(depot)) {- BranchProtection protection = depot.getBranchProtection(branchName);+ public static boolean canDeleteBranch(Project project, String branchName) {+ if (canWrite(project)) {+ BranchProtection protection = project.getBranchProtection(branchName);return protection == null || !protection.isNoDeletion();} else {return false;}}- public static boolean canUpdateTag(Depot depot, String tagName) {- if (canWrite(depot)) {- TagProtection protection = depot.getTagProtection(tagName);+ public static boolean canUpdateTag(Project project, String tagName) {+ if (canWrite(project)) {+ TagProtection protection = project.getTagProtection(tagName);return protection == null || !protection.isNoUpdate();} else {return false;}}- public static boolean canDeleteTag(Depot depot, String tagName) {- if (canWrite(depot)) {- TagProtection protection = depot.getTagProtection(tagName);+ public static boolean canDeleteTag(Project project, String tagName) {+ if (canWrite(project)) {+ TagProtection protection = project.getTagProtection(tagName);return protection == null || !protection.isNoDeletion();} else {return false;@@ -123,52 +125,47 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}@Nullable- public static boolean canCreateTag(Depot depot, String tagName) {- if (canWrite(depot)) {- TagProtection protection = depot.getTagProtection(tagName);+ public static boolean canCreateTag(Project project, String tagName) {+ if (canWrite(project)) {+ TagProtection protection = project.getTagProtection(tagName);return protection == null ||- protection.getTagCreator().getNotMatchMessage(depot, SecurityUtils.getAccount()) == null;+ protection.getTagCreator().getNotMatchMessage(project, SecurityUtils.getUser()) == null;} else {return false;}}- public static boolean canModify(Depot depot, String branch, String file) {- return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canModify(getAccount(), depot, branch, file);+ public static boolean canModify(Project project, String branch, String file) {+ return canWrite(project) && GitPlex.getInstance(ReviewManager.class).canModify(getUser(), project, branch, file);}- public static boolean canPush(Depot depot, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {- return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canPush(getAccount(), depot, branchName,+ public static boolean canPush(Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {+ return canWrite(project) && GitPlex.getInstance(ReviewManager.class).canPush(getUser(), project, branchName,oldObjectId, newObjectId);}- public static boolean canManage(Account account) {- return getSubject().isPermitted(ObjectPermission.ofAccountAdmin(account));+ public static boolean canManage(User user) {+ return getSubject().isPermitted(new UserAdministration(user));}- public static boolean canAccess(Account organization) {- return getSubject().isPermitted(ObjectPermission.ofAccountAccess(organization));+ public static boolean canCreateProjects() {+ return getSubject().isPermitted(new CreateProjects());}- public static boolean canRead(Depot depot) {- return getSubject().isPermitted(ObjectPermission.ofDepotRead(depot));+ public static boolean canRead(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.READ));}- public static boolean canWrite(Depot depot) {- return getSubject().isPermitted(ObjectPermission.ofDepotWrite(depot));- }-- public static boolean canManage(Depot depot) {- return getSubject().isPermitted(ObjectPermission.ofDepotAdmin(depot));+ public static boolean canWrite(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE));}- public static boolean canManageSystem() {- Account currentUser = getAccount();- return currentUser != null && currentUser.isAdministrator();+ public static boolean canManage(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN));}-- public static boolean isGreater(Privilege greater, Privilege lesser) {- return greater.can(lesser) && !lesser.can(greater);++ public static boolean isAdministrator() {+ return getSubject().isPermitted(new SystemAdministration());}}diff --git a/core/src/main/java/com/gitplex/server/security/permission/CreateProjects.java b/core/src/main/java/com/gitplex/server/security/permission/CreateProjects.javanew file mode 100644index 0000000000..7eaada2277--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/permission/CreateProjects.java@@ -0,0 +1,12 @@+package com.gitplex.server.security.permission;++import org.apache.shiro.authz.Permission;++public class CreateProjects implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof CreateProjects || p instanceof PublicPermission;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.java b/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.javanew file mode 100644index 0000000000..eff3e01360--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.java@@ -0,0 +1,37 @@+package com.gitplex.server.security.permission;++import org.apache.shiro.authz.Permission;++import com.gitplex.server.model.Project;+import com.gitplex.server.security.ProjectPrivilege;++public class ProjectPermission implements Permission {++ private final Project project;++ private final ProjectPrivilege privilege;++ public ProjectPermission(Project project, ProjectPrivilege privilege) {+ this.project = project;+ this.privilege = privilege;+ }++ public Project getProject() {+ return project;+ }++ public ProjectPrivilege getPrivilege() {+ return privilege;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof ProjectPermission) {+ ProjectPermission projectPermission = (ProjectPermission) p;+ return project.equals(projectPermission.getProject()) && privilege.implies(projectPermission.getPrivilege());+ } else {+ return p instanceof PublicPermission;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/permission/PublicPermission.java b/core/src/main/java/com/gitplex/server/security/permission/PublicPermission.javanew file mode 100644index 0000000000..7f5093b818--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/permission/PublicPermission.java@@ -0,0 +1,20 @@+package com.gitplex.server.security.permission;++import org.apache.shiro.authz.Permission;++import com.gitplex.server.security.ProjectPrivilege;++public class PublicPermission implements Permission {++ @Override+ public boolean implies(Permission p) {+ if (p instanceof ProjectPermission) {+ ProjectPermission projectPermission = (ProjectPermission) p;+ return projectPermission.getProject().isPublicRead()+ && projectPermission.getPrivilege() == ProjectPrivilege.READ;+ } else {+ return p instanceof PublicPermission;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/permission/SystemAdministration.java b/core/src/main/java/com/gitplex/server/security/permission/SystemAdministration.javanew file mode 100644index 0000000000..3e65995ef2--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/permission/SystemAdministration.java@@ -0,0 +1,12 @@+package com.gitplex.server.security.permission;++import org.apache.shiro.authz.Permission;++public class SystemAdministration implements Permission {++ @Override+ public boolean implies(Permission p) {+ return true;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.java b/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.javanew file mode 100644index 0000000000..392a1b7a52--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.java@@ -0,0 +1,29 @@+package com.gitplex.server.security.permission;++import org.apache.shiro.authz.Permission;++import com.gitplex.server.model.User;++public class UserAdministration implements Permission {++ private final User user;++ public UserAdministration(User user) {+ this.user = user;+ }++ public User getUser() {+ return user;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof UserAdministration) {+ UserAdministration userAdmin = (UserAdministration) p;+ return user.equals(userAdmin.getUser());+ } else {+ return p instanceof PublicPermission;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.java b/core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.javadeleted file mode 100644index 7e7b9c0840..0000000000--- a/core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.java+++ /dev/null@@ -1,43 +0,0 @@-package com.gitplex.server.security.privilege;--public enum AccountPrivilege implements Privilege {-- NONE("None") {-- @Override- public boolean can(Privilege privilege) {- return privilege == NONE;- }-- },-- // Organization members can access member/team information of organization account- ACCESS("Access") {-- @Override- public boolean can(Privilege privilege) {- return privilege == ACCESS || NONE.can(privilege);- }-- },- ADMIN("Admin") {-- @Override- public boolean can(Privilege privilege) {- return privilege == ADMIN || ACCESS.can(privilege) || privilege instanceof DepotPrivilege;- }-- };-- private final String displayName;-- AccountPrivilege(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }--}diff --git a/core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.java b/core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.javadeleted file mode 100644index 6c487ac6e1..0000000000--- a/core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.java+++ /dev/null@@ -1,49 +0,0 @@-package com.gitplex.server.security.privilege;--public enum DepotPrivilege implements Privilege {-- NONE("None") {-- @Override- public boolean can(Privilege privilege) {- return privilege == NONE;- }-- },- READ("Read") {-- @Override- public boolean can(Privilege privilege) {- return privilege == READ || NONE.can(privilege);- }-- },- WRITE("Write") {-- @Override- public boolean can(Privilege privilege) {- return privilege == WRITE || READ.can(privilege);- }-- },- ADMIN("Admin") {-- @Override- public boolean can(Privilege privilege) {- return true;- }-- };-- private final String displayName;-- DepotPrivilege(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }--}diff --git a/core/src/main/java/com/gitplex/server/security/privilege/Privilege.java b/core/src/main/java/com/gitplex/server/security/privilege/Privilege.javadeleted file mode 100644index 18565564cc..0000000000--- a/core/src/main/java/com/gitplex/server/security/privilege/Privilege.java+++ /dev/null@@ -1,9 +0,0 @@-package com.gitplex.server.security.privilege;--import java.io.Serializable;--public interface Privilege extends Serializable {-- boolean can(Privilege privilege);--}diff --git a/core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.java b/core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.javadeleted file mode 100644index 4fad5fbb90..0000000000--- a/core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.java+++ /dev/null@@ -1,12 +0,0 @@-package com.gitplex.server.security.privilege;--public class SystemAdmin implements Privilege {-- private static final long serialVersionUID = 1L;-- @Override- public boolean can(Privilege privilege) {- return true;- }--}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.javadeleted file mode 100644index 50e36b7600..0000000000--- a/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java+++ /dev/null@@ -1,7 +0,0 @@-package com.gitplex.server.security.protectedobject;--import com.gitplex.server.model.Account;--public interface AccountBelonging extends ProtectedObject {- Account getAccount();-}diff --git a/core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.java b/core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.javadeleted file mode 100644index f0009831fa..0000000000--- a/core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.server.security.protectedobject;--public interface ProtectedObject {- boolean has(ProtectedObject object);-}diff --git a/core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.java b/core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.javadeleted file mode 100644index 9b1ba00721..0000000000--- a/core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.java+++ /dev/null@@ -1,10 +0,0 @@-package com.gitplex.server.security.protectedobject;--public class SystemObject implements ProtectedObject {-- @Override- public boolean has(ProtectedObject object) {- return true;- }--}diff --git a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java b/core/src/main/java/com/gitplex/server/util/ReviewStatus.javaindex 427c206365..91b07a942a 100644--- a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java+++ b/core/src/main/java/com/gitplex/server/util/ReviewStatus.java@@ -3,13 +3,13 @@ package com.gitplex.server.util;import java.util.List;import java.util.Map;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.Review;public interface ReviewStatus {- List<Account> getAwaitingReviewers();+ List<User> getAwaitingReviewers();- Map<Account, Review> getEffectiveReviews();+ Map<User, Review> getEffectiveReviews();}diff --git a/core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/GroupChoice.javasimilarity index 89%rename from core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.javarename to core/src/main/java/com/gitplex/server/util/editable/annotation/GroupChoice.javaindex c0e37bf536..093429506c 100644--- a/core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.java+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/GroupChoice.java@@ -7,5 +7,5 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)-public @interface TeamChoice {+public @interface GroupChoice {}diff --git a/core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.javasimilarity index 65%rename from core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.javarename to core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.javaindex 73b0cbcb95..147971d33f 100644--- a/core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.java+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.java@@ -7,9 +7,9 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)-public @interface AccountChoice {+public @interface UserChoice {- public enum Type{ORGANIZATION, USER, DEPOT_READER, DEPOT_WRITER, DEPOT_ADMINISTRATOR}+ public enum Type{ALL, DEPOT_READER, DEPOT_WRITER, DEPOT_ADMINISTRATOR}- Type type() default Type.USER;+ Type type() default Type.ALL;}diff --git a/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.java b/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.javanew file mode 100644index 0000000000..1190caf8ac--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.java@@ -0,0 +1,19 @@+package com.gitplex.server.util.facade;++import java.io.Serializable;++public class EntityFacade implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Long id;++ public EntityFacade(Long id) {+ this.id = id;+ }++ public Long getId() {+ return id;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.java b/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.javanew file mode 100644index 0000000000..e587c7a0ae--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.java@@ -0,0 +1,26 @@+package com.gitplex.server.util.facade;++public class GroupAuthorizationFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final Long groupId;++ private final Long projectId;++ public GroupAuthorizationFacade(Long id, Long groupId, Long projectId) {+ super(id);++ this.groupId = groupId;+ this.projectId = projectId;+ }++ public Long getGroupId() {+ return groupId;+ }++ public Long getProjectId() {+ return projectId;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.javanew file mode 100644index 0000000000..dda3430496--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java@@ -0,0 +1,18 @@+package com.gitplex.server.util.facade;++public class GroupFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final String name;++ public GroupFacade(Long id, String name) {+ super(id);+ this.name = name;+ }++ public String getName() {+ return name;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.java b/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.javanew file mode 100644index 0000000000..8f04d5e5b2--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.java@@ -0,0 +1,26 @@+package com.gitplex.server.util.facade;++public class MembershipFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final Long groupId;++ private final Long userId;++ public MembershipFacade(Long id, Long groupId, Long userId) {+ super(id);++ this.groupId = groupId;+ this.userId = userId;+ }++ public Long getGroupId() {+ return groupId;+ }++ public Long getUserId() {+ return userId;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.javanew file mode 100644index 0000000000..54a79f20b3--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java@@ -0,0 +1,25 @@+package com.gitplex.server.util.facade;++public class ProjectFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final Long userId;++ private final String name;++ public ProjectFacade(Long id, Long userId, String name) {+ super(id);+ this.userId = userId;+ this.name = name;+ }++ public Long getUserId() {+ return userId;+ }++ public String getName() {+ return name;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.java b/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.javanew file mode 100644index 0000000000..18e3fdfcae--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.java@@ -0,0 +1,26 @@+package com.gitplex.server.util.facade;++public class UserAuthorizationFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final Long userId;++ private final Long projectId;++ public UserAuthorizationFacade(Long id, Long userId, Long projectId) {+ super(id);++ this.userId = userId;+ this.projectId = projectId;+ }++ public Long getUserId() {+ return userId;+ }++ public Long getProjectId() {+ return projectId;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.javanew file mode 100644index 0000000000..e686e06779--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java@@ -0,0 +1,26 @@+package com.gitplex.server.util.facade;++public class UserFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final String fullName;++ public UserFacade(Long id, String name, String fullName) {+ super(id);++ this.name = name;+ this.fullName = fullName;+ }++ public String getName() {+ return name;+ }++ public String getFullName() {+ return fullName;+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.javaindex 9e4ee92d2b..a118945c34 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java@@ -74,7 +74,7 @@ public class HibernateProxySerializer extends JsonSerializer<HibernateProxy> {JsonProcessingException {/** TODO: if Hibernate did use generics, or we wanted to allow use of- * Jackson annotations to indicate type, should take that into account.+ * Jackson annotations to indicate type, should take that into user.*/Class<?> type = value.getClass();/*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 e70a419e56..a8d63014a1 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.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.util.JsoupUtils;import com.gitplex.server.util.TextNodeVisitor;@@ -23,12 +23,12 @@ public class MentionParser {private static final Pattern PATTERN = Pattern.compile("(^|\\s+)@(\\S+)(?=($|\\s+))");- public Collection<Account> parseMentions(String html) {+ public Collection<User> parseMentions(String html) {return parseMentions(Jsoup.parseBodyFragment(html).body());}- public Collection<Account> parseMentions(Element body) {- Collection<Account> mentions = new HashSet<>();+ public Collection<User> parseMentions(Element body) {+ Collection<User> mentions = new HashSet<>();TextNodeVisitor visitor = new TextNodeVisitor() {@@ -44,14 +44,14 @@ public class MentionParser {NodeTraversor tranversor = new NodeTraversor(visitor);tranversor.traverse(body);- AccountManager userManager = GitPlex.getInstance(AccountManager.class);+ UserManager userManager = GitPlex.getInstance(UserManager.class);for (TextNode node : visitor.getMatchedNodes()) {Matcher matcher = PATTERN.matcher(node.getWholeText());while (matcher.find()) {String userName = matcher.group(2);String userTag;- Account user = userManager.findByName(userName);+ User user = userManager.findByName(userName);if (user != null) {mentions.add(user);userTag = toHtml(user);@@ -66,7 +66,7 @@ public class MentionParser {return mentions;}- protected String toHtml(Account user) {+ protected String toHtml(User user) {return "@" + user.getName();}diff --git a/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.g4 b/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.g4index b5177b4f84..23df76eada 100644--- a/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.g4+++ b/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.g4@@ -2,17 +2,17 @@ grammar ReviewAppointment;expr: ' '* criteria (' '+ criteria)* ' '* EOF;-criteria: userCriteria | teamCriteria;+criteria: userCriteria | groupCriteria;userCriteria: USER Value;-teamCriteria: TEAM Value (':' count)?;+groupCriteria: GROUP Value (':' count)?;count: 'all' | DIGIT;DIGIT: [1-9][0-9]*;USER: 'user';-TEAM: 'team';+GROUP: 'group';Value: '(' (ESCAPE|~[()\\])+? ')';diff --git a/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.java b/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.javaindex a05fd074b6..64c16e06bd 100644--- a/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.java+++ b/core/src/main/java/com/gitplex/server/util/reviewappointment/ReviewAppointment.java@@ -13,43 +13,43 @@ import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.tree.TerminalNode;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-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.manager.UserManager;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.Group;import com.gitplex.server.util.reviewappointment.ReviewAppointmentParser.CountContext;import com.gitplex.server.util.reviewappointment.ReviewAppointmentParser.CriteriaContext;import com.gitplex.server.util.reviewappointment.ReviewAppointmentParser.ExprContext;public class ReviewAppointment {- private final List<Account> users = new ArrayList<>();+ private final List<User> users = new ArrayList<>();- private final Map<Team, Integer> teams = new LinkedHashMap<>();+ private final Map<Group, Integer> groups = new LinkedHashMap<>();- public ReviewAppointment(Depot depot, String expr) {+ public ReviewAppointment(Project project, String expr) {ExprContext exprContext = parse(expr);for (CriteriaContext criteriaContext: exprContext.criteria()) {if (criteriaContext.userCriteria() != null) {String userName = getBracedValue(criteriaContext.userCriteria().Value());- Account user = GitPlex.getInstance(AccountManager.class).findByName(userName);+ User user = GitPlex.getInstance(UserManager.class).findByName(userName);if (user != null) {users.add(user);}- } else if (criteriaContext.teamCriteria() != null) {- String teamName = getBracedValue(criteriaContext.teamCriteria().Value());- Team team = GitPlex.getInstance(TeamManager.class).find(depot.getAccount(), teamName);- if (team != null) {- CountContext countContext = criteriaContext.teamCriteria().count();+ } else if (criteriaContext.groupCriteria() != null) {+ String groupName = getBracedValue(criteriaContext.groupCriteria().Value());+ Group group = GitPlex.getInstance(GroupManager.class).find(groupName);+ if (group != null) {+ CountContext countContext = criteriaContext.groupCriteria().count();if (countContext != null) {if (countContext.DIGIT() != null)- teams.put(team, Integer.parseInt(countContext.DIGIT().getText()));+ groups.put(group, Integer.parseInt(countContext.DIGIT().getText()));else- teams.put(team, 0);+ groups.put(group, 0);} else {- teams.put(team, 1);+ groups.put(group, 1);}}}@@ -72,26 +72,26 @@ public class ReviewAppointment {return value.substring(0, value.length()-1).trim();}- public List<Account> getUsers() {+ public List<User> getUsers() {return users;}- public Map<Team, Integer> getTeams() {- return teams;+ public Map<Group, Integer> getGroups() {+ return groups;}- public boolean matches(Account user) {- for (Account eachUser: users) {+ public boolean matches(User user) {+ for (User eachUser: users) {if (!eachUser.equals(user))return false;}- for (Map.Entry<Team, Integer> entry: teams.entrySet()) {- Team team = entry.getKey();+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {+ Group group = entry.getKey();int requiredCount = entry.getValue();- if (requiredCount == 0 || requiredCount > team.getMembers().size())- requiredCount = team.getMembers().size();+ if (requiredCount == 0 || requiredCount > group.getMembers().size())+ requiredCount = group.getMembers().size();- if (requiredCount > 1 || requiredCount == 1 && !team.getMembers().contains(user))+ if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))return false;}return true;@@ -100,10 +100,10 @@ public class ReviewAppointment {@Nullablepublic String toExpr() {StringBuilder builder = new StringBuilder();- for (Account user: users)+ for (User user: users)builder.append("user(").append(user.getName()).append(") ");- for (Map.Entry<Team, Integer> entry: teams.entrySet()) {- builder.append("team(").append(entry.getKey().getName()).append(")");+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {+ builder.append("group(").append(entry.getKey().getName()).append(")");if (entry.getValue() == 0)builder.append(":all");else if (entry.getValue() != 1)diff --git a/core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.javadeleted file mode 100644index f278e833bf..0000000000--- a/core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.java+++ /dev/null@@ -1,10 +0,0 @@-package com.gitplex.server.util.validation;--import java.util.Set;--import com.gitplex.launcher.loader.ExtensionPoint;--@ExtensionPoint-public interface AccountNameReservation {- Set<String> getReserved();-}diff --git a/core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.javadeleted file mode 100644index 4caf11d720..0000000000--- a/core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.java+++ /dev/null@@ -1,49 +0,0 @@-package com.gitplex.server.util.validation;--import java.util.HashSet;-import java.util.Set;-import java.util.regex.Pattern;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.util.validation.annotation.AccountName;--public class AccountNameValidator implements ConstraintValidator<AccountName, String> {-- private static Set<String> reservedNames;-- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");-- public void initialize(AccountName constaintAnnotation) {- }-- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (getReservedNames().contains(value)) {- constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved name").addConstraintViolation();- return false;- } else {- return true;- }- }-- public static synchronized Set<String> getReservedNames() {- if (reservedNames == null) {- reservedNames = new HashSet<>();- for (AccountNameReservation each : AppLoader.getExtensions(AccountNameReservation.class)) {- reservedNames.addAll(each.getReserved());- }- }- return reservedNames;- }--}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 f68d1ca303..6975a91c33 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@@ -1,14 +1,11 @@package com.gitplex.server.util.validation;-import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.ConstraintViolation;import javax.validation.Validator;import com.gitplex.server.model.AbstractEntity;-import com.gitplex.server.model.Account;@Singletonpublic class DefaultEntityValidator implements EntityValidator {@@ -28,23 +25,8 @@ public class DefaultEntityValidator implements EntityValidator {@Overridepublic void validate(AbstractEntity entity) {- if (entity instanceof Account) {- Account account = (Account) entity;- Set<String> excludeProperties;- if (account.isOrganization()) {- excludeProperties = Account.getOrganizationExcludeProperties();- } else {- excludeProperties = Account.getUserExcludeProperties();- }- for (ConstraintViolation<?> violation: validator.validate(account)) {- if (!excludeProperties.contains(violation.getPropertyPath().toString())) {- reportError(account, violation);- }- }- } else {- for (ConstraintViolation<?> violation: validator.validate(entity)) {- reportError(entity, violation);- }+ for (ConstraintViolation<?> violation: validator.validate(entity)) {+ reportError(entity, violation);}}diff --git a/core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.javadeleted file mode 100644index 5f9996adee..0000000000--- a/core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.java+++ /dev/null@@ -1,10 +0,0 @@-package com.gitplex.server.util.validation;--import java.util.Set;--import com.gitplex.launcher.loader.ExtensionPoint;--@ExtensionPoint-public interface DepotNameReservation {- Set<String> getReserved();-}diff --git a/core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.javadeleted file mode 100644index a57397346b..0000000000--- a/core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.java+++ /dev/null@@ -1,48 +0,0 @@-package com.gitplex.server.util.validation;--import java.util.HashSet;-import java.util.Set;-import java.util.regex.Pattern;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.util.validation.annotation.DepotName;--public class DepotNameValidator implements ConstraintValidator<DepotName, String> {-- private static Set<String> reservedNames;-- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");-- public void initialize(DepotName constaintAnnotation) {- }-- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (getReservedNames().contains(value)) {- constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();- return false;- } else {- return true;- }- }-- public static synchronized Set<String> getReservedNames() {- if (reservedNames == null) {- reservedNames = new HashSet<>();- for (DepotNameReservation each : AppLoader.getExtensions(DepotNameReservation.class)) {- reservedNames.addAll(each.getReserved());- }- }- return reservedNames;- }-}diff --git a/core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.javasimilarity index 80%rename from core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.javarename to core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.javaindex cc2659b9d7..45535880e6 100644--- a/core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.java+++ b/core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.java@@ -5,6 +5,6 @@ import java.util.Set;import com.gitplex.launcher.loader.ExtensionPoint;@ExtensionPoint-public interface TeamNameReservation {+public interface GroupNameReservation {Set<String> getReserved();}diff --git a/core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.javasimilarity index 81%rename from core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.javarename to core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.javaindex 9a9ee55b90..42788c01cf 100644--- a/core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.java+++ b/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.java@@ -8,15 +8,15 @@ import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.util.validation.annotation.TeamName;+import com.gitplex.server.util.validation.annotation.GroupName;-public class TeamNameValidator implements ConstraintValidator<TeamName, String> {+public class GroupNameValidator implements ConstraintValidator<GroupName, String> {private static Set<String> reservedNames;private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");- public void initialize(TeamName constaintAnnotation) {+ public void initialize(GroupName constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {@@ -39,7 +39,7 @@ public class TeamNameValidator implements ConstraintValidator<TeamName, String>public static synchronized Set<String> getReservedNames() {if (reservedNames == null) {reservedNames = new HashSet<>();- for (TeamNameReservation each : AppLoader.getExtensions(TeamNameReservation.class)) {+ for (GroupNameReservation each : AppLoader.getExtensions(GroupNameReservation.class)) {reservedNames.addAll(each.getReserved());}}diff --git a/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.javanew file mode 100644index 0000000000..2ee83db62a--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java@@ -0,0 +1,30 @@+package com.gitplex.server.util.validation;++import java.util.regex.Pattern;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import com.gitplex.server.util.validation.annotation.ProjectName;++public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {++ private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");++ public void initialize(ProjectName constaintAnnotation) {+ }++ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null) {+ return true;+ } else if (!pattern.matcher(value).find()) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.javanew file mode 100644index 0000000000..7c4501d13a--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java@@ -0,0 +1,30 @@+package com.gitplex.server.util.validation;++import java.util.regex.Pattern;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import com.gitplex.server.util.validation.annotation.UserName;++public class UserNameValidator implements ConstraintValidator<UserName, String> {++ private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");++ public void initialize(UserName constaintAnnotation) {+ }++ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null) {+ return true;+ } else if (!pattern.matcher(value).find()) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/GroupName.javasimilarity index 78%rename from core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.javarename to core/src/main/java/com/gitplex/server/util/validation/annotation/GroupName.javaindex 2f4324ed3c..5f6b6c58a6 100644--- a/core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.java+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/GroupName.java@@ -8,13 +8,13 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import com.gitplex.server.util.validation.TeamNameValidator;+import com.gitplex.server.util.validation.GroupNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)@Name-@Constraint(validatedBy=TeamNameValidator.class)-public @interface TeamName {+@Constraint(validatedBy=GroupNameValidator.class)+public @interface GroupName {String message() default "";diff --git a/core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/ProjectName.javasimilarity index 77%rename from core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.javarename to core/src/main/java/com/gitplex/server/util/validation/annotation/ProjectName.javaindex 31fcbe826b..252d33ad82 100644--- a/core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.java+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/ProjectName.java@@ -8,12 +8,12 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import com.gitplex.server.util.validation.AccountNameValidator;+import com.gitplex.server.util.validation.ProjectNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=AccountNameValidator.class)-public @interface AccountName {+@Constraint(validatedBy=ProjectNameValidator.class)+public @interface ProjectName {String message() default "";diff --git a/core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/UserName.javasimilarity index 77%rename from core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.javarename to core/src/main/java/com/gitplex/server/util/validation/annotation/UserName.javaindex 65c8bed47d..834301486d 100644--- a/core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.java+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/UserName.java@@ -8,12 +8,12 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import com.gitplex.server.util.validation.DepotNameValidator;+import com.gitplex.server.util.validation.UserNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=DepotNameValidator.class)-public @interface DepotName {+@Constraint(validatedBy=UserNameValidator.class)+public @interface UserName {String message() default "";diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.javaindex c641a13311..7b6393044a 100644--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java@@ -387,7 +387,7 @@ public class RevCommit extends RevObject {* Parse the author identity from the raw buffer.* <p>* This method parses and returns the content of the author line, after- * taking the commit's character set into account and decoding the author+ * taking the commit's character set into user and decoding the author* name and email address. This method is fairly expensive and produces a* new PersonIdent instance on each invocation. Callers should invoke this* method only if they are certain they will be outputting the result, and@@ -413,7 +413,7 @@ public class RevCommit extends RevObject {* Parse the committer identity from the raw buffer.* <p>* This method parses and returns the content of the committer line, after- * taking the commit's character set into account and decoding the committer+ * taking the commit's character set into user and decoding the committer* name and email address. This method is fairly expensive and produces a* new PersonIdent instance on each invocation. Callers should invoke this* method only if they are certain they will be outputting the result, and@@ -439,7 +439,7 @@ public class RevCommit extends RevObject {* Parse the complete commit message and decode it to a string.* <p>* This method parses and returns the message portion of the commit buffer,- * after taking the commit's character set into account and decoding the+ * after taking the commit's character set into user and decoding the* buffer using that character set. This method is a fairly expensive* operation and produces a new string on each invocation.*@@ -461,7 +461,7 @@ public class RevCommit extends RevObject {* "oneline" format, suitable for output in a single line display.* <p>* This method parses and returns the message portion of the commit buffer,- * after taking the commit's character set into account and decoding the+ * after taking the commit's character set into user and decoding the* buffer using that character set. This method is a fairly expensive* operation and produces a new string on each invocation.*diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevTag.javaindex 81a54bf7ea..1be5d6a6b7 100644--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java@@ -182,7 +182,7 @@ public class RevTag extends RevObject {* Parse the tagger identity from the raw buffer.* <p>* This method parses and returns the content of the tagger line, after- * taking the tag's character set into account and decoding the tagger+ * taking the tag's character set into user and decoding the tagger* name and email address. This method is fairly expensive and produces a* new PersonIdent instance on each invocation. Callers should invoke this* method only if they are certain they will be outputting the result, and@@ -204,7 +204,7 @@ public class RevTag extends RevObject {* Parse the complete tag message and decode it to a string.* <p>* This method parses and returns the message portion of the tag buffer,- * after taking the tag's character set into account and decoding the buffer+ * after taking the tag's character set into user and decoding the buffer* using that character set. This method is a fairly expensive operation and* produces a new string on each invocation.*@@ -226,7 +226,7 @@ public class RevTag extends RevObject {* "oneline" format, suitable for output in a single line display.* <p>* This method parses and returns the message portion of the tag buffer,- * after taking the tag's character set into account and decoding the buffer+ * after taking the tag's character set into user and decoding the buffer* using that character set. This method is a fairly expensive operation and* produces a new string on each invocation.*diff --git a/rest/src/main/java/com/gitplex/server/rest/DepotResource.java b/rest/src/main/java/com/gitplex/server/rest/DepotResource.javadeleted file mode 100644index 3f79dac2e3..0000000000--- a/rest/src/main/java/com/gitplex/server/rest/DepotResource.java+++ /dev/null@@ -1,83 +0,0 @@-package com.gitplex.server.rest;--import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;--import org.apache.shiro.SecurityUtils;-import org.apache.shiro.authz.UnauthenticatedException;-import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.Restrictions;--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;-import com.gitplex.server.security.ObjectPermission;--@Path("/repositories")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.APPLICATION_JSON)-@Singleton-public class DepotResource {-- private final Dao dao;-- private final DepotManager depotManager;-- @Inject- public DepotResource(Dao dao, DepotManager depotManager) {- this.dao = dao;- this.depotManager = depotManager;- }-- @Path("/{id}")- @GET- public Depot get(@PathParam("id") Long id) {- Depot depot = dao.load(Depot.class, id);-- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotRead(depot)))- throw new UnauthenticatedException();- else- return depot;- }-- @ValidQueryParams- @GET- public Collection<Depot> query(@QueryParam("userId") Long userId, @QueryParam("name") String name,- @QueryParam("path") String path) {-- List<Depot> depots = new ArrayList<>();-- EntityCriteria<Depot> criteria = EntityCriteria.of(Depot.class);- if (path != null) {- Depot depot = depotManager.find(path);- if (depot != null)- depots.add(depot);- } else {- if (userId != null)- criteria.add(Restrictions.eq("account.id", userId));- if (name != null)- criteria.add(Restrictions.eq("name", name));- depots.addAll(dao.findAll(criteria));- }-- for (Depot depot: depots) {- if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotRead(depot)))- throw new UnauthorizedException("Unauthorized access to repository " + depot.getFQN());- }- return depots;- }--}diff --git a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.javanew file mode 100644index 0000000000..2878b4f9e2--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java@@ -0,0 +1,82 @@+package com.gitplex.server.rest;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.Consumes;+import javax.ws.rs.GET;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;+import javax.ws.rs.QueryParam;+import javax.ws.rs.core.MediaType;++import org.apache.shiro.authz.UnauthenticatedException;+import org.apache.shiro.authz.UnauthorizedException;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.rest.jersey.ValidQueryParams;+import com.gitplex.server.security.SecurityUtils;++@Path("/projects")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.APPLICATION_JSON)+@Singleton+public class ProjectResource {++ private final Dao dao;++ private final ProjectManager projectManager;++ @Inject+ public ProjectResource(Dao dao, ProjectManager projectManager) {+ this.dao = dao;+ this.projectManager = projectManager;+ }++ @Path("/{id}")+ @GET+ public Project get(@PathParam("id") Long id) {+ Project project = dao.load(Project.class, id);++ if (!SecurityUtils.canRead(project))+ throw new UnauthenticatedException();+ else+ return project;+ }++ @ValidQueryParams+ @GET+ public Collection<Project> query(@QueryParam("userId") Long userId, @QueryParam("name") String name,+ @QueryParam("path") String path) {++ List<Project> projects = new ArrayList<>();++ EntityCriteria<Project> criteria = EntityCriteria.of(Project.class);+ if (path != null) {+ Project project = projectManager.find(path);+ if (project != null)+ projects.add(project);+ } else {+ if (userId != null)+ criteria.add(Restrictions.eq("user.id", userId));+ if (name != null)+ criteria.add(Restrictions.eq("name", name));+ projects.addAll(dao.findAll(criteria));+ }++ for (Project project: projects) {+ if (!SecurityUtils.canRead(project))+ throw new UnauthorizedException("Unauthorized access to project " + project.getName());+ }+ return projects;+ }++}diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.javaindex b3d9bee5a3..4e10e81592 100644--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java@@ -45,7 +45,7 @@ public class PullRequestResource {public PullRequest get(@PathParam("id") Long id) {PullRequest request = dao.load(PullRequest.class, id);- if (!SecurityUtils.canRead(request.getTargetDepot()))+ if (!SecurityUtils.canRead(request.getTargetProject()))throw new UnauthorizedException();return request;@@ -54,20 +54,20 @@ public class PullRequestResource {@ValidQueryParams@GETpublic Collection<PullRequest> query(- @QueryParam("targetDepotId") Long targetDepotId, @QueryParam("targetBranch") String targetBranch,- @QueryParam("sourceDepotId") Long sourceDepotId, @QueryParam("sourceBranch") String sourceBranch,+ @QueryParam("targetProjectId") Long targetProjectId, @QueryParam("targetBranch") String targetBranch,+ @QueryParam("sourceProjectId") Long sourceProjectId, @QueryParam("sourceBranch") String sourceBranch,@QueryParam("submitterId") Long submitterId, @QueryParam("status") String status,@QueryParam("beginDate") Date beginDate, @QueryParam("endDate") Date endDate) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- if (targetDepotId != null)- criteria.add(Restrictions.eq("targetDepot.id", targetDepotId));+ if (targetProjectId != null)+ criteria.add(Restrictions.eq("targetProject.id", targetProjectId));if (targetBranch != null)criteria.add(Restrictions.eq("targetBranch", targetBranch));- if (sourceDepotId != null)- criteria.add(Restrictions.eq("sourceDepot.id", targetDepotId));+ if (sourceProjectId != null)+ criteria.add(Restrictions.eq("sourceProject.id", targetProjectId));if (sourceBranch != null)criteria.add(Restrictions.eq("sourceBranch", sourceBranch));@@ -86,7 +86,7 @@ public class PullRequestResource {List<PullRequest> requests = dao.findAll(criteria);for (PullRequest request: requests) {- if (!SecurityUtils.canRead(request.getTarget().getDepot()))+ if (!SecurityUtils.canRead(request.getTarget().getProject()))throw new UnauthorizedException("Unauthorized access to pull request " + request.getTarget() + "/" + request.getId());}return requests;diff --git a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.javaindex b842ce9cf5..bb923e9b90 100644--- a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java@@ -15,9 +15,9 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.Review;import com.gitplex.server.security.SecurityUtils;@@ -29,19 +29,19 @@ public class ReviewResource {private final ReviewManager reviewManager;- private final AccountManager accountManager;+ private final UserManager userManager;@Inject- public ReviewResource(ReviewManager reviewManager, AccountManager accountManager) {+ public ReviewResource(ReviewManager reviewManager, UserManager userManager) {this.reviewManager = reviewManager;- this.accountManager = accountManager;+ this.userManager = userManager;}@GET@Path("/{id}")public Review get(@PathParam("id") Long id) {Review review = reviewManager.load(id);- if (!SecurityUtils.canRead(review.getRequest().getTargetDepot()))+ if (!SecurityUtils.canRead(review.getRequest().getTargetProject()))throw new UnauthorizedException();return review;}@@ -50,8 +50,8 @@ public class ReviewResource {@Path("/{id}")public void delete(@PathParam("id") Long id) {Review review = reviewManager.load(id);- Account currentUser = accountManager.getCurrent();- if (review.getUser().equals(currentUser) || SecurityUtils.canManage(review.getRequest().getTargetDepot()))+ User currentUser = userManager.getCurrent();+ if (review.getUser().equals(currentUser) || SecurityUtils.canManage(review.getRequest().getTargetProject()))reviewManager.delete(review);elsethrow new UnauthorizedException();@@ -59,10 +59,10 @@ public class ReviewResource {@POSTpublic Long save(@NotNull @Valid Review review) {- if (!SecurityUtils.canWrite(review.getRequest().getTargetDepot()))+ if (!SecurityUtils.canWrite(review.getRequest().getTargetProject()))throw new UnauthorizedException();- review.setUser(accountManager.getCurrent());+ review.setUser(userManager.getCurrent());reviewManager.save(review);diff --git a/rest/src/main/java/com/gitplex/server/rest/AccountResource.java b/rest/src/main/java/com/gitplex/server/rest/UserResource.javasimilarity index 78%rename from rest/src/main/java/com/gitplex/server/rest/AccountResource.javarename to rest/src/main/java/com/gitplex/server/rest/UserResource.javaindex 4901ee9bb0..f7ecd3bc37 100644--- a/rest/src/main/java/com/gitplex/server/rest/AccountResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/UserResource.java@@ -15,31 +15,31 @@ import javax.ws.rs.core.MediaType;import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.Email;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;-@Path("/accounts")+@Path("/users")@Consumes(MediaType.WILDCARD)@Produces(MediaType.APPLICATION_JSON)@Singleton-public class AccountResource {+public class UserResource {private final Dao dao;@Inject- public AccountResource(Dao dao) {+ public UserResource(Dao dao) {this.dao = dao;}@ValidQueryParams@GET- public Collection<Account> query(+ public Collection<User> query(@QueryParam("name") String name,@Email @QueryParam("email") String email,@QueryParam("fullName") String fullName) {- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);+ EntityCriteria<User> criteria = EntityCriteria.of(User.class);if (name != null)criteria.add(Restrictions.eq("name", name));if (email != null)@@ -51,8 +51,8 @@ public class AccountResource {@GET@Path("/{id}")- public Account get(@PathParam("id") Long id) {- return dao.load(Account.class, id);+ public User get(@PathParam("id") Long id) {+ return dao.load(User.class, id);}}diff --git a/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownUserExceptionMapper.javasimilarity index 72%rename from rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.javarename to rest/src/main/java/com/gitplex/server/rest/jersey/UnknownUserExceptionMapper.javaindex 0aae212899..291ceee405 100644--- a/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.java+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownUserExceptionMapper.java@@ -7,11 +7,11 @@ import javax.ws.rs.ext.Provider;import org.apache.shiro.authc.UnknownAccountException;@Provider-public class UnknownAccountExceptionMapper implements ExceptionMapper<UnknownAccountException> {+public class UnknownUserExceptionMapper implements ExceptionMapper<UnknownAccountException> {@Overridepublic Response toResponse(UnknownAccountException exception) {- return Response.status(Response.Status.UNAUTHORIZED).entity("Unknown account").type("text/plain").build();+ return Response.status(Response.Status.UNAUTHORIZED).entity("Unknown user").type("text/plain").build();}}diff --git a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java b/search/src/main/java/com/gitplex/server/search/CommitIndexed.javaindex 48a0a055ab..8ca47eef6b 100644--- a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java+++ b/search/src/main/java/com/gitplex/server/search/CommitIndexed.java@@ -2,21 +2,21 @@ package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public class CommitIndexed {- private final Depot depot;+ private final Project project;private final ObjectId commitId;- public CommitIndexed(Depot depot, ObjectId commitId) {- this.depot = depot;+ public CommitIndexed(Project project, ObjectId commitId) {+ this.project = project;this.commitId = commitId;}- public Depot getDepot() {- return depot;+ public Project getProject() {+ return project;}public ObjectId getCommitId() {diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex fe0b0993e4..d25af587b0 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -72,9 +72,9 @@ import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.BatchWorkManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.util.BatchWorker;import com.gitplex.server.util.ContentDetector;@@ -100,18 +100,18 @@ public class DefaultIndexManager implements IndexManager {private final UnitOfWork unitOfWork;- private final DepotManager depotManager;+ private final ProjectManager projectManager;private final ListenerRegistry listenerRegistry;@Injectpublic DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, DepotManager depotManager) {+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, ProjectManager projectManager) {this.listenerRegistry = listenerRegistry;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;- this.depotManager = depotManager;+ this.projectManager = projectManager;}private String getCommitIndexVersion(final IndexSearcher searcher, AnyObjectId commitId) throws IOException {@@ -305,9 +305,9 @@ public class DefaultIndexManager implements IndexManager {return config;}- private BatchWorker getBatchWorker(Depot depot) {- Long depotId = depot.getId();- return new BatchWorker("depot-" + depot.getForkRoot().getId() + "-indexBlob", 1) {+ private BatchWorker getBatchWorker(Project project) {+ Long projectId = project.getId();+ return new BatchWorker("project-" + project.getForkRoot().getId() + "-indexBlob", 1) {@Overridepublic void doWork(Collection<Prioritized> works) {@@ -316,12 +316,12 @@ public class DefaultIndexManager implements IndexManager {@Overridepublic Void call() throws Exception {- Depot depot = depotManager.load(depotId);+ Project project = projectManager.load(projectId);IndexWork indexWork = (IndexWork) works.iterator().next();- Depot forkRoot = depot.getForkRoot();- if (!forkRoot.equals(depot) && !forkRoot.getRepository().hasObject(indexWork.getCommitId())) {- GitUtils.fetch(depot.getRepository(), indexWork.getCommitId(), forkRoot.getRepository(),+ Project forkRoot = project.getForkRoot();+ if (!forkRoot.equals(project) && !forkRoot.getRepository().hasObject(indexWork.getCommitId())) {+ GitUtils.fetch(project.getRepository(), indexWork.getCommitId(), forkRoot.getRepository(),null);}@@ -335,9 +335,9 @@ public class DefaultIndexManager implements IndexManager {};}- private IndexResult doIndex(Depot depot, ObjectId commit) {+ private IndexResult doIndex(Project project, ObjectId commit) {IndexResult indexResult;- File indexDir = storageManager.getIndexDir(depot);+ File indexDir = storageManager.getIndexDir(project);try (Directory directory = FSDirectory.open(indexDir)) {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {@@ -346,9 +346,9 @@ public class DefaultIndexManager implements IndexManager {return new IndexResult(0, 0);} else {try (IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig())) {- logger.debug("Indexing commit (repository: {}, commit: {})", depot.getFQN(), commit.getName());+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());try {- indexResult = index(depot.getRepository(), commit, writer, searcher);+ indexResult = index(project.getRepository(), commit, writer, searcher);writer.commit();} catch (Exception e) {writer.rollback();@@ -360,8 +360,8 @@ public class DefaultIndexManager implements IndexManager {} else {try (IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig())) {try {- logger.debug("Indexing commit (repository: {}, commit: {})", depot.getFQN(), commit.getName());- indexResult = index(depot.getRepository(), commit, writer, null);+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());+ indexResult = index(project.getRepository(), commit, writer, null);writer.commit();} catch (Exception e) {writer.rollback();@@ -373,10 +373,10 @@ public class DefaultIndexManager implements IndexManager {throw new RuntimeException(e);}- listenerRegistry.post(new CommitIndexed(depot, commit.copy()));+ listenerRegistry.post(new CommitIndexed(project, commit.copy()));- logger.debug("Commit indexed (repository: {}, commit: {}, checked blobs: {}, indexed blobs: {})",- depot.getFQN(), commit.name(), indexResult.getChecked(), indexResult.getIndexed());+ logger.debug("Commit indexed (project: {}, commit: {}, checked blobs: {}, indexed blobs: {})",+ project.getName(), commit.name(), indexResult.getChecked(), indexResult.getIndexed());return indexResult;}@@ -393,8 +393,8 @@ public class DefaultIndexManager implements IndexManager {}@Override- public boolean isIndexed(Depot depot, ObjectId commit) {- File indexDir = storageManager.getIndexDir(depot.getForkRoot());+ public boolean isIndexed(Project project, ObjectId commit) {+ File indexDir = storageManager.getIndexDir(project.getForkRoot());try (Directory directory = FSDirectory.open(indexDir)) {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {@@ -415,19 +415,19 @@ public class DefaultIndexManager implements IndexManager {// as many tags might be pushed all at once when the repository is importedif (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewObjectId().equals(ObjectId.zeroId())) {IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewObjectId());- batchWorkManager.submit(getBatchWorker(event.getDepot()), work);+ batchWorkManager.submit(getBatchWorker(event.getProject()), work);}}@Override- public void indexAsync(Depot depot, ObjectId commit) {+ public void indexAsync(Project project, ObjectId commit) {int priority;if (RequestCycle.get() != null)priority = UI_INDEXING_PRIORITY;elsepriority = BACKEND_INDEXING_PRIORITY;IndexWork work = new IndexWork(priority, commit);- batchWorkManager.submit(getBatchWorker(depot), work);+ batchWorkManager.submit(getBatchWorker(project), work);}private static class IndexWork extends 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 0a0df68661..26103f05f6 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.jsymbol.Symbol;import com.gitplex.launcher.loader.Listen;-import com.gitplex.server.event.depot.DepotDeleted;import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.search.hit.QueryHit;@@ -69,16 +69,16 @@ public class DefaultSearchManager implements SearchManager {}@Nullable- private SearcherManager getSearcherManager(Depot depot) throws InterruptedException {+ private SearcherManager getSearcherManager(Project project) throws InterruptedException {try {- SearcherManager searcherManager = searcherManagers.get(depot.getId());+ SearcherManager searcherManager = searcherManagers.get(project.getId());if (searcherManager == null) synchronized (searcherManagers) {- searcherManager = searcherManagers.get(depot.getId());+ searcherManager = searcherManagers.get(project.getId());if (searcherManager == null) {- Directory directory = FSDirectory.open(storageManager.getIndexDir(depot));+ Directory directory = FSDirectory.open(storageManager.getIndexDir(project));if (DirectoryReader.indexExists(directory)) {searcherManager = new SearcherManager(directory, null);- searcherManagers.put(depot.getId(), searcherManager);+ searcherManagers.put(project.getId(), searcherManager);}}}@@ -96,16 +96,16 @@ public class DefaultSearchManager implements SearchManager {}@Override- public List<QueryHit> search(Depot depot, ObjectId commit, final BlobQuery query)+ public List<QueryHit> search(Project project, ObjectId commit, final BlobQuery query)throws InterruptedException {List<QueryHit> hits = new ArrayList<>();- SearcherManager searcherManager = getSearcherManager(depot.getForkRoot());+ SearcherManager searcherManager = getSearcherManager(project.getForkRoot());if (searcherManager != null) {try {final IndexSearcher searcher = searcherManager.acquire();try {- try (RevWalk revWalk = new RevWalk(depot.getRepository())){+ try (RevWalk revWalk = new RevWalk(project.getRepository())){final RevTree revTree = revWalk.parseCommit(commit).getTree();final Set<String> checkedBlobPaths = new HashSet<>();@@ -125,7 +125,7 @@ public class DefaultSearchManager implements SearchManager {String blobPath = cachedBlobPaths.get(doc).utf8ToString();if (!checkedBlobPaths.contains(blobPath)) {- TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), blobPath, revTree);+ TreeWalk treeWalk = TreeWalk.forPath(project.getRepository(), blobPath, revTree);if (treeWalk != null)query.collect(searcher, treeWalk, hits);checkedBlobPaths.add(blobPath);@@ -159,9 +159,9 @@ public class DefaultSearchManager implements SearchManager {}@Override- public List<Symbol> getSymbols(Depot depot, ObjectId blobId, String blobPath) {+ public List<Symbol> getSymbols(Project project, ObjectId blobId, String blobPath) {try {- SearcherManager searcherManager = getSearcherManager(depot.getForkRoot());+ SearcherManager searcherManager = getSearcherManager(project.getForkRoot());if (searcherManager != null) {try {IndexSearcher searcher = searcherManager.acquire();@@ -233,7 +233,7 @@ public class DefaultSearchManager implements SearchManager {@Listenpublic void on(CommitIndexed event) {try {- getSearcherManager(event.getDepot()).maybeRefresh();+ getSearcherManager(event.getProject()).maybeRefresh();} catch (InterruptedException | IOException e) {Throwables.propagate(e);}@@ -241,21 +241,21 @@ public class DefaultSearchManager implements SearchManager {@Transactional@Listen- public void on(DepotDeleted event) {- Long depotId = event.getDepot().getId();+ public void on(ProjectDeleted event) {+ Long projectId = event.getProject().getId();dao.doAfterCommit(new Runnable() {@Overridepublic void run() {synchronized (searcherManagers) {- SearcherManager searcherManager = searcherManagers.get(depotId);+ SearcherManager searcherManager = searcherManagers.get(projectId);if (searcherManager != null) {try {searcherManager.close();} catch (IOException e) {Throwables.propagate(e);}- searcherManagers.remove(depotId);+ searcherManagers.remove(projectId);}}}diff --git a/search/src/main/java/com/gitplex/server/search/IndexManager.java b/search/src/main/java/com/gitplex/server/search/IndexManager.javaindex a718006e55..984f644d44 100644--- a/search/src/main/java/com/gitplex/server/search/IndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/IndexManager.java@@ -2,12 +2,12 @@ package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public interface IndexManager {- void indexAsync(Depot depot, ObjectId commit);+ void indexAsync(Project project, ObjectId commit);- boolean isIndexed(Depot depot, ObjectId commit);+ boolean isIndexed(Project project, ObjectId commit);}diff --git a/search/src/main/java/com/gitplex/server/search/SearchManager.java b/search/src/main/java/com/gitplex/server/search/SearchManager.javaindex d84c3ff12e..4d054f12c3 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.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;import com.gitplex.server.search.query.TooGeneralQueryException;@@ -16,7 +16,7 @@ import com.gitplex.server.search.query.TooGeneralQueryException;public interface SearchManager {/**- * Search specified repository with specified revision and query.+ * Search specified project with specified revision and query.** @return* list of sorted query results, with most relevant result coming first@@ -24,11 +24,11 @@ public interface SearchManager {* TooGeneralQueryException if supplied query term is too general to possibly cause query slow* InterruptedException if the search process is interrupted*/- List<QueryHit> search(Depot depot, ObjectId commit, BlobQuery query)+ List<QueryHit> search(Project project, ObjectId commit, BlobQuery query)throws InterruptedException, TooGeneralQueryException;@Nullable- List<Symbol> getSymbols(Depot depot, ObjectId blobId, String blobPath);+ List<Symbol> getSymbols(Project project, ObjectId blobId, String blobPath);@NullableList<Symbol> getSymbols(IndexSearcher searcher, ObjectId blobId, String blobPath);diff --git a/search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.java b/search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.javaindex be1f4a4425..416eb6a267 100644--- a/search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.java+++ b/search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.java@@ -25,7 +25,7 @@ public class LiteralUtils {* is set to true.<br>* If however param <tt>outmost</tt> is set to false, we know that these two rows* can still be concatenated with other rows, so simply checking substring- * occurrences is not sufficient, and we need to take prefix and suffix into account,+ * occurrences is not sufficient, and we need to take prefix and suffix into user,* so the rule to discard row2 becomes:* <li> if start literals of row2 starts with prefix of row1 (prefix of row1 is* defined as literals before the first opaque literal)diff --git a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java b/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.javasimilarity index 71%rename from web/src/main/java/com/gitplex/server/web/WicketUrlManager.javarename to web/src/main/java/com/gitplex/server/web/DefaultUrlManager.javaindex 963ed2240b..ab8ab7e3c9 100644--- a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java+++ b/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.java@@ -5,32 +5,26 @@ import javax.inject.Singleton;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.Project;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;@Singleton-public class WicketUrlManager implements UrlManager {+public class DefaultUrlManager implements UrlManager {private final ConfigManager configManager;@Inject- public WicketUrlManager(ConfigManager configManager) {+ public DefaultUrlManager(ConfigManager configManager) {this.configManager = configManager;}@Override- public String urlFor(Account user) {- return configManager.getSystemSetting().getServerUrl() + "/" + user.getName();- }-- @Override- public String urlFor(Depot depot) {- return urlFor(depot.getAccount()) + "/" + depot.getName();+ public String urlFor(Project project) {+ return configManager.getSystemSetting().getServerUrl() + "/projects/" + project.getName();}@Override@@ -46,7 +40,7 @@ public class WicketUrlManager implements UrlManager {@Overridepublic String urlFor(PullRequest request) {- return urlFor(request.getTarget().getDepot()) + "/pulls/" + request.getNumber();+ return urlFor(request.getTarget().getProject()) + "/pulls/" + request.getNumber();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.javanew file mode 100644index 0000000000..8d2ee740f8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java@@ -0,0 +1,170 @@+package com.gitplex.server.web;++import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;+import org.apache.wicket.core.request.mapper.ResourceMapper;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.IRequestHandler;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.mapper.CompoundRequestMapper;++import com.gitplex.server.web.page.admin.DatabaseBackupPage;+import com.gitplex.server.web.page.admin.MailSettingPage;+import com.gitplex.server.web.page.admin.SecuritySettingPage;+import com.gitplex.server.web.page.admin.ServerInformationPage;+import com.gitplex.server.web.page.admin.ServerLogPage;+import com.gitplex.server.web.page.admin.SystemSettingPage;+import com.gitplex.server.web.page.admin.group.GroupListPage;+import com.gitplex.server.web.page.admin.group.NewGroupPage;+import com.gitplex.server.web.page.admin.user.NewUserPage;+import com.gitplex.server.web.page.admin.user.UserListPage;+import com.gitplex.server.web.page.group.GroupAuthorizationsPage;+import com.gitplex.server.web.page.group.GroupProfilePage;+import com.gitplex.server.web.page.group.GroupMembershipsPage;+import com.gitplex.server.web.page.init.ServerInitPage;+import com.gitplex.server.web.page.init.WelcomePage;+import com.gitplex.server.web.page.layout.NewProjectPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.commit.ProjectCommitsPage;+import com.gitplex.server.web.page.project.compare.RevisionComparePage;+import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import com.gitplex.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import com.gitplex.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;+import com.gitplex.server.web.page.project.setting.general.GeneralSettingPage;+import com.gitplex.server.web.page.project.setting.tagprotection.TagProtectionPage;+import com.gitplex.server.web.page.project.tags.ProjectTagsPage;+import com.gitplex.server.web.page.security.ForgetPage;+import com.gitplex.server.web.page.security.LoginPage;+import com.gitplex.server.web.page.security.LogoutPage;+import com.gitplex.server.web.page.security.RegisterPage;+import com.gitplex.server.web.page.test.TestPage;+import com.gitplex.server.web.page.user.AvatarEditPage;+import com.gitplex.server.web.page.user.PasswordEditPage;+import com.gitplex.server.web.page.user.TaskListPage;+import com.gitplex.server.web.page.user.UserAuthorizationsPage;+import com.gitplex.server.web.page.user.UserMembershipsPage;+import com.gitplex.server.web.page.user.UserProfilePage;+import com.gitplex.server.web.util.mapper.WebPageMapper;+import com.gitplex.server.web.util.resource.ArchiveResourceReference;+import com.gitplex.server.web.util.resource.AttachmentResourceReference;+import com.gitplex.server.web.util.resource.RawBlobResourceReference;+import com.gitplex.server.web.util.resource.ServerLogResourceReference;++public class GitPlexUrlMapper extends CompoundRequestMapper {++ public GitPlexUrlMapper(WebApplication app) {+ add(new WebPageMapper("init", ServerInitPage.class));+ add(new WebPageMapper("welcome", WelcomePage.class));+ addAdministrationPages();+ addUserPages();+ addGroupPages();+ addProjectPages();+ addSecurityPages();++ add(new WebPageMapper("test", TestPage.class));+ add(new WebPageMapper("new-project", NewProjectPage.class));++ addResources();+ }++ private void addResources() {+ add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));+ add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference()));+ add(new ResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference()));+ add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",+ new AttachmentResourceReference()));+ }++ private void addSecurityPages() {+ add(new WebPageMapper("login", LoginPage.class));+ add(new WebPageMapper("logout", LogoutPage.class));+ add(new WebPageMapper("register", RegisterPage.class));+ add(new WebPageMapper("forget", ForgetPage.class));+ }++ private void addAdministrationPages() {+ add(new WebPageMapper("administration/users", UserListPage.class));+ add(new WebPageMapper("administration/users/new", NewUserPage.class));+ add(new WebPageMapper("administration/groups", GroupListPage.class));+ add(new WebPageMapper("administration/groups/new", NewGroupPage.class));+ add(new WebPageMapper("administration/settings/system", SystemSettingPage.class));+ add(new WebPageMapper("administration/settings/mail", MailSettingPage.class));+ add(new WebPageMapper("administration/settings/backup", DatabaseBackupPage.class));+ add(new WebPageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new WebPageMapper("administration/server-log", ServerLogPage.class));+ add(new WebPageMapper("administration/server-information", ServerInformationPage.class));+ }++ private void addUserPages() {+ add(new WebPageMapper("users/${user}/profile", UserProfilePage.class));+ add(new WebPageMapper("users/${user}/groups", UserMembershipsPage.class));+ add(new WebPageMapper("users/${user}/authorizations", UserAuthorizationsPage.class));+ add(new WebPageMapper("users/${user}/tasks", TaskListPage.class));+ add(new WebPageMapper("users/${user}/avatar", AvatarEditPage.class));+ add(new WebPageMapper("users/${user}/password", PasswordEditPage.class));+ }++ private void addGroupPages() {+ add(new WebPageMapper("groups/${group}/profile", GroupProfilePage.class));+ add(new WebPageMapper("groups/${group}/members", GroupMembershipsPage.class));+ add(new WebPageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class));+ }++ private void addProjectPages() {+ add(new WebPageMapper("projects/${project}", ProjectBlobPage.class));++ add(new WebPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {++ /*+ * This logic is added to prevent url "/projects/<project>" from being redirected to+ * "/projects/<project>/blob"+ */+ @Override+ public Url mapHandler(IRequestHandler requestHandler) {+ if (requestHandler instanceof BookmarkablePageRequestHandler+ || requestHandler instanceof RenderPageRequestHandler) {+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;+ if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class+ && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {+ return null;+ }+ }+ return super.mapHandler(requestHandler);+ }++ });+ add(new WebPageMapper("projects/${project}/commit/${revision}", CommitDetailPage.class));+ add(new WebPageMapper("projects/${project}/commits", ProjectCommitsPage.class));+ add(new WebPageMapper("projects/${project}/compare", RevisionComparePage.class));++ add(new WebPageMapper("projects/${project}/branches", ProjectBranchesPage.class));+ add(new WebPageMapper("projects/${project}/tags", ProjectTagsPage.class));++ add(new WebPageMapper("projects/${project}/pulls", RequestListPage.class));+ add(new WebPageMapper("projects/${project}/pulls/new", NewRequestPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}", RequestOverviewPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}/overview", RequestOverviewPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}/code-comments", RequestCodeCommentsPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}/changes", RequestChangesPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));++ add(new WebPageMapper("projects/${project}/settings/general", GeneralSettingPage.class));+ add(new WebPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));+ add(new WebPageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));+ add(new WebPageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));+ add(new WebPageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));++ add(new WebPageMapper("projects/${project}/no-branches", NoBranchesPage.class));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.javaindex 94bbdc7e8c..c737034618 100644--- a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java@@ -174,7 +174,7 @@ public class GitPlexWebApplication extends WebApplication {});- mount(new UrlMapper(this));+ mount(new GitPlexUrlMapper(this));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.javadeleted file mode 100644index d8935d512c..0000000000--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java+++ /dev/null@@ -1,227 +0,0 @@-package com.gitplex.server.web;--import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;-import org.apache.wicket.core.request.handler.IPageClassRequestHandler;-import org.apache.wicket.core.request.handler.RenderPageRequestHandler;-import org.apache.wicket.core.request.mapper.ResourceMapper;-import org.apache.wicket.protocol.http.WebApplication;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Request;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.mapper.CompoundRequestMapper;--import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorEffectivePrivilegePage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.server.web.page.account.members.MemberListPage;-import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.server.web.page.account.members.MemberTeamListPage;-import com.gitplex.server.web.page.account.members.NewMembersPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.account.overview.NewDepotPage;-import com.gitplex.server.web.page.account.overview.NewOrganizationPage;-import com.gitplex.server.web.page.account.setting.AvatarEditPage;-import com.gitplex.server.web.page.account.setting.PasswordEditPage;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;-import com.gitplex.server.web.page.account.tasks.TaskListPage;-import com.gitplex.server.web.page.account.teams.NewTeamPage;-import com.gitplex.server.web.page.account.teams.TeamDepotListPage;-import com.gitplex.server.web.page.account.teams.TeamEditPage;-import com.gitplex.server.web.page.account.teams.TeamListPage;-import com.gitplex.server.web.page.account.teams.TeamMemberListPage;-import com.gitplex.server.web.page.admin.DatabaseBackupPage;-import com.gitplex.server.web.page.admin.MailSettingPage;-import com.gitplex.server.web.page.admin.SecuritySettingPage;-import com.gitplex.server.web.page.admin.ServerInformationPage;-import com.gitplex.server.web.page.admin.ServerLogPage;-import com.gitplex.server.web.page.admin.SystemSettingPage;-import com.gitplex.server.web.page.admin.account.NewUserPage;-import com.gitplex.server.web.page.admin.account.UserListPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview.MergePreviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamAuthorizationPage;-import com.gitplex.server.web.page.depot.setting.branchprotection.BranchProtectionPage;-import com.gitplex.server.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;-import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.server.web.page.depot.setting.tagprotection.TagProtectionPage;-import com.gitplex.server.web.page.depot.tags.DepotTagsPage;-import com.gitplex.server.web.page.init.ServerInitPage;-import com.gitplex.server.web.page.init.WelcomePage;-import com.gitplex.server.web.page.layout.CreateDepotPage;-import com.gitplex.server.web.page.security.ForgetPage;-import com.gitplex.server.web.page.security.LoginPage;-import com.gitplex.server.web.page.security.LogoutPage;-import com.gitplex.server.web.page.security.RegisterPage;-import com.gitplex.server.web.page.test.TestPage;-import com.gitplex.server.web.util.mapper.DepotMapper;-import com.gitplex.server.web.util.mapper.DepotResourceMapper;-import com.gitplex.server.web.util.mapper.MapperUtils;-import com.gitplex.server.web.util.mapper.WebPageMapper;-import com.gitplex.server.web.util.resource.ArchiveResourceReference;-import com.gitplex.server.web.util.resource.AttachmentResourceReference;-import com.gitplex.server.web.util.resource.RawBlobResourceReference;-import com.gitplex.server.web.util.resource.ServerLogResourceReference;--public class UrlMapper extends CompoundRequestMapper {-- public UrlMapper(WebApplication app) {- add(new WebPageMapper("init", ServerInitPage.class));- add(new WebPageMapper("welcome", WelcomePage.class));- addAdministrationPages();- addAccountPages();- addDepotPages();- addSecurityPages();-- add(new WebPageMapper("test", TestPage.class));- add(new WebPageMapper("new-repository", CreateDepotPage.class));-- addResources();- }-- private void addResources() {- add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));- add(new DepotResourceMapper("${account}/${depot}/archive/${revision}", new ArchiveResourceReference()));- add(new DepotResourceMapper("${account}/${depot}/raw/${revision}/${path}", new RawBlobResourceReference()));- add(new DepotResourceMapper("${account}/${depot}/attachment/${uuid}/${attachment}",- new AttachmentResourceReference()));- }-- private void addSecurityPages() {- add(new WebPageMapper("login", LoginPage.class));- add(new WebPageMapper("logout", LogoutPage.class));- add(new WebPageMapper("register", RegisterPage.class));- add(new WebPageMapper("forget", ForgetPage.class));- }-- private void addAdministrationPages() {- add(new WebPageMapper("administration/users", UserListPage.class));- add(new WebPageMapper("administration/users/new", NewUserPage.class));- add(new WebPageMapper("administration/settings/system", SystemSettingPage.class));- add(new WebPageMapper("administration/settings/mail", MailSettingPage.class));- add(new WebPageMapper("administration/settings/backup", DatabaseBackupPage.class));- add(new WebPageMapper("administration/settings/security", SecuritySettingPage.class));- add(new WebPageMapper("administration/server-log", ServerLogPage.class));- add(new WebPageMapper("administration/server-information", ServerInformationPage.class));- }-- private void addAccountPages() {- add(new WebPageMapper("${account}", AccountOverviewPage.class) {-- @Override- public IRequestHandler mapRequest(Request request) {- if (MapperUtils.getAccountSegments(request.getUrl()) == 1)- return super.mapRequest(request);- else- return null;- }-- });-- add(new WebPageMapper("accounts/${account}/new-depot", NewDepotPage.class));- add(new WebPageMapper("accounts/${account}/new-organization", NewOrganizationPage.class));- add(new WebPageMapper("accounts/${account}/tasks", TaskListPage.class));- add(new WebPageMapper("accounts/${account}/settings/profile", ProfileEditPage.class));- add(new WebPageMapper("accounts/${account}/settings/avatar", AvatarEditPage.class));- add(new WebPageMapper("accounts/${account}/settings/password", PasswordEditPage.class));-- add(new WebPageMapper("accounts/${account}/members", MemberListPage.class));- add(new WebPageMapper("accounts/${account}/members/${member}/teams", MemberTeamListPage.class));- add(new WebPageMapper("accounts/${account}/members/${member}/depots", MemberEffectivePrivilegePage.class));- add(new WebPageMapper("accounts/${account}/members/${member}/depots/${depot}", MemberPrivilegeSourcePage.class));- add(new WebPageMapper("accounts/${account}/members/new", NewMembersPage.class));- add(new WebPageMapper("accounts/${account}/teams", TeamListPage.class));- add(new WebPageMapper("accounts/${account}/teams/new", NewTeamPage.class));- add(new WebPageMapper("accounts/${account}/teams/${team}/setting", TeamEditPage.class));- add(new WebPageMapper("accounts/${account}/teams/${team}/members", TeamMemberListPage.class));- add(new WebPageMapper("accounts/${account}/teams/${team}/depots", TeamDepotListPage.class));-- add(new WebPageMapper("accounts/${account}/collaborators", AccountCollaboratorListPage.class));- add(new WebPageMapper(- "accounts/${account}/collaborators/${collaborator}/depots",- CollaboratorDepotListPage.class));- add(new WebPageMapper(- "accounts/${account}/collaborators/${collaborator}/effective",- CollaboratorEffectivePrivilegePage.class));- add(new WebPageMapper(- "accounts/${account}/collaborators/${collaborator}/effective/${depot}",- CollaboratorPrivilegeSourcePage.class));- }-- private void addDepotPages() {- add(new WebPageMapper("${account}/${depot}", DepotBlobPage.class) {-- @Override- public IRequestHandler mapRequest(Request request) {- if (MapperUtils.getDepotSegments(request.getUrl()) == 2)- return super.mapRequest(request);- else- return null;- }-- });-- add(new DepotMapper("${account}/${depot}/blob/#{revision}/#{path}", DepotBlobPage.class) {-- /*- * This logic is added to prevent url "/<account>/<depot>" from being redirected to- * "/<account>/<depot>/blob"- */- @Override- public Url mapHandler(IRequestHandler requestHandler) {- if (requestHandler instanceof BookmarkablePageRequestHandler- || requestHandler instanceof RenderPageRequestHandler) {- IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;- if (pageClassRequestHandler.getPageClass() == DepotBlobPage.class- && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {- return null;- }- }- return super.mapHandler(requestHandler);- }-- });- add(new DepotMapper("${account}/${depot}/commit/${revision}", CommitDetailPage.class));- add(new DepotMapper("${account}/${depot}/commits", DepotCommitsPage.class));- add(new DepotMapper("${account}/${depot}/compare", RevisionComparePage.class));-- add(new DepotMapper("${account}/${depot}/branches", DepotBranchesPage.class));- add(new DepotMapper("${account}/${depot}/tags", DepotTagsPage.class));-- add(new DepotMapper("${account}/${depot}/pulls", RequestListPage.class));- add(new DepotMapper("${account}/${depot}/pulls/new", NewRequestPage.class));- add(new DepotMapper("${account}/${depot}/pulls/${request}", RequestOverviewPage.class));- add(new DepotMapper(- "${account}/${depot}/pulls/${request}/overview", RequestOverviewPage.class));- add(new DepotMapper(- "${account}/${depot}/pulls/${request}/code-comments", RequestCodeCommentsPage.class));- add(new DepotMapper(- "${account}/${depot}/pulls/${request}/changes", RequestChangesPage.class));- add(new DepotMapper(- "${account}/${depot}/pulls/${request}/merge-preview", MergePreviewPage.class));-- add(new DepotMapper("${account}/${depot}/settings/general", GeneralSettingPage.class));- add(new DepotMapper("${account}/${depot}/settings/team-authorization", DepotTeamAuthorizationPage.class));- add(new DepotMapper("${account}/${depot}/settings/collaborators", DepotCollaboratorListPage.class));- add(new DepotMapper("${account}/${depot}/settings/effective-privilege", DepotEffectivePrivilegePage.class));- add(new DepotMapper("${account}/${depot}/settings/branch-protection", BranchProtectionPage.class));- add(new DepotMapper("${account}/${depot}/settings/tag-protection", TagProtectionPage.class));- add(new DepotMapper("${account}/${depot}/settings/commit-message-transform", CommitMessageTransformPage.class));-- add(new DepotMapper("${account}/${depot}/no-branches", NoBranchesPage.class));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.javadeleted file mode 100644index b939ec7930..0000000000--- a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java+++ /dev/null@@ -1,89 +0,0 @@-package com.gitplex.server.web;--import java.lang.reflect.Field;-import java.util.Collections;-import java.util.HashSet;-import java.util.Set;--import javax.inject.Inject;-import javax.inject.Provider;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.core.request.mapper.MountedMapper;-import org.apache.wicket.core.request.mapper.ResourceMapper;-import org.apache.wicket.request.IRequestMapper;-import org.apache.wicket.request.mapper.ICompoundRequestMapper;-import org.eclipse.jetty.servlet.ServletContextHandler;-import org.eclipse.jetty.servlet.ServletMapping;--import com.gitplex.server.util.ReflectionUtils;-import com.gitplex.server.util.validation.AccountNameReservation;-import com.google.common.base.Preconditions;-import com.google.common.collect.Sets;--public class WebAccountNameReservation implements AccountNameReservation {-- private final Provider<ServletContextHandler> servletContextHandlerProvider;-- private final GitPlexWebApplication webApp;-- @Inject- public WebAccountNameReservation(Provider<ServletContextHandler> servletContextHandlerProvider, GitPlexWebApplication webApp) {- this.servletContextHandlerProvider = servletContextHandlerProvider;- this.webApp = webApp;- }-- @Override- public Set<String> getReserved() {- Set<String> reserved = new HashSet<String>();- for (ServletMapping mapping: servletContextHandlerProvider.get().getServletHandler().getServletMappings()) {- for (String pathSpec: mapping.getPathSpecs()) {- pathSpec = StringUtils.stripStart(pathSpec, "/");- pathSpec = StringUtils.substringBefore(pathSpec, "/");- if (pathSpec.trim().length() != 0)- reserved.add(pathSpec.trim());- }- }-- reserved.add("wicket");- reserved.add("new");- reserved.add(".");-- for (IRequestMapper mapper: webApp.getRequestMappers()) {- Set<String> set = getReservedNames(mapper);- reserved.addAll(set);- }-- return reserved;- }-- private Set<String> getReservedNames(IRequestMapper mapper) {- if (mapper instanceof MountedMapper || mapper instanceof ResourceMapper) {- try {- Field field = ReflectionUtils.findField(mapper.getClass(), "mountSegments");- Preconditions.checkNotNull(field);- field.setAccessible(true);- String[] mountSegments = (String[]) field.get(mapper);- if (mountSegments != null && mountSegments.length != 0 && mountSegments[0] != null)- return Collections.singleton(mountSegments[0]);- else- return Collections.emptySet();- } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }-- if (mapper instanceof ICompoundRequestMapper) {- ICompoundRequestMapper m = (ICompoundRequestMapper) mapper;- Set<String> result = Sets.newHashSet();- for (IRequestMapper each : m) {- Set<String> set = getReservedNames(each);- result.addAll(set);- }-- return result;- }-- return Collections.emptySet();- }-}diff --git a/web/src/main/java/com/gitplex/server/web/WebConstants.java b/web/src/main/java/com/gitplex/server/web/WebConstants.javaindex c03dfb725c..ffeaf53296 100644--- a/web/src/main/java/com/gitplex/server/web/WebConstants.java+++ b/web/src/main/java/com/gitplex/server/web/WebConstants.java@@ -11,7 +11,7 @@ public class WebConstants {public static final String DATE_FORMAT = "yyyy-MM-dd";public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern(DATE_FORMAT);- public static final int DEFAULT_PAGE_SIZE = 25;+ public static final int PAGE_SIZE = 25;/* diff constants */public static final int DIFF_EXPAND_SIZE = 15;diff --git a/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.javasimilarity index 59%rename from web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.javarename to web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.javaindex cc0877c04f..bc9c997791 100644--- a/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java+++ b/web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.java@@ -2,14 +2,14 @@ package com.gitplex.server.web;import java.util.Set;-import com.gitplex.server.util.validation.DepotNameReservation;+import com.gitplex.server.util.validation.GroupNameReservation;import com.google.common.collect.Sets;-public class WebDepotNameReservation implements DepotNameReservation {+public class WebGroupNameReservation implements GroupNameReservation {@Overridepublic Set<String> getReserved() {- return Sets.newHashSet("new"); // reserved for url segment when creating new depot+ return Sets.newHashSet("new"); // reserved for url segment when creating new group}}diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.javaindex 5f1b10dcaf..75c3fd33d9 100644--- a/web/src/main/java/com/gitplex/server/web/WebModule.java+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java@@ -21,9 +21,6 @@ import com.gitplex.launcher.loader.AbstractPluginModule;import com.gitplex.server.git.exception.GitException;import com.gitplex.server.manager.UrlManager;import com.gitplex.server.util.markdown.HtmlTransformer;-import com.gitplex.server.util.validation.AccountNameReservation;-import com.gitplex.server.util.validation.DepotNameReservation;-import com.gitplex.server.util.validation.TeamNameReservation;import com.gitplex.server.web.component.comment.MentionTransformer;import com.gitplex.server.web.component.comment.PullRequestTransformer;import com.gitplex.server.web.component.diff.DiffRenderer;@@ -33,7 +30,7 @@ import com.gitplex.server.web.editable.DefaultEditSupportRegistry;import com.gitplex.server.web.editable.EditSupport;import com.gitplex.server.web.editable.EditSupportLocator;import com.gitplex.server.web.editable.EditSupportRegistry;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;import com.gitplex.server.web.util.avatar.AvatarManager;import com.gitplex.server.web.util.avatar.DefaultAvatarManager;import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;@@ -74,10 +71,6 @@ public class WebModule extends AbstractPluginModule {bind(AvatarManager.class).to(DefaultAvatarManager.class);bind(WebSocketManager.class).to(DefaultWebSocketManager.class);- contribute(AccountNameReservation.class, WebAccountNameReservation.class);- contribute(DepotNameReservation.class, WebDepotNameReservation.class);- contribute(TeamNameReservation.class, WebTeamNameReservation.class);-contributeFromPackage(EditSupport.class, EditSupportLocator.class);bind(CommitIndexedBroadcaster.class);@@ -110,7 +103,7 @@ public class WebModule extends AbstractPluginModule {});- bind(UrlManager.class).to(WicketUrlManager.class);+ bind(UrlManager.class).to(DefaultUrlManager.class);bind(CodeCommentChangeBroadcaster.class);bind(PullRequestChangeBroadcaster.class);bind(TaskChangeBroadcaster.class);diff --git a/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.javadeleted file mode 100644index 156a6d3caa..0000000000--- a/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java+++ /dev/null@@ -1,15 +0,0 @@-package com.gitplex.server.web;--import java.util.Set;--import com.gitplex.server.util.validation.TeamNameReservation;-import com.google.common.collect.Sets;--public class WebTeamNameReservation implements TeamNameReservation {-- @Override- public Set<String> getReserved() {- return Sets.newHashSet("new"); // reserved for url segment when creating new team- }--}diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.jsindex 998d641812..edee82d556 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js+++ b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js@@ -91,7 +91,7 @@function changeOverflow(value) {{// Chrome/Safari-specific fix:- // When the textarea y-overflow is hidden, Chrome/Safari do not reflow the text to account for the space+ // When the textarea y-overflow is hidden, Chrome/Safari do not reflow the text to user for the space// made available by removing the scrollbar. The following forces the necessary text reflow.var width = ta.style.width;ta.style.width = '0px';diff --git a/web/src/main/java/com/gitplex/server/web/behavior/BranchPatternAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/BranchPatternAssistBehavior.javaindex 10d84683c6..1cf2744852 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/BranchPatternAssistBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/BranchPatternAssistBehavior.java@@ -10,7 +10,7 @@ import com.gitplex.codeassist.InputCompletion;import com.gitplex.codeassist.InputStatus;import com.gitplex.codeassist.InputSuggestion;import com.gitplex.jsymbol.Range;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;import com.google.common.collect.Lists;@@ -18,22 +18,22 @@ import com.google.common.collect.Lists;@SuppressWarnings("serial")public class BranchPatternAssistBehavior extends InputAssistBehavior {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public BranchPatternAssistBehavior(IModel<Depot> depotModel) {- this.depotModel = depotModel;+ public BranchPatternAssistBehavior(IModel<Project> projectModel) {+ this.projectModel = projectModel;}@Overridepublic void detach(Component component) {super.detach(component);- depotModel.detach();+ projectModel.detach();}@Overrideprotected List<InputCompletion> getSuggestions(InputStatus inputStatus) {List<InputCompletion> completions = new ArrayList<>();- for (InputSuggestion suggestion: SuggestionUtils.suggestBranch(depotModel.getObject(),+ for (InputSuggestion suggestion: SuggestionUtils.suggestBranch(projectModel.getObject(),inputStatus.getContentBeforeCaret().trim())) {int caret = suggestion.getCaret();if (caret == -1)diff --git a/web/src/main/java/com/gitplex/server/web/behavior/PathPatternAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/PathPatternAssistBehavior.javaindex 6f3037eece..63b616f58a 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/PathPatternAssistBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/PathPatternAssistBehavior.java@@ -10,7 +10,7 @@ import com.gitplex.codeassist.InputCompletion;import com.gitplex.codeassist.InputStatus;import com.gitplex.codeassist.InputSuggestion;import com.gitplex.jsymbol.Range;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;import com.google.common.collect.Lists;@@ -18,22 +18,22 @@ import com.google.common.collect.Lists;@SuppressWarnings("serial")public class PathPatternAssistBehavior extends InputAssistBehavior {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public PathPatternAssistBehavior(IModel<Depot> depotModel) {- this.depotModel = depotModel;+ public PathPatternAssistBehavior(IModel<Project> projectModel) {+ this.projectModel = projectModel;}@Overridepublic void detach(Component component) {super.detach(component);- depotModel.detach();+ projectModel.detach();}@Overrideprotected List<InputCompletion> getSuggestions(InputStatus inputStatus) {List<InputCompletion> completions = new ArrayList<>();- for (InputSuggestion suggestion: SuggestionUtils.suggestPath(depotModel.getObject(),+ for (InputSuggestion suggestion: SuggestionUtils.suggestPath(projectModel.getObject(),inputStatus.getContentBeforeCaret().trim())) {int caret = suggestion.getCaret();if (caret == -1)diff --git a/web/src/main/java/com/gitplex/server/web/behavior/TagPatternAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/TagPatternAssistBehavior.javaindex b077af2885..67cb7d1f8f 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/TagPatternAssistBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/TagPatternAssistBehavior.java@@ -10,7 +10,7 @@ import com.gitplex.codeassist.InputCompletion;import com.gitplex.codeassist.InputStatus;import com.gitplex.codeassist.InputSuggestion;import com.gitplex.jsymbol.Range;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;import com.google.common.collect.Lists;@@ -18,22 +18,22 @@ import com.google.common.collect.Lists;@SuppressWarnings("serial")public class TagPatternAssistBehavior extends InputAssistBehavior {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public TagPatternAssistBehavior(IModel<Depot> depotModel) {- this.depotModel = depotModel;+ public TagPatternAssistBehavior(IModel<Project> projectModel) {+ this.projectModel = projectModel;}@Overridepublic void detach(Component component) {super.detach(component);- depotModel.detach();+ projectModel.detach();}@Overrideprotected List<InputCompletion> getSuggestions(InputStatus inputStatus) {List<InputCompletion> completions = new ArrayList<>();- for (InputSuggestion suggestion: SuggestionUtils.suggestTag(depotModel.getObject(),+ for (InputSuggestion suggestion: SuggestionUtils.suggestTag(projectModel.getObject(),inputStatus.getContentBeforeCaret().trim())) {int caret = suggestion.getCaret();if (caret == -1)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 d7f40a5abd..44d5380496 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.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.util.DateUtils;@@ -24,7 +24,7 @@ public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {String tooltipId = params.getParameterValue("tooltip").toString();String commitHash = params.getParameterValue("commit").toString();- RevCommit commit = getDepot().getRevCommit(commitHash);+ RevCommit commit = getProject().getRevCommit(commitHash);String authoring;if (commit.getAuthorIdent() != null) {authoring = commit.getAuthorIdent().getName();@@ -45,7 +45,7 @@ public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {response.render(JavaScriptHeaderItem.forReference(new BlameMessageResourceReference()));}- protected abstract Depot getDepot();+ protected abstract Project getProject();public String getCallback() {return getCallbackFunction(explicit("tooltip"), explicit("commit")).toString();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.javadeleted file mode 100644index 1d4ef07bc0..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java+++ /dev/null@@ -1,65 +0,0 @@-package com.gitplex.server.web.component;--import java.util.Collection;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Depot;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.web.component.depotselector.DepotSelector;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;--@SuppressWarnings("serial")-public abstract class DepotPicker extends DropdownLink {-- private final IModel<Collection<Depot>> depotsModel;-- private Long currentDepotId;-- public DepotPicker(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {- super(id);-- this.depotsModel = depotsModel;- this.currentDepotId = currentDepotId;- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new DepotSelector(id, depotsModel, currentDepotId) {-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- dropdown.close();- target.add(DepotPicker.this);- DepotPicker.this.onSelect(target, depot);- }-- };- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setEscapeModelStrings(false);- }-- @Override- public IModel<?> getBody() {- Depot currentDepot = GitPlex.getInstance(Dao.class).load(Depot.class, currentDepotId);- return Model.of(String.format("<i class='fa fa-ext fa-repo'></i> <span>%s</span> <i class='fa fa-caret-down'></i>", currentDepot.getFQN()));- }-- @Override- protected void onDetach() {- depotsModel.detach();- super.onDetach();- }-- protected abstract void onSelect(AjaxRequestTarget target, Depot depot);-}diff --git a/web/src/main/java/com/gitplex/server/web/component/ProjectPicker.java b/web/src/main/java/com/gitplex/server/web/component/ProjectPicker.javanew file mode 100644index 0000000000..b8eb92dcde--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/ProjectPicker.java@@ -0,0 +1,66 @@+package com.gitplex.server.web.component;++import java.util.Collection;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import com.gitplex.server.GitPlex;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.web.component.projectselector.ProjectSelector;+import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;++@SuppressWarnings("serial")+public abstract class ProjectPicker extends DropdownLink {++ private final IModel<Collection<Project>> projectsModel;++ private Long currentProjectId;++ public ProjectPicker(String id, IModel<Collection<Project>> projectsModel, Long currentProjectId) {+ super(id);++ this.projectsModel = projectsModel;+ this.currentProjectId = currentProjectId;+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectSelector(id, projectsModel, currentProjectId) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project) {+ dropdown.close();+ target.add(ProjectPicker.this);+ ProjectPicker.this.onSelect(target, project);+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setEscapeModelStrings(false);+ }++ @Override+ public IModel<?> getBody() {+ Project currentProject = GitPlex.getInstance(Dao.class).load(Project.class, currentProjectId);+ return Model.of(String.format("<i class='fa fa-ext fa-repo'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",+ currentProject.getName()));+ }++ @Override+ protected void onDetach() {+ projectsModel.detach();+ super.onDetach();+ }++ protected abstract void onSelect(AjaxRequestTarget target, Project project);+}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.javadeleted file mode 100644index 1b7d835222..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java+++ /dev/null@@ -1,72 +0,0 @@-package com.gitplex.server.web.component.accountchoice;--import java.util.ArrayList;-import java.util.Comparator;-import java.util.List;--import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.privilege.DepotPrivilege;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.util.WicketUtils;--public class AccountChoiceProvider extends AbstractAccountChoiceProvider {-- private static final long serialVersionUID = 1L;-- private final AccountChoice.Type type;-- public AccountChoiceProvider(AccountChoice.Type type) {- this.type = type;- }-- @Override- public void query(String term, int page, Response<Account> response) {- if (type == AccountChoice.Type.ORGANIZATION || type == AccountChoice.Type.USER) {- Dao dao = GitPlex.getInstance(Dao.class);- int first = page * WebConstants.DEFAULT_PAGE_SIZE;- Criterion criterion = Restrictions.and(Restrictions.or(- Restrictions.ilike("name", term, MatchMode.ANYWHERE),- Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)));- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);- criteria.add(criterion);- criteria.add(Restrictions.eq("organization", type == AccountChoice.Type.ORGANIZATION));- criteria.addOrder(Order.asc("name"));- List<Account> accounts = dao.findRange(criteria, first, WebConstants.DEFAULT_PAGE_SIZE + 1);-- if (accounts.size() <= WebConstants.DEFAULT_PAGE_SIZE) {- response.addAll(accounts);- } else {- response.addAll(accounts.subList(0, WebConstants.DEFAULT_PAGE_SIZE));- response.setHasMore(true);- }- } else {- Depot depot = ((DepotPage) WicketUtils.getPage()).getDepot();- List<Account> choices;- if (type == AccountChoice.Type.DEPOT_READER)- choices = new ArrayList<Account>(SecurityUtils.findUsersCan(depot, DepotPrivilege.READ));- else if (type == AccountChoice.Type.DEPOT_WRITER)- choices = new ArrayList<Account>(SecurityUtils.findUsersCan(depot, DepotPrivilege.WRITE));- else- choices = new ArrayList<Account>(SecurityUtils.findUsersCan(depot, DepotPrivilege.ADMIN));-- choices.sort(Comparator.comparing(Account::getName));-- new ResponseFiller<Account>(response).fill(choices, page, WebConstants.DEFAULT_PAGE_SIZE);- }- }--}\ No newline at end of filediff --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.javadeleted file mode 100644index aa17ee8a5c..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java+++ /dev/null@@ -1,38 +0,0 @@-package com.gitplex.server.web.component.accountchoice;--import java.util.Collection;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.server.web.component.select2.Select2MultiChoice;--public class AccountMultiChoice extends Select2MultiChoice<Account> {-- private static final long serialVersionUID = 1L;-- public AccountMultiChoice(String id, IModel<Collection<Account>> model,- AbstractAccountChoiceProvider choiceProvider) {- super(id, model, choiceProvider);- }-- @Override- protected void onInitialize() {- super.onInitialize();- getSettings().setPlaceholder("Choose accounts ...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }--}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.javadeleted file mode 100644index e8958555f3..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java+++ /dev/null@@ -1,60 +0,0 @@-package com.gitplex.server.web.component.accountchoice;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import com.google.common.base.Preconditions;-import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.select2.ResponseFiller;--public class AdministrativeAccountChoiceProvider extends AbstractAccountChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public void query(String term, int page, Response<Account> response) {- Account loginUser = Preconditions.checkNotNull(SecurityUtils.getAccount());- int pageSize = WebConstants.DEFAULT_PAGE_SIZE;- if (loginUser.isAdministrator()) {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- int first = page * pageSize;- Criterion criterion = Restrictions.and(Restrictions.or(- Restrictions.ilike("name", term, MatchMode.ANYWHERE),- Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)));- List<Account> accounts = accountManager.findRange(accountManager.newCriteria()- .add(criterion).addOrder(Order.asc("name")), first, pageSize + 1);-- if (accounts.size() <= pageSize) {- response.addAll(accounts);- } else {- response.addAll(accounts.subList(0, pageSize));- response.setHasMore(true);- }- } else {- List<Account> accounts = new ArrayList<>();- if (loginUser.matches(term))- accounts.add(loginUser);- for (OrganizationMembership membership: loginUser.getOrganizations()) {- if (membership.isAdmin() && membership.getOrganization().matches(term))- accounts.add(membership.getOrganization());- }-- Collections.sort(accounts);-- new ResponseFiller<Account>(response).fill(accounts, page, pageSize);- }- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.js b/web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.jsdeleted file mode 100644index 972304a9be..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.js+++ /dev/null@@ -1,21 +0,0 @@-gitplex.server.accountChoiceFormatter = {- formatSelection: function(account) {- return "<img class='avatar' src='" + account.avatar + "'/>" + account.name;- },-- formatResult: function(account) {- if (!account.alias) {- return "<div class='account'>" +- "<img class='avatar' src='" + account.avatar + "'/>" +- "<span class='name'>"+ account.name + "</span>" +- "</div>";- } else {- return "<i><<" + account.alias + ">></i>";- }- },-- escapeMarkup: function(m) {- return m;- },--};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 3da3ca9d96..e9791af6a2 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@@ -10,29 +10,29 @@ import org.apache.wicket.markup.html.WebComponent;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class Avatar extends WebComponent {- private final Long accountId;+ private final Long userId;private String url;- public Avatar(String id, @Nullable Account account) {+ public Avatar(String id, @Nullable User user) {super(id);AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- if (account == null) {- accountId = null;- } else if (account.getId() == null) {- accountId = null;+ if (user == null) {+ userId = null;+ } else if (user.getId() == null) {+ userId = null;} else {- accountId = account.getId();+ userId = user.getId();}- url = avatarManager.getAvatarUrl(account);+ url = avatarManager.getAvatarUrl(user);}public Avatar(String id, PersonIdent person) {@@ -40,12 +40,12 @@ public class Avatar extends WebComponent {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- Account account = GitPlex.getInstance(AccountManager.class).find(person);- if (account != null) {- accountId = account.getId();- url = avatarManager.getAvatarUrl(account);+ User user = GitPlex.getInstance(UserManager.class).find(person);+ if (user != null) {+ userId = user.getId();+ url = avatarManager.getAvatarUrl(user);} else {- accountId = null;+ userId = null;url = avatarManager.getAvatarUrl(person);}}@@ -56,9 +56,9 @@ public class Avatar extends WebComponent {if (event.getPayload() instanceof AvatarChanged) {AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();- if (avatarChanged.getAccount().getId().equals(accountId)) {+ if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getAccount());+ url = avatarManager.getAvatarUrl(avatarChanged.getUser());avatarChanged.getHandler().add(this);}}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 42254043ef..b089f0853a 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,21 +2,21 @@ package com.gitplex.server.web.component.avatar;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.web.util.AjaxPayload;public class AvatarChanged extends AjaxPayload {- private final Account account;+ private final User user;- public AvatarChanged(AjaxRequestTarget target, Account account) {+ public AvatarChanged(AjaxRequestTarget target, User user) {super(target);- this.account = account;+ this.user = user;}- public Account getAccount() {- return account;+ public User getUser() {+ return user;}}\ No newline at end of filediff --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 ebd6911c69..2f29116a10 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@@ -12,12 +12,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.AccountPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.user.UserPage;+import com.gitplex.server.web.page.user.UserProfilePage;import com.gitplex.server.web.util.avatar.AvatarManager;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;@@ -25,7 +25,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig@SuppressWarnings("serial")public class AvatarLink extends ViewStateAwarePageLink<Void> {- private final Long accountId;+ private final Long userId;private final PageParameters params;@@ -33,33 +33,33 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {private String url;- public AvatarLink(String id, @Nullable Account account) {- this(id, account, false);+ public AvatarLink(String id, @Nullable User user) {+ this(id, user, false);}- public AvatarLink(String id, @Nullable Account account, boolean showTooltip) {- super(id, AccountOverviewPage.class);+ public AvatarLink(String id, @Nullable User user, boolean showTooltip) {+ super(id, UserProfilePage.class);AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- if (account == null) {- accountId = null;+ if (user == null) {+ userId = null;params = new PageParameters();- } else if (account.getId() == null) {- accountId = null;+ } else if (user.getId() == null) {+ userId = null;params = new PageParameters();} else {- accountId = account.getId();- params = AccountPage.paramsOf(account);+ userId = user.getId();+ params = UserPage.paramsOf(user);}if (showTooltip) {- if (account != null)- tooltip = account.getDisplayName();+ if (user != null)+ tooltip = user.getDisplayName();elsetooltip = GitPlex.NAME;} else {tooltip = null;}- url = avatarManager.getAvatarUrl(account);+ url = avatarManager.getAvatarUrl(user);}public AvatarLink(String id, PersonIdent person) {@@ -67,17 +67,17 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {}public AvatarLink(String id, PersonIdent person, boolean showTooltip) {- super(id, AccountOverviewPage.class);+ super(id, UserProfilePage.class);AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- Account account = GitPlex.getInstance(AccountManager.class).find(person);- if (account != null) {- accountId = account.getId();- params = AccountPage.paramsOf(account);- url = avatarManager.getAvatarUrl(account);+ User user = GitPlex.getInstance(UserManager.class).find(person);+ if (user != null) {+ userId = user.getId();+ params = UserPage.paramsOf(user);+ url = avatarManager.getAvatarUrl(user);} else {- accountId = null;+ userId = null;params = new PageParameters();url = avatarManager.getAvatarUrl(person);}@@ -104,9 +104,9 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {if (event.getPayload() instanceof AvatarChanged) {AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();- if (avatarChanged.getAccount().getId().equals(accountId)) {+ if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getAccount());+ url = avatarManager.getAvatarUrl(avatarChanged.getUser());avatarChanged.getHandler().add(this);}}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 e4cc97fb36..51755d1618 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@@ -12,7 +12,7 @@ import org.json.JSONWriter;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.component.select2.Response;@@ -20,18 +20,18 @@ import com.gitplex.server.web.component.select2.Response;@SuppressWarnings("serial")public class BranchChoiceProvider extends ChoiceProvider<String> {- private IModel<Depot> depotModel;+ private IModel<Project> projectModel;- public BranchChoiceProvider(IModel<Depot> depotModel) {- this.depotModel = depotModel;+ public BranchChoiceProvider(IModel<Project> projectModel) {+ this.projectModel = projectModel;}@Overridepublic void query(String term, int page, Response<String> response) {term = term.toLowerCase();List<String> branches = new ArrayList<>();- Depot depot = depotModel.getObject();- for (RefInfo ref: depot.getBranches()) {+ Project project = projectModel.getObject();+ for (RefInfo ref: project.getBranches()) {String branch = GitUtils.ref2branch(ref.getRef().getName());if (branch.toLowerCase().startsWith(term))branches.add(branch);@@ -39,8 +39,8 @@ public class BranchChoiceProvider extends ChoiceProvider<String> {Collections.sort(branches);- int first = page * WebConstants.DEFAULT_PAGE_SIZE;- int last = first + WebConstants.DEFAULT_PAGE_SIZE;+ int first = page * WebConstants.PAGE_SIZE;+ int last = first + WebConstants.PAGE_SIZE;response.setHasMore(last<branches.size());if (last > branches.size())last = branches.size();@@ -64,7 +64,7 @@ public class BranchChoiceProvider extends ChoiceProvider<String> {@Overridepublic void detach() {- depotModel.detach();+ projectModel.detach();super.detach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.css b/web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.cssindex 1d636f30da..6e52bc3d23 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.css+++ b/web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.css@@ -1,17 +1,17 @@-.repository-and-branch {+.project-and-branch {width: 100%;}-.repository-and-branch td {+.project-and-branch td {padding: 12px;white-space: nowrap;}-.repository-and-branch td.name {+.project-and-branch td.name {text-align: right;padding-right: 0;font-size: 16px;width: 1%;padding-top: 16px;}-.repository-and-branch .select2-choice {+.project-and-branch .select2-choice {width: 100%;}diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.html b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.htmlindex 78dde41d69..1a11c140ef 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.html+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.html@@ -1,6 +1,6 @@<wicket:panel>- <span class="repository-and-branch">- <a wicket:id="repositoryPicker" class="repository btn btn-xs btn-default"></a>+ <span class="project-and-branch">+ <a wicket:id="projectPicker" class="project btn btn-xs btn-default"></a><a wicket:id="branchPicker" class="branch btn btn-xs btn-default"></a></span></wicket:panel>\ No newline at end of filediff --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 93e41ecced..8df92b35fe 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,38 +9,38 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.web.component.DepotPicker;-import com.gitplex.server.web.util.model.AffinalDepotsModel;+import com.gitplex.server.web.component.ProjectPicker;+import com.gitplex.server.web.util.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalBranchPicker extends Panel {- private Long depotId;+ private Long projectId;private String branch;public AffinalBranchPicker(String id, Long repoId, String branch) {super(id);- this.depotId = repoId;+ this.projectId = repoId;this.branch = branch;}private void newBranchPicker(@Nullable AjaxRequestTarget target) {- BranchPicker branchPicker = new BranchPicker("branchPicker", new LoadableDetachableModel<Depot>() {+ BranchPicker branchPicker = new BranchPicker("branchPicker", new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- return getDepot();+ protected Project load() {+ return getProject();}}, branch) {@Overrideprotected void onSelect(AjaxRequestTarget target, String branch) {- AffinalBranchPicker.this.onSelect(target, getDepot(), branch);+ AffinalBranchPicker.this.onSelect(target, getProject(), branch);}};@@ -52,22 +52,22 @@ public abstract class AffinalBranchPicker extends Panel {}}- private Depot getDepot() {- return GitPlex.getInstance(Dao.class).load(Depot.class, depotId);+ private Project getProject() {+ return GitPlex.getInstance(Dao.class).load(Project.class, projectId);}@Overrideprotected void onInitialize() {super.onInitialize();- add(new DepotPicker("repositoryPicker", new AffinalDepotsModel(depotId), depotId) {+ add(new ProjectPicker("projectPicker", new AffinalProjectsModel(projectId), projectId) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- depotId = depot.getId();- branch = depot.getDefaultBranch();+ protected void onSelect(AjaxRequestTarget target, Project project) {+ projectId = project.getId();+ branch = project.getDefaultBranch();newBranchPicker(target);- AffinalBranchPicker.this.onSelect(target, depot, branch);+ AffinalBranchPicker.this.onSelect(target, project, branch);}});@@ -82,6 +82,6 @@ public abstract class AffinalBranchPicker extends Panel {response.render(CssHeaderItem.forReference(new BranchPickerResourceReference()));}- protected abstract void onSelect(AjaxRequestTarget target, Depot depot, String branch);+ protected abstract void onSelect(AjaxRequestTarget target, Project project, String branch);}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 3e45251a7a..b2bd75fe1e 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,27 +6,27 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")public abstract class BranchPicker extends DropdownLink {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private String branch;- public BranchPicker(String id, IModel<Depot> depotModel, String branch) {+ public BranchPicker(String id, IModel<Project> projectModel, String branch) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.branch = branch;}@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new BranchSelector(id, depotModel, branch) {+ return new BranchSelector(id, projectModel, branch) {@Overrideprotected void onSelect(AjaxRequestTarget target, String branch) {@@ -55,7 +55,7 @@ public abstract class BranchPicker extends DropdownLink {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 530bbc23a6..a1a5d17d16 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@@ -26,7 +26,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -34,7 +34,7 @@ import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class BranchSelector extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String branch;@@ -50,13 +50,13 @@ public abstract class BranchSelector extends Panel {private final List<String> filteredBranches = new ArrayList<>();- public BranchSelector(String id, IModel<Depot> depotModel, String branch) {+ public BranchSelector(String id, IModel<Project> projectModel, String branch) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.branch = branch;- for (RefInfo ref: depotModel.getObject().getBranches())+ for (RefInfo ref: projectModel.getObject().getBranches())branches.add(GitUtils.ref2branch(ref.getRef().getName()));filteredBranches.addAll(branches);@@ -169,7 +169,7 @@ public abstract class BranchSelector extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.css b/web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.cssindex f2f02a039f..3a9b9127a2 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.css+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.css@@ -1,7 +1,7 @@-.repository-and-branch {+.project-and-branch {white-space: nowrap;}-.repository-and-branch>a {+.project-and-branch>a {color: #444;text-decoration: none;font-size: 16px;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 384df57806..3de047743f 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@@ -41,22 +41,22 @@ 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.User;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.Project;import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ClassUtils;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.component.markdown.ContentVersionSupport;import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;@@ -104,9 +104,9 @@ public abstract class CodeCommentPanel extends Panel {}));- Account userForDisplay = Account.getForDisplay(getComment().getUser(), getComment().getUserName());+ User userForDisplay = User.getForDisplay(getComment().getUser(), getComment().getUserName());commentContainer.add(new AvatarLink("userAvatar", userForDisplay));- commentContainer.add(new AccountLink("userName", userForDisplay));+ commentContainer.add(new UserLink("userName", userForDisplay));commentContainer.add(new Label("activityDescription", "commented"));commentContainer.add(new Label("activityDate", DateUtils.formatAge(getComment().getDate())));@@ -159,12 +159,12 @@ public abstract class CodeCommentPanel extends Panel {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());+ return new ProjectAttachmentSupport(getComment().getRequest().getTargetProject(), getComment().getUUID());}@Override- protected Depot getDepot() {- return getComment().getRequest().getTargetDepot();+ protected Project getProject() {+ return getComment().getRequest().getTargetProject();}@Override@@ -271,9 +271,9 @@ public abstract class CodeCommentPanel extends Panel {activityContainer.setMarkupId(activity.getAnchor());activityContainer.add(AttributeAppender.append("name", activity.getAnchor()));- Account userForDisplay = Account.getForDisplay(activity.getUser(), activity.getUserName());+ User userForDisplay = User.getForDisplay(activity.getUser(), activity.getUserName());activityContainer.add(new AvatarLink("userAvatar", userForDisplay));- activityContainer.add(new AccountLink("userName", userForDisplay));+ activityContainer.add(new UserLink("userName", userForDisplay));String activityDescription;if (activity instanceof CodeCommentStatusChange) {@@ -348,12 +348,12 @@ public abstract class CodeCommentPanel extends Panel {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());+ return new ProjectAttachmentSupport(getComment().getRequest().getTargetProject(), getComment().getUUID());}@Override- protected Depot getDepot() {- return getComment().getRequest().getTargetDepot();+ protected Project getProject() {+ return getComment().getRequest().getTargetProject();}@Override@@ -460,7 +460,7 @@ public abstract class CodeCommentPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.getAccount() != null);+ setVisible(SecurityUtils.getUser() != null);}};@@ -498,7 +498,7 @@ public abstract class CodeCommentPanel extends Panel {super.onConfigure();CodeComment comment = getComment();- if (getPage() instanceof DepotBlobPage) {+ if (getPage() instanceof ProjectBlobPage) {setVisible(comment.isCodeChanged());} else if (getPage() instanceof RequestChangesPage) {RequestChangesPage page = (RequestChangesPage) getPage();@@ -615,8 +615,8 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onEndRequest(RequestCycle cycle) {- if (SecurityUtils.getAccount() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getComment());+ if (SecurityUtils.getUser() != null) {+ GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getUser(), getComment());}}@@ -649,12 +649,12 @@ public abstract class CodeCommentPanel extends Panel {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());+ return new ProjectAttachmentSupport(getComment().getRequest().getTargetProject(), getComment().getUUID());}@Override- protected Depot getDepot() {- return getComment().getRequest().getTargetDepot();+ protected Project getProject() {+ return getComment().getRequest().getTargetProject();}@Override@@ -707,7 +707,7 @@ public abstract class CodeCommentPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Account user = SecurityUtils.getAccount();+ User user = SecurityUtils.getUser();CodeComment comment = getComment();Date date = new Date();if (changeStatus) {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 04e3021722..e62697aef3 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@@ -10,13 +10,13 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.component.markdown.MarkdownEditor;import com.gitplex.server.web.component.markdown.PullRequestReferenceSupport;@@ -34,9 +34,9 @@ public abstract class CommentInput extends MarkdownEditor {return new UserMentionSupport() {@Override- public List<Account> findUsers(String query, int count) {- List<Account> users = new ArrayList<>();- for (Account user: SecurityUtils.findUsersCan(getDepot(), DepotPrivilege.READ)) {+ public List<User> findUsers(String query, int count) {+ List<User> users = new ArrayList<>();+ for (User user: SecurityUtils.findUsersCan(getProject(), ProjectPrivilege.READ)) {if (users.size() < count) {if (StringUtils.deleteWhitespace(user.getName()).toLowerCase().contains(query)|| user.getFullName() != null && StringUtils.deleteWhitespace(user.getFullName()).toLowerCase().contains(query)) {@@ -46,7 +46,7 @@ public abstract class CommentInput extends MarkdownEditor {break;}}- users.sort(Comparator.comparing(Account::getName));+ users.sort(Comparator.comparing(User::getName));return users;}@@ -60,7 +60,7 @@ public abstract class CommentInput extends MarkdownEditor {@Overridepublic List<PullRequest> findRequests(String query, int count) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(Restrictions.eq("targetDepot", getDepot()));+ criteria.add(Restrictions.eq("targetProject", getProject()));if (StringUtils.isNotBlank(query)) {query = StringUtils.deleteWhitespace(query);criteria.add(Restrictions.or(@@ -74,6 +74,6 @@ public abstract class CommentInput extends MarkdownEditor {};}- protected abstract Depot getDepot();+ protected abstract Project getProject();}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 deca1dea49..448441b171 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,10 +3,10 @@ package com.gitplex.server.web.component.comment;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Element;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.util.markdown.HtmlTransformer;import com.gitplex.server.util.markdown.MentionParser;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.user.UserProfilePage;public class MentionTransformer extends MentionParser implements HtmlTransformer {@@ -16,10 +16,10 @@ public class MentionTransformer extends MentionParser implements HtmlTransformer}@Override- protected String toHtml(Account user) {+ protected String toHtml(User user) {if (RequestCycle.get() != null) {return String.format("<a href='%s' class='mention'>@%s</a>",- RequestCycle.get().urlFor(AccountOverviewPage.class, AccountOverviewPage.paramsOf(user)), user.getName());+ RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user)), user.getName());} else {return super.toHtml(user);}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/ProjectAttachmentSupport.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.javarename to web/src/main/java/com/gitplex/server/web/component/comment/ProjectAttachmentSupport.javaindex f4f5ed8801..55d0758a56 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/ProjectAttachmentSupport.java@@ -12,8 +12,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.AttachmentManager;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;@@ -24,7 +24,7 @@ import com.google.common.base.Preconditions;import jersey.repackaged.com.google.common.base.Throwables;-public class DepotAttachmentSupport implements AttachmentSupport {+public class ProjectAttachmentSupport implements AttachmentSupport {private static final long serialVersionUID = 1L;@@ -32,25 +32,25 @@ public class DepotAttachmentSupport implements AttachmentSupport {private static final int BUFFER_SIZE = 1024*64;- private final Long depotId;+ private final Long projectId;private final String attachmentDirUUID;- public DepotAttachmentSupport(Depot depot, String attachmentDirUUID) {- depotId = depot.getId();+ public ProjectAttachmentSupport(Project project, String attachmentDirUUID) {+ projectId = project.getId();this.attachmentDirUUID = attachmentDirUUID;}@Overridepublic String getAttachmentUrl(String attachment) {- PageParameters params = AttachmentResource.paramsOf(getDepot(), attachmentDirUUID, attachment);+ PageParameters params = AttachmentResource.paramsOf(getProject(), attachmentDirUUID, attachment);return RequestCycle.get().urlFor(new AttachmentResourceReference(), params).toString();}@Overridepublic List<String> getAttachments() {List<String> attachments = new ArrayList<>();- File attachmentDir = GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getDepot(), attachmentDirUUID);+ File attachmentDir = GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);if (attachmentDir.exists()) {for (File file: attachmentDir.listFiles())attachments.add(file.getName());@@ -59,12 +59,12 @@ public class DepotAttachmentSupport implements AttachmentSupport {}private File getAttachmentDir() {- return GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getDepot(), attachmentDirUUID);+ return GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);}@Overridepublic void deleteAttachemnt(String attachment) {- File attachmentDir = GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getDepot(), attachmentDirUUID);+ File attachmentDir = GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID);FileUtils.deleteFile(new File(attachmentDir, attachment));}@@ -73,13 +73,13 @@ public class DepotAttachmentSupport implements AttachmentSupport {return MAX_FILE_SIZE;}- private Depot getDepot() {- return GitPlex.getInstance(DepotManager.class).load(depotId);+ private Project getProject() {+ return GitPlex.getInstance(ProjectManager.class).load(projectId);}@Overridepublic String saveAttachment(String suggestedAttachmentName, InputStream attachmentStream) {- Preconditions.checkState(SecurityUtils.canRead(getDepot()));+ Preconditions.checkState(SecurityUtils.canRead(getProject()));String attachmentName = suggestedAttachmentName;File attachmentDir = getAttachmentDir();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 e999eae863..27a1ae7f22 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@@ -6,7 +6,7 @@ import org.jsoup.nodes.Element;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;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;public class PullRequestTransformer extends PullRequestParser implements HtmlTransformer {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 ccd936fc93..9255933c7b 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@@ -28,7 +28,7 @@ import org.joda.time.DateTime;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.ContributorAvatars;@@ -37,31 +37,31 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;import com.gitplex.server.web.util.model.CommitRefsModel;@SuppressWarnings("serial")public class CommitListPanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<List<RevCommit>> commitsModel;- private final IModel<Map<String, List<String>>> labelsModel = new CommitRefsModel(new AbstractReadOnlyModel<Depot>() {+ private final IModel<Map<String, List<String>>> labelsModel = new CommitRefsModel(new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return depotModel.getObject();+ public Project getObject() {+ return projectModel.getObject();}});private WebMarkupContainer container;- public CommitListPanel(String id, IModel<Depot> depotModel, IModel<List<RevCommit>> commitsModel) {+ public CommitListPanel(String id, IModel<Project> projectModel, IModel<List<RevCommit>> commitsModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.commitsModel = new LoadableDetachableModel<List<RevCommit>>() {@Override@@ -129,7 +129,7 @@ public class CommitListPanel extends Panel {fragment.add(new ContributorAvatars("avatar",commit.getAuthorIdent(), commit.getCommitterIdent()));- fragment.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));+ fragment.add(new ExpandableCommitMessagePanel("message", projectModel, item.getModel()));RepeatingView labelsView = new RepeatingView("labels");@@ -145,16 +145,16 @@ public class CommitListPanel extends Panel {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- DepotBlobPage.State browseState = new DepotBlobPage.State(+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(new BlobIdent(commit.name(), null, FileMode.TYPE_TREE));- params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);- fragment.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));+ params = ProjectBlobPage.paramsOf(projectModel.getObject(), browseState);+ fragment.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));item.add(AttributeAppender.append("class", "commit clearfix commit-item-" + itemIndex++));} else {@@ -202,7 +202,7 @@ public class CommitListPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();commitsModel.detach();super.onDetach();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 41e8ff73d4..e1de485609 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,27 +6,27 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.unbescape.html.HtmlEscape;import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;@SuppressWarnings("serial")public class CommitMessageLabel extends Label {- public CommitMessageLabel(String id, IModel<Depot> depotModel, IModel<String> messageModel) {+ public CommitMessageLabel(String id, IModel<Project> projectModel, IModel<String> messageModel) {super(id, new LoadableDetachableModel<String>() {@Overrideprotected String load() {String message = HtmlEscape.escapeHtml5(messageModel.getObject());for (CommitMessageTransformer transformer: GitPlex.getExtensions(CommitMessageTransformer.class)) {- message = transformer.transform(depotModel.getObject(), message);+ message = transformer.transform(projectModel.getObject(), message);}return message;}@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();messageModel.detach();super.onDetach();}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 de5d7ecb8a..d62dfd2462 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,32 +17,32 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.html.HtmlEscape;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.Highlighter;import com.gitplex.server.util.Transformer;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;@SuppressWarnings("serial")public class ExpandableCommitMessagePanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<RevCommit> commitModel;private final IModel<List<Pattern>> patternsModel;- public ExpandableCommitMessagePanel(String id, IModel<Depot> depotModel,+ public ExpandableCommitMessagePanel(String id, IModel<Project> projectModel,IModel<RevCommit> commitModel, IModel<List<Pattern>> patternsModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.commitModel = commitModel;this.patternsModel = patternsModel;}- public ExpandableCommitMessagePanel(String id, IModel<Depot> depotModel, IModel<RevCommit> commitModel) {- this(id, depotModel, commitModel, new LoadableDetachableModel<List<Pattern>>() {+ public ExpandableCommitMessagePanel(String id, IModel<Project> projectModel, IModel<RevCommit> commitModel) {+ this(id, projectModel, commitModel, new LoadableDetachableModel<List<Pattern>>() {@Overrideprotected List<Pattern> load() {@@ -76,7 +76,7 @@ public class ExpandableCommitMessagePanel extends Panel {AbstractLink link = new ViewStateAwarePageLink<Void>("link",CommitDetailPage.class,- CommitDetailPage.paramsOf(depotModel.getObject(), commitModel.getObject().name()));+ CommitDetailPage.paramsOf(projectModel.getObject(), commitModel.getObject().name()));add(link);link.add(new Label("label", new AbstractReadOnlyModel<String>() {@@ -124,7 +124,7 @@ public class ExpandableCommitMessagePanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();commitModel.detach();patternsModel.detach();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.javadeleted file mode 100644index f3d05244b2..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java+++ /dev/null@@ -1,37 +0,0 @@-package com.gitplex.server.web.component.confirmdelete;--import org.apache.wicket.ajax.AjaxRequestTarget;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;--@SuppressWarnings("serial")-public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {-- public ConfirmDeleteAccountModal(AjaxRequestTarget target) {- super(target);- }-- @Override- protected void doDelete(AjaxRequestTarget target) {- GitPlex.getInstance(AccountManager.class).delete(getAccount());- getSession().success("Account has been deleted");-- onDeleted(target);- }-- @Override- protected String getConfirmInput() {- return getAccount().getName();- }-- @Override- protected String getWarningMessage() {- return "please input account name \"" + getAccount().getName() + "\" below to confirm deletion.";- }-- protected abstract void onDeleted(AjaxRequestTarget target);-- protected abstract Account getAccount();-}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.javadeleted file mode 100644index c1ce34dc0e..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java+++ /dev/null@@ -1,41 +0,0 @@-package com.gitplex.server.web.component.confirmdelete;--import org.apache.wicket.ajax.AjaxRequestTarget;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;--@SuppressWarnings("serial")-public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {-- public ConfirmDeleteDepotModal(AjaxRequestTarget target) {- super(target);- }-- @Override- protected void doDelete(AjaxRequestTarget target) {- Depot depot = getDepot();-- GitPlex.getInstance(DepotManager.class).delete(depot);- getSession().success("Repository has been deleted");-- onDeleted(target);- }-- protected abstract void onDeleted(AjaxRequestTarget target);-- @Override- protected String getWarningMessage() {- return "Everything inside this repository will be deleted and can not be recovered, "- + "please input repository name \"" + getDepot().getName() + "\" below to confirm deletion.";- }-- @Override- protected String getConfirmInput() {- return getDepot().getName();- }-- protected abstract Depot getDepot();--}diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteProjectModal.javanew file mode 100644index 0000000000..8af0a34fdf--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java@@ -0,0 +1,41 @@+package com.gitplex.server.web.component.confirmdelete;++import org.apache.wicket.ajax.AjaxRequestTarget;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;++@SuppressWarnings("serial")+public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal {++ public ConfirmDeleteProjectModal(AjaxRequestTarget target) {+ super(target);+ }++ @Override+ protected void doDelete(AjaxRequestTarget target) {+ Project project = getProject();++ GitPlex.getInstance(ProjectManager.class).delete(project);+ getSession().success("Repository has been deleted");++ onDeleted(target);+ }++ protected abstract void onDeleted(AjaxRequestTarget target);++ @Override+ protected String getWarningMessage() {+ return "Everything inside this project will be deleted and can not be recovered, "+ + "please input project name \"" + getProject().getName() + "\" below to confirm deletion.";+ }++ @Override+ protected String getConfirmInput() {+ return getProject().getName();+ }++ protected abstract Project getProject();++}diff --git a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.javaindex dd45919d68..59f81058fd 100644--- a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.util.DateUtils;@SuppressWarnings("serial")@@ -30,12 +30,12 @@ public class ContributorPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new AccountLink("author", author));+ add(new UserLink("author", author));if (committer.getEmailAddress().equals(author.getEmailAddress())&& committer.getName().equals(author.getName())) {add(new WebMarkupContainer("committer").setVisible(false));} else {- add(new AccountLink("committer", committer));+ add(new UserLink("committer", committer));}if (withDate)add(new Label("date", DateUtils.formatAge(committer.getWhen())));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 3b568b6713..5ff27f3a0e 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@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;@@ -12,25 +12,25 @@ import com.gitplex.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")public abstract class CreateBranchLink extends ModalLink {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String revision;- public CreateBranchLink(String id, IModel<Depot> depotModel, String revision) {+ public CreateBranchLink(String id, IModel<Project> projectModel, String revision) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;}protected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWrite(depotModel.getObject()));+ setVisible(SecurityUtils.canWrite(projectModel.getObject()));}@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new CreateBranchPanel(id, depotModel, revision) {+ return new CreateBranchPanel(id, projectModel, revision) {@Overrideprotected void onCreate(AjaxRequestTarget target, String branch) {@@ -48,7 +48,7 @@ public abstract class CreateBranchLink extends ModalLink {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 08b8a7f979..3f0f17c4a0 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,22 +11,22 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")abstract class CreateBranchPanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String revision;private String branchName;- public CreateBranchPanel(String id, IModel<Depot> depotModel, String revision) {+ public CreateBranchPanel(String id, IModel<Project> projectModel, String revision) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;}@@ -72,12 +72,12 @@ abstract class CreateBranchPanel extends Panel {form.error("Invalid branch name.");target.focusComponent(nameInput);target.add(form);- } else if (depotModel.getObject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {+ } else if (projectModel.getObject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {form.error("Branch '" + branchName + "' already exists, please choose a different name.");target.focusComponent(nameInput);target.add(form);} else {- depotModel.getObject().createBranch(branchName, revision);+ projectModel.getObject().createBranch(branchName, revision);onCreate(target, branchName);}}@@ -100,7 +100,7 @@ abstract class CreateBranchPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 2a079deddf..322e8f4f12 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@@ -5,7 +5,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;@@ -13,14 +13,14 @@ import com.gitplex.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")public abstract class CreateTagLink extends ModalLink {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String revision;- public CreateTagLink(String id, IModel<Depot> depotModel, String revision) {+ public CreateTagLink(String id, IModel<Project> projectModel, String revision) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;}@@ -28,12 +28,12 @@ public abstract class CreateTagLink extends ModalLink {protected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canCreateTag(depotModel.getObject(), Constants.R_TAGS));+ setVisible(SecurityUtils.canCreateTag(projectModel.getObject(), Constants.R_TAGS));}@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new CreateTagPanel(id, depotModel, revision) {+ return new CreateTagPanel(id, projectModel, revision) {@Overrideprotected void onCreate(AjaxRequestTarget target, String tag) {@@ -51,7 +51,7 @@ public abstract class CreateTagLink extends ModalLink {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 b50b9255b9..a325352a5a 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,8 +12,8 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Preconditions;@@ -23,7 +23,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel@SuppressWarnings("serial")abstract class CreateTagPanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String revision;@@ -31,9 +31,9 @@ abstract class CreateTagPanel extends Panel {private String tagMessage;- public CreateTagPanel(String id, IModel<Depot> depotModel, String revision) {+ public CreateTagPanel(String id, IModel<Project> projectModel, String revision) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;}@@ -96,24 +96,24 @@ abstract class CreateTagPanel extends Panel {form.error("Tag name is not valid.");target.focusComponent(nameInput);target.add(form);- } else if (depotModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {form.error("Tag '" + tagName + "' already exists, please choose a different name.");target.focusComponent(nameInput);target.add(form);} else {- Depot depot = depotModel.getObject();- Account user = Preconditions.checkNotNull(SecurityUtils.getAccount());+ Project project = projectModel.getObject();+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());String errorMessage = null;- TagProtection protection = depot.getTagProtection(tagName);+ TagProtection protection = project.getTagProtection(tagName);if (protection != null)- errorMessage = protection.getTagCreator().getNotMatchMessage(depot, user);+ errorMessage = protection.getTagCreator().getNotMatchMessage(project, user);if (errorMessage != null) {form.error("Unable to create protected tag: " + errorMessage);target.focusComponent(nameInput);target.add(form);} else {- depot.tag(tagName, revision, user.asPerson(), tagMessage);+ project.tag(tagName, revision, user.asPerson(), tagMessage);onCreate(target, tagName);}}@@ -137,7 +137,7 @@ abstract class CreateTagPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.java b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.javadeleted file mode 100644index 745579f2e8..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.component.datatable;--import org.apache.wicket.ajax.attributes.IAjaxCallListener;-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;--import com.gitplex.server.web.util.ajaxlistener.AjaxLoadingOverlay;--@SuppressWarnings("serial")-public class AjaxHeadersToolbar<S> extends AjaxFallbackHeadersToolbar<S>{-- public AjaxHeadersToolbar(DataTable<?, S> table, ISortStateLocator<S> stateLocator) {- super(table, stateLocator);- }-- @Override- protected IAjaxCallListener getAjaxCallListener() {- return new AjaxLoadingOverlay();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.java b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.javadeleted file mode 100644index 5691296252..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.java+++ /dev/null@@ -1,85 +0,0 @@-package com.gitplex.server.web.component.datatable;--import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigation;-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink;-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationLink;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.markup.html.link.AbstractLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.navigation.paging.IPageable;-import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;--import com.gitplex.server.web.util.ajaxlistener.AjaxLoadingOverlay;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class AjaxNavigationToolbar extends org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar {-- public AjaxNavigationToolbar(DataTable<?, ?> dataTable) {- super(dataTable);- }-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {-- return new BootstrapAjaxPagingNavigator(navigatorId, table) {-- @Override- protected AbstractLink newPagingNavigationLink(String id, IPageable pageable, int increment) {- return new AjaxPagingNavigationLink(id, pageable, increment) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);-- attributes.getAjaxCallListeners().add(new AjaxLoadingOverlay());- }-- };- }-- @Override- protected AbstractLink newPagingNavigationIncrementLink(String id, IPageable pageable, int increment) {- return new AjaxPagingNavigationIncrementLink(id, pageable, increment) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);-- attributes.getAjaxCallListeners().add(new AjaxLoadingOverlay());- }-- };- }-- @Override- protected PagingNavigation newNavigation(String id,- IPageable pageable, IPagingLabelProvider labelProvider) {- PagingNavigation navigation = new AjaxPagingNavigation(id, pageable, labelProvider) {-- @Override- protected Link<?> newPagingNavigationLink(String id, IPageable pageable, long pageIndex) {- return new AjaxPagingNavigationLink(id, pageable, pageIndex) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new AjaxLoadingOverlay());- }-- };- }-- };- navigation.setViewSize(5);- return navigation;- }-- };- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java b/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.javaindex d7542ea1b4..4baa20f51a 100644--- a/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java@@ -2,14 +2,19 @@ package com.gitplex.server.web.component.datatable;import java.util.List;+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;import org.apache.wicket.model.IModel;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;+@SuppressWarnings("serial")public class DefaultDataTable<T, S> extends DataTable<T, S> {@@ -17,8 +22,15 @@ public class DefaultDataTable<T, S> extends DataTable<T, S> {final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage) {super(id, columns, dataProvider, rowsPerPage);- addBottomToolbar(new AjaxNavigationToolbar(this));- addTopToolbar(new AjaxHeadersToolbar<S>(this, dataProvider));+ addBottomToolbar(new AjaxNavigationToolbar(this) {++ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new BootstrapAjaxPagingNavigator(navigatorId, table);+ }++ });+ addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));addBottomToolbar(new NoRecordsToolbar(this));}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java b/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.javaindex d3d9504de4..959b936c58 100644--- a/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java@@ -136,11 +136,12 @@ public class SelectionColumn<T, S> implements IStyledColumn<T, S> {response.render(JavaScriptHeaderItem.forReference(WicketAjaxJQueryResourceReference.get()));String template =- "$('#%s').change(function() {\n" +- " var checked = this.checked;\n" +- " $(this).closest('table').find('.row-selector input').each(function(){\n" +- " this.checked = checked;\n" +- " });\n" ++ "$('#%s').change(function() {" ++ " var checked = this.checked;" ++ " $(this).closest('table').find('.row-selector input').each(function() {" ++ " if (!$(this).prop('disabled')) " ++ " this.checked = checked;" ++ " });" +" %s" +"});";String script = String.format(diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.javadeleted file mode 100644index 51b61d4e85..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.depotchoice;--import com.gitplex.server.web.page.base.BaseDependentResourceReference;--public class DepotChoiceResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public DepotChoiceResourceReference() {- super(DepotChoiceResourceReference.class, "depot-choice.js");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.js b/web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.jsdeleted file mode 100644index e753822cdf..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.js+++ /dev/null@@ -1,13 +0,0 @@-gitplex.server.depotChoiceFormatter = {- formatSelection: function(depot) {- return depot.name;- },-- formatResult: function(depot) {- return depot.name;- },-- escapeMarkup: function(m) {- return m;- }-};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.javadeleted file mode 100644index d13709f350..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.java+++ /dev/null@@ -1,12 +0,0 @@-package com.gitplex.server.web.component.depotfilepicker;--import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;--@SuppressWarnings("serial")-public class DepotFilePickerResourceReference extends BaseDependentCssResourceReference {-- public DepotFilePickerResourceReference() {- super(DepotFilePickerResourceReference.class, "depot-file-picker.css");- }--}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 51a592ebff..3c4dbcb158 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@@ -18,7 +18,7 @@ import com.gitplex.server.GitPlex;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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.util.diff.DiffUtils;@@ -34,7 +34,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {private static final String CONTENT_ID = "content";- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<PullRequest> requestModel;@@ -46,12 +46,12 @@ public class BlobDiffPanel extends Panel implements SourceAware {private final BlobCommentSupport markSupport;- public BlobDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,+ public BlobDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,@Nullable BlobCommentSupport markSupport) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.requestModel = requestModel;this.change = change;this.blameModel = blameModel;@@ -82,7 +82,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {elseadd(newFragment("Empty file removed.", false));} else {- add(new TextDiffPanel(CONTENT_ID, depotModel, requestModel, change, diffMode, blameModel, markSupport));+ add(new TextDiffPanel(CONTENT_ID, projectModel, requestModel, change, diffMode, blameModel, markSupport));}} else if (blob.isPartial()) {add(newFragment("File is too large to be loaded.", true));@@ -118,7 +118,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {&& (markSupport == null || markSupport.getComments().isEmpty())) {add(newFragment("Content is identical", false));} else {- add(new TextDiffPanel(CONTENT_ID, depotModel, requestModel, change, diffMode, blameModel, markSupport));+ add(new TextDiffPanel(CONTENT_ID, projectModel, requestModel, change, diffMode, blameModel, markSupport));}} else if (change.getOldBlob().isPartial() || change.getNewBlob().isPartial()) {add(newFragment("File is too large to be loaded.", true));@@ -146,7 +146,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {}protected void onDetach() {- depotModel.detach();+ projectModel.detach();requestModel.detach();if (blameModel != null)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 bfa4edf890..191fbea532 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@@ -50,7 +50,7 @@ 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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.model.support.TextRange;@@ -73,18 +73,18 @@ import com.gitplex.server.web.component.diff.revision.BlobCommentSupport;import com.gitplex.server.web.component.diff.revision.DiffViewMode;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview.MergePreviewPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;import com.gitplex.server.web.util.DateUtils;import com.google.common.base.Preconditions;@SuppressWarnings("serial")public class TextDiffPanel extends Panel implements SourceAware {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<PullRequest> requestModel;@@ -108,12 +108,12 @@ public class TextDiffPanel extends Panel implements SourceAware {private BlameInfo blameInfo;- public TextDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,+ public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,@Nullable BlobCommentSupport markSupport) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.requestModel = requestModel;this.change = change;this.diffMode = diffMode;@@ -136,7 +136,7 @@ public class TextDiffPanel extends Panel implements SourceAware {private BlameInfo getBlameInfo() {blameInfo = new BlameInfo();- BlameCommand cmd = new BlameCommand(depotModel.getObject().getGitDir());+ BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());String oldPath = change.getOldBlobIdent().path;if (oldPath != null) {cmd.commitHash(getOldCommit().name()).file(oldPath);@@ -191,19 +191,19 @@ public class TextDiffPanel extends Panel implements SourceAware {})).setOutputMarkupId(true));- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();PullRequest request = requestModel.getObject();- DepotBlobPage.State viewState = new DepotBlobPage.State(change.getBlobIdent());+ ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());viewState.requestId = PullRequest.idOf(request);- PageParameters params = DepotBlobPage.paramsOf(depot, viewState);- actions.add(new ViewStateAwarePageLink<Void>("viewFile", DepotBlobPage.class, params));+ PageParameters params = ProjectBlobPage.paramsOf(project, viewState);+ actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));if (change.getType() != ChangeType.DELETE) {if (request != null&& request.getSource() != null&& request.getSource().getObjectName(false) != null- && SecurityUtils.canModify(request.getSourceDepot(), request.getSourceBranch(), change.getPath())+ && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())&& (getPage() instanceof RequestChangesPage || getPage() instanceof MergePreviewPage)) {// we are in context of a pull request and pull request source branch exists, so we edit in source branch insteadLink<Void> editLink = new Link<Void>("editFile") {@@ -212,27 +212,27 @@ public class TextDiffPanel extends Panel implements SourceAware {public void onClick() {BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State editState = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);editState.requestId = request.getId();editState.mode = Mode.EDIT;- PageParameters params = DepotBlobPage.paramsOf(request.getSourceDepot(), editState);- setResponsePage(DepotBlobPage.class, params);+ PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);+ setResponsePage(ProjectBlobPage.class, params);}};editLink.add(AttributeAppender.append("title", "Edit on source branch"));actions.add(editLink);- } else if (SecurityUtils.canModify(depot, change.getBlobIdent().revision, change.getPath())- && depot.getBranchRef(change.getBlobIdent().revision) != null) {+ } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())+ && project.getBranchRef(change.getBlobIdent().revision) != null) {// we are on a branchLink<Void> editLink = new Link<Void>("editFile") {@Overridepublic void onClick() {- DepotBlobPage.State editState = new DepotBlobPage.State(change.getBlobIdent());+ ProjectBlobPage.State editState = new ProjectBlobPage.State(change.getBlobIdent());editState.mode = Mode.EDIT;- PageParameters params = DepotBlobPage.paramsOf(depot, editState);- setResponsePage(DepotBlobPage.class, params);+ PageParameters params = ProjectBlobPage.paramsOf(project, editState);+ setResponsePage(ProjectBlobPage.class, params);}};@@ -342,11 +342,11 @@ public class TextDiffPanel extends Panel implements SourceAware {script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s, %s);",getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),- requestModel.getObject()!=null, SecurityUtils.getAccount()!=null);+ requestModel.getObject()!=null, SecurityUtils.getUser()!=null);target.appendJavaScript(script);break;case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());+ Preconditions.checkNotNull(SecurityUtils.getUser());mark = getMark(params, "param1", "param2", "param3", "param4", "param5");markSupport.onAddComment(target, mark);@@ -370,21 +370,21 @@ public class TextDiffPanel extends Panel implements SourceAware {add(blameMessageBehavior = new BlameMessageBehavior() {@Override- protected Depot getDepot() {- return depotModel.getObject();+ protected Project getProject() {+ return projectModel.getObject();}});- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", depotModel) {+ symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {- setResponsePage(DepotBlobPage.class, getQueryHitParams(hit));+ setResponsePage(ProjectBlobPage.class, getQueryHitParams(hit));}@Overrideprotected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- setResponsePage(DepotBlobPage.class, getFindOccurrencesParams());+ setResponsePage(ProjectBlobPage.class, getFindOccurrencesParams());}@Override@@ -453,11 +453,11 @@ public class TextDiffPanel extends Panel implements SourceAware {}private RevCommit getOldCommit() {- return depotModel.getObject().getRevCommit(change.getOldBlobIdent().revision);+ return projectModel.getObject().getRevCommit(change.getOldBlobIdent().revision);}private RevCommit getNewCommit() {- return depotModel.getObject().getRevCommit(change.getNewBlobIdent().revision);+ return projectModel.getObject().getRevCommit(change.getNewBlobIdent().revision);}@Override@@ -716,7 +716,7 @@ public class TextDiffPanel extends Panel implements SourceAware {CommitDetailPage.State state = new CommitDetailPage.State();state.revision = commit.getHash();state.whitespaceOption = change.getWhitespaceOption();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), state);+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);String url = urlFor(CommitDetailPage.class, params).toString();if (diffMode == DiffViewMode.UNIFIED) {builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",@@ -1101,7 +1101,7 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();requestModel.detach();if (blameModel != null)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 bb7c856e46..e94bfd3999 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@@ -68,7 +68,7 @@ import com.gitplex.server.git.BlobIdent;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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.search.IndexManager;@@ -81,7 +81,7 @@ import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;import com.gitplex.server.web.component.comment.CodeCommentPanel;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;import com.gitplex.server.web.component.diff.blob.SourceAware;import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;@@ -111,7 +111,7 @@ public class RevisionDiffPanel extends Panel {private static final String DIFF_ID = "diff";- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<PullRequest> requestModel;@@ -133,9 +133,9 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected List<DiffEntry> load() {- AnyObjectId oldRevId = depotModel.getObject().getObjectId(oldRev);- AnyObjectId newRevId = depotModel.getObject().getObjectId(newRev);- return GitUtils.diff(depotModel.getObject().getRepository(), oldRevId, newRevId);+ AnyObjectId oldRevId = projectModel.getObject().getObjectId(oldRev);+ AnyObjectId newRevId = projectModel.getObject().getObjectId(newRev);+ return GitUtils.diff(projectModel.getObject().getRepository(), oldRevId, newRevId);}};@@ -153,7 +153,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return depotModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent);}};@@ -171,7 +171,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return depotModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent);}});@@ -187,7 +187,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return depotModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent);}});@@ -261,7 +261,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return depotModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent);}};@@ -386,12 +386,12 @@ public class RevisionDiffPanel extends Panel {private ListView<BlobChange> diffsView;- public RevisionDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,+ public RevisionDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,String oldRev, String newRev, IModel<String> pathFilterModel, IModel<WhitespaceOption> whitespaceOptionModel,@Nullable IModel<String> blameModel, @Nullable MarkSupport markSupport) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.requestModel = requestModel;this.oldRev = oldRev;this.newRev = newRev;@@ -461,19 +461,19 @@ public class RevisionDiffPanel extends Panel {protected void onConfigure() {super.onConfigure();- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();IndexManager indexManager = GitPlex.getInstance(IndexManager.class);RevCommit oldCommit = getOldCommit();RevCommit newCommit = getNewCommit();- boolean oldCommitIndexed = indexManager.isIndexed(depot, oldCommit);- boolean newCommitIndexed = indexManager.isIndexed(depot, newCommit);+ boolean oldCommitIndexed = indexManager.isIndexed(project, oldCommit);+ boolean newCommitIndexed = indexManager.isIndexed(project, newCommit);if (oldCommitIndexed && newCommitIndexed) {setVisible(false);} else {if (!oldCommitIndexed)- indexManager.indexAsync(depot, oldCommit);+ indexManager.indexAsync(project, oldCommit);if (!newCommitIndexed)- indexManager.indexAsync(depot, newCommit);+ indexManager.indexAsync(project, newCommit);setVisible(true);}}@@ -769,7 +769,7 @@ public class RevisionDiffPanel extends Panel {BlobChange change = item.getModelObject();item.setMarkupId("diff-" + change.getPath());if (markSupport != null) {- item.add(new BlobDiffPanel(DIFF_ID, depotModel, requestModel, change, diffMode,+ item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change, diffMode,getBlobBlameModel(change), new BlobCommentSupport() {@Override@@ -811,19 +811,19 @@ public class RevisionDiffPanel extends Panel {String uuid = UUID.randomUUID().toString();- String autosaveKey = "autosave:addCodeCommentOnDiff:" + depotModel.getObject().getId()+ String autosaveKey = "autosave:addCodeCommentOnDiff:" + projectModel.getObject().getId()+ ":" + change.getPath();CommentInput contentInput;form.add(contentInput = new CommentInput("content", Model.of(""), true) {@Override- protected DepotAttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(depotModel.getObject(), uuid);+ protected ProjectAttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(projectModel.getObject(), uuid);}@Override- protected Depot getDepot() {- return depotModel.getObject();+ protected Project getProject() {+ return projectModel.getObject();}@Override@@ -877,7 +877,7 @@ public class RevisionDiffPanel extends Panel {CodeComment comment = new CodeComment();comment.setUUID(uuid);comment.setRequest(requestModel.getObject());- comment.setUser(SecurityUtils.getAccount());+ comment.setUser(SecurityUtils.getUser());comment.setCommentPos(markPos);comment.setContent(contentInput.getModelObject());@@ -946,7 +946,7 @@ public class RevisionDiffPanel extends Panel {}));} else {- item.add(new BlobDiffPanel(DIFF_ID, depotModel, requestModel, change,+ item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change,diffMode, getBlobBlameModel(change), null));}}@@ -1153,7 +1153,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- if (SecurityUtils.getAccount() != null) {+ if (SecurityUtils.getUser() != null) {((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);target.appendJavaScript("gitplex.server.revisionDiff.scrollToCommentBottom();");} else {@@ -1198,11 +1198,11 @@ public class RevisionDiffPanel extends Panel {}private RevCommit getOldCommit() {- return depotModel.getObject().getRevCommit(oldRev);+ return projectModel.getObject().getRevCommit(oldRev);}private RevCommit getNewCommit() {- return depotModel.getObject().getRevCommit(newRev);+ return projectModel.getObject().getRevCommit(newRev);}@Nullable@@ -1283,7 +1283,7 @@ public class RevisionDiffPanel extends Panel {commentsModel.detach();diffEntriesModel.detach();changesAndCountModel.detach();- depotModel.detach();+ projectModel.detach();requestModel.detach();if (blameModel != null)blameModel.detach();diff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.html b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.htmldeleted file mode 100644index 599ba65814..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.html+++ /dev/null@@ -1,36 +0,0 @@-<wicket:panel>- <div class="greater-privileges">- <div class="modal-header">- <button wicket:id="close" type="button" class="close"><span aria-hidden="true">×</span></button>- <h4 id="modal-title" class="modal-title">- Team members with greater privileges- </h4>- </div>- <div class="modal-body">- <div class="description">- This team grants <b wicket:id="privilege"></b> access to repository <b wicket:id="depot"></b>,- but below members have greater privileges from other sources- </div>- <div class="detail">- <table class="table table-hover table-condensed">- <thead>- <tr>- <th>Member</th><th>Privilege</th>- </tr>- </thead>- <tbody>- <tr wicket:id="privileges">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><span wicket:id="name"></span></a>- </td>- <td name="privilege">- <a wicket:id="privilegeLink"><span wicket:id="privilege"></span></a>- </td>- </tr>- </tbody>- </table>- </div>- </div>- </div>-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 8f97757f93..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java+++ /dev/null@@ -1,132 +0,0 @@-package com.gitplex.server.web.component.greaterprivilege;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--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;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public abstract class GreaterPrivilegesPanel extends GenericPanel<TeamAuthorization> {-- public GreaterPrivilegesPanel(String id, IModel<TeamAuthorization> authorizationModel) {- super(id, authorizationModel);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- onClose(target);- }-- });-- add(new Label("privilege", getAuthorization().getPrivilege()));- add(new Label("depot", getAuthorization().getDepot().getName()));-- add(new ListView<UserPermission>("privileges", new LoadableDetachableModel<List<UserPermission>>() {-- @Override- protected List<UserPermission> load() {- List<UserPermission> permissions = new ArrayList<>();- for (Account user: getAuthorization().getTeam().getMembers()) {- DepotAccess access = new DepotAccess(user, getAuthorization().getDepot());- if (SecurityUtils.isGreater(access.getGreatestPrivilege(), getAuthorization().getPrivilege())) {- permissions.add(new UserPermission(user, access.getGreatestPrivilege()));- }- }- permissions.sort((permission1, permission2)- -> permission1.getUser().compareTo(permission2.getUser()));- return permissions;- }-- }) {-- @Override- protected void populateItem(ListItem<UserPermission> item) {- UserPermission permission = item.getModelObject();- Account organization = getAuthorization().getDepot().getAccount();- OrganizationMembership membership =- Preconditions.checkNotNull(organization.getOrganizationMembersMap().get(permission.getUser()));- PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);- Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",- MemberEffectivePrivilegePage.class, params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);- link = new ViewStateAwarePageLink<Void>("nameLink",- MemberEffectivePrivilegePage.class, params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = MemberPrivilegeSourcePage.paramsOf(- membership, getAuthorization().getDepot());- link = new ViewStateAwarePageLink<Void>("privilegeLink",- MemberPrivilegeSourcePage.class, params);- link.add(new Label("privilege", permission.getPrivilege()));- item.add(link);- }-- });- }-- private TeamAuthorization getAuthorization() {- return getModelObject();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new GreaterPrivilegesResourceReference()));- }-- protected abstract void onClose(AjaxRequestTarget target);-- private static class UserPermission {-- private final Account user;-- private final DepotPrivilege privilege;-- public UserPermission(Account user, DepotPrivilege privilege) {- this.user = user;- this.privilege = privilege;- }-- public Account getUser() {- return user;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.javadeleted file mode 100644index cfa66e5979..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.greaterprivilege;--import org.apache.wicket.request.resource.CssResourceReference;--public class GreaterPrivilegesResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public GreaterPrivilegesResourceReference() {- super(GreaterPrivilegesResourceReference.class, "greater-privileges.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/greater-privileges.css b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/greater-privileges.cssdeleted file mode 100644index 204555b4f2..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/greater-privileges.css+++ /dev/null@@ -1,8 +0,0 @@-.modal-content>.greater-privileges .description {- font-size: 13px;- margin-bottom: 12px;-}-.modal-content>.greater-privileges .detail {- overflow: auto;- max-height: 500px;-}diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.javanew file mode 100644index 0000000000..5697ce7568--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.java@@ -0,0 +1,36 @@+package com.gitplex.server.web.component.groupchoice;++import java.util.Collection;+import java.util.List;++import org.json.JSONException;+import org.json.JSONWriter;++import com.google.common.collect.Lists;+import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.web.component.select2.ChoiceProvider;++public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<Group> {++ private static final long serialVersionUID = 1L;++ @Override+ public void toJson(Group choice, JSONWriter writer) throws JSONException {+ writer.key("id").value(choice.getId()).key("name").value(choice.getName());+ }++ @Override+ public Collection<Group> toChoices(Collection<String> ids) {+ List<Group> groups = Lists.newArrayList();+ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ for (String each : ids) {+ Long id = Long.valueOf(each);+ groups.add(groupManager.load(id));+ }++ return groups;+ }++}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.javanew file mode 100644index 0000000000..3ac030b19a--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java@@ -0,0 +1,35 @@+package com.gitplex.server.web.component.groupchoice;++import java.util.List;++import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.select2.Response;++public class GroupChoiceProvider extends AbstractGroupChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public void query(String term, int page, Response<Group> response) {+ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ int first = page * WebConstants.PAGE_SIZE;+ EntityCriteria<Group> criteria = groupManager.newCriteria();+ criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE));+ List<Group> groups = groupManager.findRange(criteria, first, WebConstants.PAGE_SIZE + 1);++ if (groups.size() <= WebConstants.PAGE_SIZE) {+ response.addAll(groups);+ } else {+ response.addAll(groups.subList(0, WebConstants.PAGE_SIZE));+ response.setHasMore(true);+ }+ }++}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceResourceReference.javanew file mode 100644index 0000000000..df09185060--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.component.groupchoice;++import com.gitplex.server.web.page.base.BaseDependentResourceReference;++public class GroupChoiceResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public GroupChoiceResourceReference() {+ super(GroupChoiceResourceReference.class, "group-choice.js");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.javanew file mode 100644index 0000000000..d262d11e8f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.java@@ -0,0 +1,36 @@+package com.gitplex.server.web.component.groupchoice;++import java.util.Collection;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import com.gitplex.server.model.Group;+import com.gitplex.server.web.component.select2.Select2MultiChoice;++@SuppressWarnings("serial")+public class GroupMultiChoice extends Select2MultiChoice<Group> {++ public GroupMultiChoice(String id, IModel<Collection<Group>> groupsModel,+ AbstractGroupChoiceProvider choiceProvider) {+ super(id, groupsModel, choiceProvider);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("Choose groups ...");+ getSettings().setFormatResult("gitplex.server.groupChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.groupChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.groupChoiceFormatter.escapeMarkup");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));+ }++}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/groupchoice/GroupSingleChoice.javasimilarity index 50%rename from web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.javarename to web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.javaindex fbc628b4bc..f6656bcf04 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.java@@ -1,27 +1,27 @@-package com.gitplex.server.web.component.depotchoice;+package com.gitplex.server.web.component.groupchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Group;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class AbstractDepotChoice extends Select2Choice<Depot> {+public class GroupSingleChoice extends Select2Choice<Group> {- public AbstractDepotChoice(String id, IModel<Depot> depotModel,- AbstractDepotChoiceProvider choiceProvider) {- super(id, depotModel, choiceProvider);+ public GroupSingleChoice(String id, IModel<Group> groupModel,+ AbstractGroupChoiceProvider choiceProvider) {+ super(id, groupModel, choiceProvider);}@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Choose a repository...");- getSettings().setFormatResult("gitplex.server.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.depotChoiceFormatter.escapeMarkup");+ getSettings().setPlaceholder("Choose a group ...");+ getSettings().setFormatResult("gitplex.server.groupChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.groupChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.groupChoiceFormatter.escapeMarkup");}@Override@@ -34,7 +34,7 @@ public class AbstractDepotChoice extends Select2Choice<Depot> {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));}-}+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/group-choice.js b/web/src/main/java/com/gitplex/server/web/component/groupchoice/group-choice.jsnew file mode 100644index 0000000000..2dabfa6f4d--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/group-choice.js@@ -0,0 +1,13 @@+gitplex.server.groupChoiceFormatter = {+ formatSelection: function(group) {+ return group.name;+ },++ formatResult: function(group) {+ return group.name;+ },++ escapeMarkup: function(m) {+ return m;+ }+};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java b/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.javaindex 3eedcfdd04..67c3b1517b 100644--- a/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/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.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;@@ -17,11 +17,11 @@ import com.gitplex.server.web.util.resource.ArchiveResourceReference;@SuppressWarnings("serial")public abstract class ArchiveMenuLink extends MenuLink {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public ArchiveMenuLink(String id, IModel<Depot> depotModel) {+ public ArchiveMenuLink(String id, IModel<Project> projectModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Override@@ -37,7 +37,7 @@ public abstract class ArchiveMenuLink extends MenuLink {@Overridepublic AbstractLink newLink(String id) {return new ResourceLink<Void>(id, new ArchiveResourceReference(),- ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_ZIP)) {+ ArchiveResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveResource.FORMAT_ZIP)) {@Overrideprotected CharSequence getOnClickScript(CharSequence url) {@@ -58,7 +58,7 @@ public abstract class ArchiveMenuLink extends MenuLink {@Overridepublic AbstractLink newLink(String id) {return new ResourceLink<Void>(id, new ArchiveResourceReference(),- ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_TGZ)) {+ ArchiveResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveResource.FORMAT_TGZ)) {@Overrideprotected CharSequence getOnClickScript(CharSequence url) {@@ -74,7 +74,7 @@ public abstract class ArchiveMenuLink extends MenuLink {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.javaindex 4c2c0226b8..54bea91c7a 100644--- a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java@@ -10,31 +10,31 @@ import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.support.DepotAndBranch;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.model.support.ProjectAndBranch;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")public class BranchLink extends ViewStateAwarePageLink<Void> {- private final DepotAndBranch depotAndBranch;+ private final ProjectAndBranch projectAndBranch;- public BranchLink(String id, DepotAndBranch depotAndBranch, @Nullable PullRequest request) {- super(id, DepotBlobPage.class, paramsOf(depotAndBranch, request));- this.depotAndBranch = depotAndBranch;+ public BranchLink(String id, ProjectAndBranch projectAndBranch, @Nullable PullRequest request) {+ super(id, ProjectBlobPage.class, paramsOf(projectAndBranch, request));+ this.projectAndBranch = projectAndBranch;}- private static PageParameters paramsOf(DepotAndBranch depotAndBranch, PullRequest request) {- BlobIdent blobIdent = new BlobIdent(depotAndBranch.getBranch(), null, FileMode.TREE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ private static PageParameters paramsOf(ProjectAndBranch projectAndBranch, PullRequest request) {+ BlobIdent blobIdent = new BlobIdent(projectAndBranch.getBranch(), null, FileMode.TREE.getBits());+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.requestId = PullRequest.idOf(request);- return DepotBlobPage.paramsOf(depotAndBranch.getDepot(), state);+ return ProjectBlobPage.paramsOf(projectAndBranch.getProject(), state);}@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(depotAndBranch.getObjectName(false) != null);+ setEnabled(projectAndBranch.getObjectName(false) != null);}@Override@@ -49,14 +49,14 @@ public class BranchLink extends ViewStateAwarePageLink<Void> {@Overridepublic IModel<?> getBody() {String label;- if (getPage() instanceof DepotPage) {- DepotPage page = (DepotPage) getPage();- if (page.getDepot().equals(depotAndBranch.getDepot()))- label = depotAndBranch.getBranch();+ if (getPage() instanceof ProjectPage) {+ ProjectPage page = (ProjectPage) getPage();+ if (page.getProject().equals(projectAndBranch.getProject()))+ label = projectAndBranch.getBranch();else- label = depotAndBranch.getFQN();+ label = projectAndBranch.getFQN();} else {- label = depotAndBranch.getFQN();+ label = projectAndBranch.getFQN();}return Model.of(label);}diff --git a/web/src/main/java/com/gitplex/server/web/component/link/AccountLink.java b/web/src/main/java/com/gitplex/server/web/component/link/UserLink.javasimilarity index 56%rename from web/src/main/java/com/gitplex/server/web/component/link/AccountLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/UserLink.javaindex 6ce0cfa2bf..432a41e6f9 100644--- a/web/src/main/java/com/gitplex/server/web/component/link/AccountLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/UserLink.java@@ -9,39 +9,39 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.GitPlex;-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;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.web.page.user.UserPage;+import com.gitplex.server.web.page.user.UserProfilePage;@SuppressWarnings("serial")-public class AccountLink extends ViewStateAwarePageLink<Void> {+public class UserLink extends ViewStateAwarePageLink<Void> {private final PageParameters params;private final String name;- public AccountLink(String id, @Nullable Account account) {- super(id, AccountOverviewPage.class);+ public UserLink(String id, @Nullable User user) {+ super(id, UserProfilePage.class);- if (account == null) {+ if (user == null) {params = new PageParameters();name = GitPlex.NAME;- } else if (account.getId() == null) {+ } else if (user.getId() == null) {params = new PageParameters();- name = account.getDisplayName();+ name = user.getDisplayName();} else {- params = AccountPage.paramsOf(account);- name = account.getDisplayName();+ params = UserPage.paramsOf(user);+ name = user.getDisplayName();}}- public AccountLink(String id, PersonIdent person) {- super(id, AccountOverviewPage.class);- Account account = GitPlex.getInstance(AccountManager.class).find(person);+ public UserLink(String id, PersonIdent person) {+ super(id, UserProfilePage.class);+ User user = GitPlex.getInstance(UserManager.class).find(person);name = person.getName();- if (account != null) {- params = AccountPage.paramsOf(account);+ if (user != null) {+ params = UserPage.paramsOf(user);} else {params = new PageParameters();}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java b/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.javaindex 9901ed4978..1313d017d4 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java@@ -2,11 +2,11 @@ package com.gitplex.server.web.component.markdown;import java.io.Serializable;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public interface BlobReferenceSupport extends Serializable {- Depot getDepot();+ Project getProject();String getRevision();diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.javaindex 762f8f98ae..4ffa48a1c1 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java@@ -40,12 +40,12 @@ import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.BlobIdentFilter;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.FileUtils;-import com.gitplex.server.web.component.depotfilepicker.DepotFilePicker;+import com.gitplex.server.web.component.projectfilepicker.ProjectFilePicker;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -146,16 +146,16 @@ class InsertUrlPanel extends Panel {BlobIdent rootBlobIdent = new BlobIdent(blobReferenceSupport.getRevision(), null,FileMode.TYPE_TREE);- if (!blobReferenceSupport.getDepot().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {+ if (!blobReferenceSupport.getProject().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {add(new DropdownLink("blobPicker") {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new DepotFilePicker(id, new AbstractReadOnlyModel<Depot>() {+ return new ProjectFilePicker(id, new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return blobReferenceSupport.getDepot();+ public Project getObject() {+ return blobReferenceSupport.getProject();}}, blobReferenceSupport.getRevision()) {@@ -163,8 +163,8 @@ class InsertUrlPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {String baseUrl = markdownEditor.getBaseUrl();- String referenceUrl = urlFor(DepotBlobPage.class,- DepotBlobPage.paramsOf(blobReferenceSupport.getDepot(), blobIdent)).toString();+ String referenceUrl = urlFor(ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(blobReferenceSupport.getProject(), blobIdent)).toString();Path relativized = Paths.get(baseUrl).relativize(Paths.get(referenceUrl));String relativePath = relativized.toString().replace('\\', '/').substring("../".length());markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.javaindex 97a386a838..a4159b09dd 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java@@ -45,7 +45,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.MarkdownManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.markdown.emoji.EmojiOnes;@@ -249,7 +249,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);List<Map<String, String>> userList = new ArrayList<>();- for (Account user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {+ for (User user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {Map<String, String> userMap = new HashMap<>();userMap.put("name", user.getName());if (user.getFullName() != null)diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java b/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.javaindex 0e8461e70e..489f26f9a8 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java@@ -2,10 +2,10 @@ package com.gitplex.server.web.component.markdown;import java.util.List;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;public interface UserMentionSupport {- List<Account> findUsers(String query, int count);+ List<User> findUsers(String query, int count);}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 0ca50b8597..5a64749fcc 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@@ -29,7 +29,7 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.component.BlobIcon;import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;@@ -37,16 +37,16 @@ import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")public abstract class PathSelector extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String revision;private final Set<Integer> pathTypes;- public PathSelector(String id, IModel<Depot> depotModel, String revision, int... pathTypes) {+ public PathSelector(String id, IModel<Project> projectModel, String revision, int... pathTypes) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;this.pathTypes = new HashSet<>();for (int i=0; i<pathTypes.length; i++)@@ -65,10 +65,10 @@ public abstract class PathSelector extends Panel {@Overridepublic Iterator<? extends BlobIdent> getRoots() {- Repository repository = depotModel.getObject().getRepository();+ Repository repository = projectModel.getObject().getRepository();try ( RevWalk revWalk = new RevWalk(repository);TreeWalk treeWalk = new TreeWalk(repository)) {- RevCommit commit = revWalk.parseCommit(depotModel.getObject().getObjectId(revision));+ RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision));treeWalk.addTree(commit.getTree());List<BlobIdent> roots = new ArrayList<>();@@ -92,9 +92,9 @@ public abstract class PathSelector extends Panel {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent node) {- Repository repository = depotModel.getObject().getRepository();+ Repository repository = projectModel.getObject().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {- RevCommit commit = revWalk.parseCommit(depotModel.getObject().getObjectId(revision));+ RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision));TreeWalk treeWalk = TreeWalk.forPath(repository, node.path, commit.getTree());treeWalk.enterSubtree();List<BlobIdent> children = new ArrayList<>();@@ -165,7 +165,7 @@ public abstract class PathSelector extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.html b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.htmldeleted file mode 100644index ca863f9ba7..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.html+++ /dev/null@@ -1,11 +0,0 @@-<wicket:panel>- <div class="privilege-source well">- <h4>- <a wicket:id="userLink"></a> has <b wicket:id="privilege"></b> privilege on- <a wicket:id="depotLink"><span wicket:id="name"></span></a> because- </h4>- <ul>- <li wicket:id="sources"></li>- </ul>- </div>-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 7b791a3cfe..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java+++ /dev/null@@ -1,63 +0,0 @@-package com.gitplex.server.web.component.privilegesource;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-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.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.web.component.link.AccountLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;-import com.gitplex.server.web.util.depotaccess.PrivilegeSource;--@SuppressWarnings("serial")-public class PrivilegeSourcePanel extends Panel {-- private final IModel<Account> userModel;-- private final IModel<Depot> depotModel;-- public PrivilegeSourcePanel(String id, IModel<Account> userModel, IModel<Depot> depotModel) {- super(id);-- this.userModel = userModel;- this.depotModel = depotModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AccountLink("userLink", userModel.getObject()));-- DepotAccess access = new DepotAccess(userModel.getObject(), depotModel.getObject());-- add(new Label("privilege", access.getGreatestPrivilege()));-- Link<Void> depotLink = new ViewStateAwarePageLink<Void>("depotLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(depotModel.getObject()));- depotLink.add(new Label("name", depotModel.getObject().getName()));- add(depotLink);-- RepeatingView sourcesView = new RepeatingView("sources");- for (PrivilegeSource source: access.getPrivilegeSources()) {- if (source.getPrivilege() == access.getGreatestPrivilege()) {- sourcesView.add(source.render(sourcesView.newChildId()));- }- }- add(sourcesView);- }-- @Override- protected void onDetach() {- userModel.detach();- depotModel.detach();-- super.onDetach();- }--}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/projectchoice/AbstractProjectChoice.javasimilarity index 50%rename from web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.javarename to web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.javaindex 226c7c465c..872ed0653a 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java@@ -1,27 +1,27 @@-package com.gitplex.server.web.component.accountchoice;+package com.gitplex.server.web.component.projectchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class AccountSingleChoice extends Select2Choice<Account> {+public class AbstractProjectChoice extends Select2Choice<Project> {- public AccountSingleChoice(String id, IModel<Account> model,- AbstractAccountChoiceProvider choiceProvider) {- super(id, model, choiceProvider);+ public AbstractProjectChoice(String id, IModel<Project> projectModel,+ AbstractProjectChoiceProvider choiceProvider) {+ super(id, projectModel, choiceProvider);}@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Choose an account ...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");+ getSettings().setPlaceholder("Choose a project...");+ getSettings().setFormatResult("gitplex.server.projectChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.projectChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.projectChoiceFormatter.escapeMarkup");}@Override@@ -34,7 +34,7 @@ public class AccountSingleChoice extends Select2Choice<Account> {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));}}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/projectchoice/AbstractProjectChoiceProvider.javasimilarity index 51%rename from web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.javarename to web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.javaindex 02b9168535..be211ad93f 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotchoice;+package com.gitplex.server.web.component.projectchoice;import java.util.Collection;import java.util.List;@@ -9,27 +9,27 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.select2.ChoiceProvider;@SuppressWarnings("serial")-public abstract class AbstractDepotChoiceProvider extends ChoiceProvider<Depot> {+public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Project> {@Override- public void toJson(Depot choice, JSONWriter writer) throws JSONException {+ public void toJson(Project choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId());writer.key("name");writer.value(StringEscapeUtils.escapeHtml4(choice.getName()));}@Override- public Collection<Depot> toChoices(Collection<String> ids) {- List<Depot> list = Lists.newArrayList();- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);+ public Collection<Project> toChoices(Collection<String> ids) {+ List<Project> list = Lists.newArrayList();+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);for (String each : ids) {Long id = Long.valueOf(each);- list.add(depotManager.load(id));+ list.add(projectManager.load(id));}return list;diff --git a/web/src/main/java/com/gitplex/server/web/component/projectchoice/ProjectChoiceResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/projectchoice/ProjectChoiceResourceReference.javanew file mode 100644index 0000000000..c19a8b3744--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/ProjectChoiceResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.component.projectchoice;++import com.gitplex.server.web.page.base.BaseDependentResourceReference;++public class ProjectChoiceResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectChoiceResourceReference() {+ super(ProjectChoiceResourceReference.class, "project-choice.js");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectchoice/project-choice.js b/web/src/main/java/com/gitplex/server/web/component/projectchoice/project-choice.jsnew file mode 100644index 0000000000..48364f4706--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/project-choice.js@@ -0,0 +1,13 @@+gitplex.server.projectChoiceFormatter = {+ formatSelection: function(project) {+ return project.name;+ },++ formatResult: function(project) {+ return project.name;+ },++ escapeMarkup: function(m) {+ return m;+ }+};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.html b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.htmlsimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.htmlrename to web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.htmlindex 8261e32e48..668dd3cd2d 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.html+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.html@@ -1,5 +1,5 @@<wicket:panel>- <div wicket:id="tree" class="depot-file-picker"></div>+ <div wicket:id="tree" class="project-file-picker"></div><wicket:fragment wicket:id="folderFrag"><span wicket:id="icon"></span> <span wicket:id="label"></span></wicket:fragment>diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.java b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.javarename to web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.javaindex 76109565f5..770f94076a 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfilepicker;+package com.gitplex.server.web.component.projectfilepicker;import java.util.Iterator;import java.util.List;@@ -20,17 +20,17 @@ import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.BlobIdentFilter;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.BlobIcon;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")-public abstract class DepotFilePicker extends GenericPanel<Depot> {+public abstract class ProjectFilePicker extends GenericPanel<Project> {private final String revision;- public DepotFilePicker(String id, IModel<Depot> depotModel, String revision) {- super(id, depotModel);+ public ProjectFilePicker(String id, IModel<Project> projectModel, String revision) {+ super(id, projectModel);this.revision = revision;}@@ -76,7 +76,7 @@ public abstract class DepotFilePicker extends GenericPanel<Depot> {public void expand(BlobIdent blobIdent) {super.expand(blobIdent);- List<BlobIdent> children = DepotFilePicker.this.getModelObject().getChildren(blobIdent, getBlobIdentFilter());+ List<BlobIdent> children = ProjectFilePicker.this.getModelObject().getChildren(blobIdent, getBlobIdentFilter());if (children.size() == 1 && children.get(0).isTree())expand(children.get(0));}@@ -85,12 +85,12 @@ public abstract class DepotFilePicker extends GenericPanel<Depot> {protected Component newContentComponent(String id, IModel<BlobIdent> node) {BlobIdent blobIdent = node.getObject();if (blobIdent.isTree()) {- Fragment fragment = new Fragment(id, "folderFrag", DepotFilePicker.this);+ Fragment fragment = new Fragment(id, "folderFrag", ProjectFilePicker.this);fragment.add(new BlobIcon("icon", node));fragment.add(new Label("label", blobIdent.getName()));return fragment;} else {- Fragment fragment = new Fragment(id, "fileFrag", DepotFilePicker.this);+ Fragment fragment = new Fragment(id, "fileFrag", ProjectFilePicker.this);AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Override@@ -113,7 +113,7 @@ public abstract class DepotFilePicker extends GenericPanel<Depot> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new DepotFilePickerResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectFilePickerResourceReference()));}protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);diff --git a/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePickerResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePickerResourceReference.javanew file mode 100644index 0000000000..b174f15abd--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePickerResourceReference.java@@ -0,0 +1,12 @@+package com.gitplex.server.web.component.projectfilepicker;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class ProjectFilePickerResourceReference extends BaseDependentCssResourceReference {++ public ProjectFilePickerResourceReference() {+ super(ProjectFilePickerResourceReference.class, "project-file-picker.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.css b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/project-file-picker.csssimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.cssrename to web/src/main/java/com/gitplex/server/web/component/projectfilepicker/project-file-picker.cssindex 6400f9283f..c5403e8a2a 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.css+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/project-file-picker.css@@ -1,4 +1,4 @@-.depot-file-picker {+.project-file-picker {padding: 8px 24px 8px 4px;max-width: 800px;min-width: 180px;diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.html b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.htmlsimilarity index 69%rename from web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.htmlindex 18e651ca90..6ae4182042 100644--- a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.html+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html@@ -2,17 +2,17 @@<div class="privilege selection"><a wicket:id="read"><div class="title">Read</div>- <div class="description">Able to pull and browse the repository</div>+ <div class="description">Able to pull and browse code of the project</div></a><a wicket:id="write"><div class="title">Write</div><div class="description">Has full read privilege, and can also push to- the repository unless gatekeeper prevents</div>+ code of the project</div></a><a wicket:id="admin"><div class="title">Admin</div><div class="description">Has full write privilege, and can also manage- settings of the repository</div>+ settings of the project</div></a></div></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.javasimilarity index 60%rename from web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.javarename to web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.javaindex cd8445ecf4..ff7920e179 100644--- a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.privilegeselection;+package com.gitplex.server.web.component.projectprivilege.privilegeselection;import javax.annotation.Nullable;@@ -7,18 +7,15 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.security.ProjectPrivilege;@SuppressWarnings("serial")public abstract class PrivilegeSelectionPanel extends Panel {- private final boolean withAdmin;+ private final ProjectPrivilege currentPrivilege;- private final DepotPrivilege currentPrivilege;-- public PrivilegeSelectionPanel(String id, boolean withAdmin, @Nullable DepotPrivilege currentPrivilege) {+ public PrivilegeSelectionPanel(String id, @Nullable ProjectPrivilege currentPrivilege) {super(id);- this.withAdmin = withAdmin;this.currentPrivilege = currentPrivilege;}@@ -30,13 +27,13 @@ public abstract class PrivilegeSelectionPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- if (currentPrivilege == DepotPrivilege.READ)+ if (currentPrivilege == ProjectPrivilege.READ)add(AttributeAppender.append("class", "active"));}@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, DepotPrivilege.READ);+ onSelect(target, ProjectPrivilege.READ);}});@@ -45,13 +42,13 @@ public abstract class PrivilegeSelectionPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- if (currentPrivilege == DepotPrivilege.WRITE)+ if (currentPrivilege == ProjectPrivilege.WRITE)add(AttributeAppender.append("class", "active"));}@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, DepotPrivilege.WRITE);+ onSelect(target, ProjectPrivilege.WRITE);}});@@ -60,24 +57,18 @@ public abstract class PrivilegeSelectionPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- if (currentPrivilege == DepotPrivilege.ADMIN)+ if (currentPrivilege == ProjectPrivilege.ADMIN)add(AttributeAppender.append("class", "active"));}- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(withAdmin);- }-@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, DepotPrivilege.ADMIN);+ onSelect(target, ProjectPrivilege.ADMIN);}});}- protected abstract void onSelect(AjaxRequestTarget target, DepotPrivilege privilege);+ protected abstract void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege);}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.javanew file mode 100644index 0000000000..0ece5aa293--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java@@ -0,0 +1,12 @@+package com.gitplex.server.web.component.projectprivilege.privilegesource;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class PrivilegeSourceCssResourceReference extends BaseDependentCssResourceReference {++ public PrivilegeSourceCssResourceReference() {+ super(PrivilegeSourceCssResourceReference.class, "privilege-source.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.htmlnew file mode 100644index 0000000000..4aa51a4f2a--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html@@ -0,0 +1,12 @@+<wicket:panel>+ <div class="privilege-source">+ <b wicket:id="user"></b> can <b wicket:id="privilege"></b> project <b wicket:id="project"></b> as:+ <ul>+ <li wicket:id="userIsRoot" class="user-is-root">The user is administrator</li>+ <li wicket:id="projectIsPublic" class="project-is-public">The project is public</li>+ <wicket:container wicket:id="groups">+ <li class="user-is-member-of-group">The user is member of group <a wicket:id="group"></a></li>+ </wicket:container>+ </ul>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.javanew file mode 100644index 0000000000..76b6f3bc80--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java@@ -0,0 +1,144 @@+package com.gitplex.server.web.component.projectprivilege.privilegesource;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.web.page.group.GroupAuthorizationsPage;+import com.gitplex.server.web.page.group.GroupProfilePage;++@SuppressWarnings("serial")+public class PrivilegeSourcePanel extends Panel {++ private final IModel<User> userModel;++ private final IModel<Project> projectModel;++ private final ProjectPrivilege privilege;++ public PrivilegeSourcePanel(String id, User user, Project project, ProjectPrivilege privilege) {+ super(id);++ Long userId = user.getId();+ userModel = new LoadableDetachableModel<User>() {++ @Override+ protected User load() {+ return GitPlex.getInstance(UserManager.class).load(userId);+ }++ };++ Long projectId = project.getId();+ projectModel = new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ return GitPlex.getInstance(ProjectManager.class).load(projectId);+ }++ };++ this.privilege = privilege;+ }++ @Override+ public void onInitialize() {+ super.onInitialize();++ User user = userModel.getObject();+ Project project = projectModel.getObject();+ add(new Label("user", user.getDisplayName()));+ add(new Label("project", project.getName()));+ add(new Label("privilege", privilege.name()));++ add(new WebMarkupContainer("userIsRoot").setVisible(user.isRoot()));+ add(new WebMarkupContainer("projectIsPublic")+ .setVisible(privilege == ProjectPrivilege.READ && project.isPublicRead()));+ add(new ListView<Group>("groups", new LoadableDetachableModel<List<Group>>() {++ @Override+ protected List<Group> load() {+ List<Group> groups = new ArrayList<>();+ for (Group group: user.getGroups()) {+ if (group.isAdministrator()) {+ groups.add(group);+ } else {+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (authorization.getProject().equals(project)+ && authorization.getPrivilege() == privilege) {+ groups.add(group);+ break;+ }+ }+ }+ }+ return groups;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Group> item) {+ Group group = item.getModelObject();+ if (group.isAdministrator()) {+ item.add(new BookmarkablePageLink<Void>("group", GroupProfilePage.class,+ GroupAuthorizationsPage.paramsOf(group)) {++ @Override+ public IModel<?> getBody() {+ return Model.of(item.getModelObject().getName());+ }++ });+ } else {+ item.add(new BookmarkablePageLink<Void>("group", GroupAuthorizationsPage.class,+ GroupAuthorizationsPage.paramsOf(group)) {++ @Override+ public IModel<?> getBody() {+ return Model.of(item.getModelObject().getName());+ }++ });+ }+ }++ });+ }++ @Override+ protected void onDetach() {+ userModel.detach();+ projectModel.detach();++ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(CssHeaderItem.forReference(new PrivilegeSourceCssResourceReference()));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/privilege-source.css b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/privilege-source.cssnew file mode 100644index 0000000000..4ad64569e0--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/privilege-source.css@@ -0,0 +1,12 @@+.privilege-source {+ padding: 8px;+}+.privilege-source b {+ color: #444;+}+.privilege-source a {+ font-weight: bold;+}+.privilege-source ul {+ margin-bottom: 0;+}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.html b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.htmlsimilarity index 51%rename from web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.htmlrename to web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.htmlindex 7dd71b0b94..981e4bdf4e 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.html+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.html@@ -1,17 +1,17 @@<wicket:panel>- <div class="depot-selector">+ <div class="project-selector"><wicket:enclosure child="search"><div class="search">- <input wicket:id="search" class="form-control" placeholder="Search repositories..."></input>+ <input wicket:id="search" class="form-control" placeholder="Search projects..."></input></div></wicket:enclosure>- <ul wicket:id="depots" class="list-unstyled depots autosize">- <li wicket:id="depots" class="depot selectable">+ <ul wicket:id="projects" class="list-unstyled projects autosize">+ <li wicket:id="projects" class="project selectable"><a wicket:id="link"><i class="fa fa-ext fa-repo"></i> <span wicket:id="name"></span></a></li></ul>- <div wicket:id="noDepots" class="alert alert-warning">No repositories found</div>+ <div wicket:id="noProjects" class="alert alert-warning">No projects found</div></div></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.javasimilarity index 59%rename from web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.javarename to web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.javaindex bae98ab7a5..171033797c 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotselector;+package com.gitplex.server.web.component.projectselector;import java.util.ArrayList;import java.util.Collection;@@ -27,58 +27,58 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")-public abstract class DepotSelector extends Panel {+public abstract class ProjectSelector extends Panel {- private final IModel<Collection<Depot>> depotsModel;+ private final IModel<Collection<Project>> projectsModel;- private final Long currentDepotId;+ private final Long currentProjectId;- private ListView<Depot> depotsView;+ private ListView<Project> projectsView;private String searchInput;- public DepotSelector(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {+ public ProjectSelector(String id, IModel<Collection<Project>> projectsModel, Long currentProjectId) {super(id);- this.depotsModel = depotsModel;- this.currentDepotId = currentDepotId;+ this.projectsModel = projectsModel;+ this.currentProjectId = currentProjectId;}@Overrideprotected void onInitialize() {super.onInitialize();- WebMarkupContainer depotsContainer = new WebMarkupContainer("depots") {+ WebMarkupContainer projectsContainer = new WebMarkupContainer("projects") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());+ setVisible(!projectsView.getModelObject().isEmpty());}};- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);+ projectsContainer.setOutputMarkupPlaceholderTag(true);+ add(projectsContainer);- WebMarkupContainer noDepotsContainer = new WebMarkupContainer("noDepots") {+ WebMarkupContainer noProjectsContainer = new WebMarkupContainer("noProjects") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());+ setVisible(projectsView.getModelObject().isEmpty());}};- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);+ noProjectsContainer.setOutputMarkupPlaceholderTag(true);+ add(noProjectsContainer);TextField<String> searchField = new TextField<String>("search", Model.of(""));add(searchField);@@ -87,8 +87,8 @@ public abstract class DepotSelector extends Panel {@Overrideprotected void onInputChange(AjaxRequestTarget target) {searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(noDepotsContainer);+ target.add(projectsContainer);+ target.add(noProjectsContainer);}});@@ -98,14 +98,14 @@ public abstract class DepotSelector extends Panel {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();Long id = params.getParameterValue("id").toLong();- onSelect(target, GitPlex.getInstance(DepotManager.class).load(id));+ onSelect(target, GitPlex.getInstance(ProjectManager.class).load(id));}@Overridepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);- String script = String.format("gitplex.server.depotSelector.init('%s', %s)",+ String script = String.format("gitplex.server.projectSelector.init('%s', %s)",searchField.getMarkupId(true),getCallbackFunction(CallbackParameter.explicit("id")));response.render(OnDomReadyHeaderItem.forScript(script));@@ -113,26 +113,26 @@ public abstract class DepotSelector extends Panel {});- depotsContainer.add(depotsView = new ListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {+ projectsContainer.add(projectsView = new ListView<Project>("projects",+ new LoadableDetachableModel<List<Project>>() {@Override- protected List<Depot> load() {- List<Depot> depots = new ArrayList<>();- for (Depot depot: depotsModel.getObject()) {- if (depot.matchesFQN(searchInput)) {- depots.add(depot);+ protected List<Project> load() {+ List<Project> projects = new ArrayList<>();+ for (Project project: projectsModel.getObject()) {+ if (project.matches(searchInput)) {+ projects.add(project);}}- depots.sort(Depot::compareLastVisit);- return depots;+ projects.sort(Project::compareLastVisit);+ return projects;}}) {@Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();+ protected void populateItem(ListItem<Project> item) {+ Project project = item.getModelObject();AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {@Override@@ -144,19 +144,19 @@ public abstract class DepotSelector extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- PageParameters params = DepotBlobPage.paramsOf(item.getModelObject());- tag.put("href", urlFor(DepotBlobPage.class, params).toString());+ PageParameters params = ProjectBlobPage.paramsOf(item.getModelObject());+ tag.put("href", urlFor(ProjectBlobPage.class, params).toString());}};- if (depot.getId().equals(currentDepotId))+ if (project.getId().equals(currentProjectId))link.add(AttributeAppender.append("class", " current"));- link.add(new Label("name", depot.getFQN()));+ link.add(new Label("name", project.getName()));item.add(link);if (item.getIndex() == 0)item.add(AttributeAppender.append("class", "active"));- item.add(AttributeAppender.append("data-id", depot.getId()));+ item.add(AttributeAppender.append("data-id", project.getId()));}});@@ -164,7 +164,7 @@ public abstract class DepotSelector extends Panel {@Overrideprotected void onDetach() {- depotsModel.detach();+ projectsModel.detach();super.onDetach();}@@ -173,9 +173,9 @@ public abstract class DepotSelector extends Panel {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new DepotSelectorResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ProjectSelectorResourceReference()));}- protected abstract void onSelect(AjaxRequestTarget target, Depot depot);+ protected abstract void onSelect(AjaxRequestTarget target, Project project);}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelectorResourceReference.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.javarename to web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelectorResourceReference.javaindex be15bbf180..6a695f299c 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelectorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotselector;+package com.gitplex.server.web.component.projectselector;import java.util.List;@@ -11,12 +11,12 @@ import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class DepotSelectorResourceReference extends BaseDependentResourceReference {+public class ProjectSelectorResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public DepotSelectorResourceReference() {- super(DepotSelectorResourceReference.class, "depot-selector.js");+ public ProjectSelectorResourceReference() {+ super(ProjectSelectorResourceReference.class, "project-selector.js");}@Override@@ -24,7 +24,7 @@ public class DepotSelectorResourceReference extends BaseDependentResourceReferenList<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(DepotSelectorResourceReference.class, "depot-selector.css")));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ProjectSelectorResourceReference.class, "project-selector.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.css b/web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.csssimilarity index 55%rename from web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.cssrename to web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.cssindex 5367678ae8..e3823ebbd8 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.css+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.css@@ -1,16 +1,16 @@-.depot-selector {+.project-selector {padding: 20px;}-.depot-selector .btn {+.project-selector .btn {margin-bottom: 12px;}-.depot-selector ul, .depot-selector .alert {+.project-selector ul, .project-selector .alert {margin: 12px 0 0 0;}-.depot-selector ul a {+.project-selector ul a {padding: 5px 20px !important;}-.depot-selector ul a.current>span:before {+.project-selector ul a.current>span:before {font-family: "FontAwesome";content: "\f00c";margin-right: 4px;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.js b/web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.jssimilarity index 54%rename from web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.jsrename to web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.jsindex a99d6fe141..016fad8ba1 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.js+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/project-selector.js@@ -1,4 +1,4 @@-gitplex.server.depotSelector = {+gitplex.server.projectSelector = {init: function(inputId, callback) {var $input = $("#" + inputId);@@ -6,34 +6,34 @@ gitplex.server.depotSelector = {$input.focus();});- var $container = $input.closest(".depot-selector");+ var $container = $input.closest(".project-selector");$input.bind("keydown", "return", function() {- var id = $container.find("li.depot.active").data("id");+ var id = $container.find("li.project.active").data("id");if (id)callback(id);});$input.bind("keydown", "up", function(e) {e.preventDefault();- var $active = $container.find("li.depot.active");- var $prev = $active.prev("li.depot");+ var $active = $container.find("li.project.active");+ var $prev = $active.prev("li.project");if ($prev.length != 0) {$active.removeClass("active");$prev.addClass("active");}- $container.find(".depots").scrollIntoView("li.depot.active", 30, 8);+ $container.find(".projects").scrollIntoView("li.project.active", 30, 8);});$input.bind("keydown", "down", function(e) {e.preventDefault();- var $active = $container.find("li.depot.active");- var $next = $active.next("li.depot");+ var $active = $container.find("li.project.active");+ var $next = $active.next("li.project");if ($next.length != 0) {$active.removeClass("active");$next.addClass("active");}- $container.find(".depots").scrollIntoView("li.depot.active", 30, 8);+ $container.find(".projects").scrollIntoView("li.project.active", 30, 8);});}};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.javaindex 7a94ab5bcf..75076cde52 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java@@ -9,14 +9,14 @@ import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;+import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;import com.gitplex.server.web.component.select2.SelectToAddChoice;@SuppressWarnings("serial")-public abstract class ReviewerChoice extends SelectToAddChoice<Account> {+public abstract class ReviewerChoice extends SelectToAddChoice<User> {private final IModel<PullRequest> requestModel;@@ -31,16 +31,16 @@ public abstract class ReviewerChoice extends SelectToAddChoice<Account> {super.onInitialize();getSettings().setPlaceholder("Select user to add as reviewer...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.userChoiceFormatter.escapeMarkup");}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));}@Override@@ -51,7 +51,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice<Account> {}@Override- protected void onSelect(AjaxRequestTarget target, Account user) {+ protected void onSelect(AjaxRequestTarget target, User user) {PullRequest request = requestModel.getObject();ReviewInvitation invitation = null;for(ReviewInvitation each: request.getReviewInvitations()) {diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.javaindex 7b144ef289..b113e64e75 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java@@ -26,7 +26,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.Review;import com.gitplex.server.model.ReviewInvitation;@@ -34,7 +34,7 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ReviewStatus;import com.gitplex.server.web.behavior.dropdown.DropdownHover;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;import com.gitplex.server.web.websocket.PageDataChanged;@@ -63,12 +63,12 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {protected void onInitialize() {super.onInitialize();- IModel<List<Account>> reviewersModel = new LoadableDetachableModel<List<Account>>() {+ IModel<List<User>> reviewersModel = new LoadableDetachableModel<List<User>>() {@Override- protected List<Account> load() {+ protected List<User> load() {PullRequest request = getPullRequest();- List<Account> reviewers = new ArrayList<>();+ List<User> reviewers = new ArrayList<>();List<Review> reviews = new ArrayList<>(request.getReviewStatus().getEffectiveReviews().values());Collections.sort(reviews);@@ -76,19 +76,19 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {for (Review review: reviews)reviewers.add(review.getUser());- for (Account awaitingReviewer: request.getReviewStatus().getAwaitingReviewers())+ for (User awaitingReviewer: request.getReviewStatus().getAwaitingReviewers())reviewers.add(awaitingReviewer);return reviewers;}};- add(new ListView<Account>("reviewers", reviewersModel) {+ add(new ListView<User>("reviewers", reviewersModel) {@Override- protected void populateItem(ListItem<Account> item) {+ protected void populateItem(ListItem<User> item) {item.add(new AvatarLink("avatar", item.getModelObject()));- item.add(new AccountLink("name", item.getModelObject()));+ item.add(new UserLink("name", item.getModelObject()));PullRequest request = getPullRequest();Review review = request.getReviewStatus().getEffectiveReviews().get(item.getModelObject());@@ -142,7 +142,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {public void onClick(AjaxRequestTarget target) {PullRequest request = getPullRequest();- Account reviewer = item.getModelObject();+ User reviewer = item.getModelObject();ReviewInvitation invitation = null;for (ReviewInvitation each: request.getReviewInvitations()) {if (each.getUser().equals(reviewer)) {@@ -176,9 +176,9 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {super.onConfigure();PullRequest request = getPullRequest();- Account currentUser = SecurityUtils.getAccount();+ User currentUser = SecurityUtils.getUser();setVisible(currentUser != null && currentUser.equals(request.getSubmitter())- || SecurityUtils.canManage(request.getTargetDepot()));+ || SecurityUtils.canManage(request.getTargetProject()));}});@@ -196,17 +196,17 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {super.onConfigure();PullRequest request = getPullRequest();- Account reviewer = item.getModelObject();+ User reviewer = item.getModelObject();Review review = request.getReviewStatus().getEffectiveReviews().get(reviewer);setVisible(review != null- && (reviewer.equals(SecurityUtils.getAccount())- || SecurityUtils.canManage(request.getTargetDepot())));+ && (reviewer.equals(SecurityUtils.getUser())+ || SecurityUtils.canManage(request.getTargetProject())));}@Overridepublic void onClick(AjaxRequestTarget target) {PullRequest request = getPullRequest();- Account reviewer = item.getModelObject();+ User reviewer = item.getModelObject();request.clearReviewStatus();GitPlex.getInstance(ReviewManager.class).delete(reviewer, request);reviewersModel.detach();@@ -241,7 +241,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {}@Override- protected void onSelect(AjaxRequestTarget target, Account user) {+ protected void onSelect(AjaxRequestTarget target, User user) {super.onSelect(target, user);send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.javaindex 93b0f9dbb0..306feecdfd 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java@@ -5,13 +5,13 @@ import java.util.List;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;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.userchoice.AbstractUserChoiceProvider;import com.gitplex.server.web.component.select2.Response;-public class ReviewerProvider extends AbstractAccountChoiceProvider {+public class ReviewerProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;@@ -22,19 +22,19 @@ public class ReviewerProvider extends AbstractAccountChoiceProvider {}@Override- public void query(String term, int page, Response<Account> response) {- List<Account> reviewers = requestModel.getObject().getRemainingReviewers();+ public void query(String term, int page, Response<User> response) {+ List<User> reviewers = requestModel.getObject().getRemainingReviewers();- for (Iterator<Account> it = reviewers.iterator(); it.hasNext();) {- Account user = it.next();+ for (Iterator<User> it = reviewers.iterator(); it.hasNext();) {+ User user = it.next();if (!user.matches(term))it.remove();}reviewers.sort((user1, user2) -> user1.getDisplayName().compareTo(user2.getDisplayName()));- int first = page * WebConstants.DEFAULT_PAGE_SIZE;- int last = first + WebConstants.DEFAULT_PAGE_SIZE;+ int first = page * WebConstants.PAGE_SIZE;+ int last = first + WebConstants.PAGE_SIZE;if (last > reviewers.size()) {response.addAll(reviewers.subList(first, reviewers.size()));} else {diff --git a/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentAssistBehavior.javaindex 714551727c..78678e6298 100644--- a/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentAssistBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentAssistBehavior.java@@ -13,8 +13,8 @@ import com.gitplex.codeassist.ParentedElement;import com.gitplex.codeassist.grammar.ElementSpec;import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;import com.gitplex.codeassist.grammar.RuleRefElementSpec;-import com.gitplex.server.model.Depot;-import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.model.Project;+import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.util.reviewappointment.ReviewAppointmentParser;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.server.web.util.SuggestionUtils;@@ -22,21 +22,21 @@ import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class ReviewAppointmentAssistBehavior extends ANTLRAssistBehavior {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private static final String VALUE_OPEN = "(";private static final String VALUE_CLOSE = ")";- public ReviewAppointmentAssistBehavior(IModel<Depot> depotModel) {+ public ReviewAppointmentAssistBehavior(IModel<Project> projectModel) {super(ReviewAppointmentParser.class, "expr");- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Overridepublic void detach(Component component) {super.detach(component);- depotModel.detach();+ projectModel.detach();}@Override@@ -49,10 +49,10 @@ public class ReviewAppointmentAssistBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {if (expectedElement.findParentByRule("userCriteria") != null) {- return SuggestionUtils.suggestUser(depotModel.getObject(), DepotPrivilege.READ,+ return SuggestionUtils.suggestUser(projectModel.getObject(), ProjectPrivilege.READ,unfencedMatchWith);} else {- return SuggestionUtils.suggestTeam(depotModel.getObject(), unfencedMatchWith);+ return SuggestionUtils.suggestGroup(unfencedMatchWith);}}@@ -64,9 +64,9 @@ public class ReviewAppointmentAssistBehavior extends ANTLRAssistBehavior {}.suggest(expectedElement.getSpec(), matchWith);} else if (spec.getRuleName().equals("DIGIT")) {List<InputSuggestion> suggestions = new ArrayList<>();- suggestions.add(new InputSuggestion("1", "require one review from the team", null));- suggestions.add(new InputSuggestion("2", "require two reviews from the team", null));- suggestions.add(new InputSuggestion("3", "require three reviews from the team", null));+ suggestions.add(new InputSuggestion("1", "require one review from the group", null));+ suggestions.add(new InputSuggestion("2", "require two reviews from the group", null));+ suggestions.add(new InputSuggestion("3", "require three reviews from the group", null));for (Iterator<InputSuggestion> it = suggestions.iterator(); it.hasNext();) {InputSuggestion suggestion = it.next();@@ -86,8 +86,8 @@ public class ReviewAppointmentAssistBehavior extends ANTLRAssistBehavior {if (expectedElement.getSpec() instanceof RuleRefElementSpec) {RuleRefElementSpec spec = (RuleRefElementSpec) expectedElement.getSpec();if (spec.getRuleName().equals("count")) {- hints.add("Specify required reviews from the team");- hints.add("If not specified, one review is required from the team");+ hints.add("Specify required reviews from the group");+ hints.add("If not specified, one review is required from the group");}}return hints;@@ -99,10 +99,10 @@ public class ReviewAppointmentAssistBehavior extends ANTLRAssistBehavior {String description;switch (suggestedLiteral) {case "all":- description = "require reviews from all members of the team";+ description = "require reviews from all members of the group";break;case ":":- description = "number of required reviews from the team";+ description = "number of required reviews from the group";break;case " ":description = "space";diff --git a/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentInput.java b/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentInput.javaindex 3d738c3625..8fe2eac6c7 100644--- a/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/reviewappointment/ReviewAppointmentInput.java@@ -10,25 +10,25 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.reviewappointment.ReviewAppointment;@SuppressWarnings("serial")public class ReviewAppointmentInput extends TextField<String> {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public ReviewAppointmentInput(String id, IModel<Depot> depotModel, IModel<String> exprModel) {+ public ReviewAppointmentInput(String id, IModel<Project> projectModel, IModel<String> exprModel) {super(id, exprModel);- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Overrideprotected void onInitialize() {super.onInitialize();- add(new ReviewAppointmentAssistBehavior(depotModel));+ add(new ReviewAppointmentAssistBehavior(projectModel));add(new IValidator<String>() {@Override@@ -55,7 +55,7 @@ public class ReviewAppointmentInput extends TextField<String> {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.html b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.htmlindex 4c3eac255f..75dafd2ebb 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.html+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.html@@ -1,6 +1,6 @@<wicket:panel>- <span class="repository-and-revision">- <a wicket:id="repositoryPicker" class="repository btn btn-default btn-xs"></a>+ <span class="project-and-revision">+ <a wicket:id="projectPicker" class="project btn btn-default btn-xs"></a><a wicket:id="revisionPicker" class="revision btn btn-default btn-xs"></a></span></wicket:panel>\ No newline at end of filediff --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 d78550e374..dc930cf072 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,38 +9,38 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.web.component.DepotPicker;-import com.gitplex.server.web.util.model.AffinalDepotsModel;+import com.gitplex.server.web.component.ProjectPicker;+import com.gitplex.server.web.util.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalRevisionPicker extends Panel {- private Long depotId;+ private Long projectId;private String revision;public AffinalRevisionPicker(String id, Long repoId, String revision) {super(id);- this.depotId = repoId;+ this.projectId = repoId;this.revision = revision;}private void newRevisionPicker(@Nullable AjaxRequestTarget target) {- RevisionPicker revisionPicker = new RevisionPicker("revisionPicker", new LoadableDetachableModel<Depot>() {+ RevisionPicker revisionPicker = new RevisionPicker("revisionPicker", new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- return getDepot();+ protected Project load() {+ return getProject();}}, revision) {@Overrideprotected void onSelect(AjaxRequestTarget target, String revision) {- AffinalRevisionPicker.this.onSelect(target, getDepot(), revision);+ AffinalRevisionPicker.this.onSelect(target, getProject(), revision);}};@@ -52,22 +52,22 @@ public abstract class AffinalRevisionPicker extends Panel {}}- private Depot getDepot() {- return GitPlex.getInstance(Dao.class).load(Depot.class, depotId);+ private Project getProject() {+ return GitPlex.getInstance(Dao.class).load(Project.class, projectId);}@Overrideprotected void onInitialize() {super.onInitialize();- add(new DepotPicker("repositoryPicker", new AffinalDepotsModel(depotId), depotId) {+ add(new ProjectPicker("projectPicker", new AffinalProjectsModel(projectId), projectId) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- depotId = depot.getId();- revision = depot.getDefaultBranch();+ protected void onSelect(AjaxRequestTarget target, Project project) {+ projectId = project.getId();+ revision = project.getDefaultBranch();newRevisionPicker(target);- AffinalRevisionPicker.this.onSelect(target, depot, revision);+ AffinalRevisionPicker.this.onSelect(target, project, revision);}});@@ -82,6 +82,6 @@ public abstract class AffinalRevisionPicker extends Panel {response.render(CssHeaderItem.forReference(new RevisionPickerResourceReference()));}- protected abstract void onSelect(AjaxRequestTarget target, Depot depot, String revision);+ protected abstract void onSelect(AjaxRequestTarget target, Project project, String revision);}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 3c45b4e3d5..27a0d951b1 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,14 +9,14 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;@SuppressWarnings("serial")abstract class CreateTagPanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final String tagName;@@ -24,9 +24,9 @@ abstract class CreateTagPanel extends Panel {private String message;- public CreateTagPanel(String id, IModel<Depot> depotModel, String tagName, String revision) {+ public CreateTagPanel(String id, IModel<Project> projectModel, String tagName, String revision) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.tagName = tagName;this.revision = revision;}@@ -59,8 +59,8 @@ abstract class CreateTagPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Account user = GitPlex.getInstance(AccountManager.class).getCurrent();- depotModel.getObject().tag(tagName, revision, user.asPerson(), message);+ User user = GitPlex.getInstance(UserManager.class).getCurrent();+ projectModel.getObject().tag(tagName, revision, user.asPerson(), message);onCreate(target, tagName);}@@ -82,7 +82,7 @@ abstract class CreateTagPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 a03d8e63cd..e4f4923660 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@@ -8,8 +8,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.support.DepotAndRevision;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.support.ProjectAndRevision;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.modal.ModalPanel;@@ -17,27 +17,27 @@ import com.gitplex.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")public abstract class RevisionPicker extends DropdownLink {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private String revision;private final boolean canCreateRef;- public RevisionPicker(String id, IModel<Depot> depotModel, String revision, boolean canCreateRef) {+ public RevisionPicker(String id, IModel<Project> projectModel, String revision, boolean canCreateRef) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;this.canCreateRef = canCreateRef;}- public RevisionPicker(String id, IModel<Depot> depotModel, String revision) {- this(id, depotModel, revision, false);+ public RevisionPicker(String id, IModel<Project> projectModel, String revision) {+ this(id, projectModel, revision, false);}@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new RevisionSelector(id, depotModel, revision, canCreateRef) {+ return new RevisionSelector(id, projectModel, revision, canCreateRef) {@Overrideprotected void onSelect(AjaxRequestTarget target, String revision) {@@ -72,7 +72,7 @@ public abstract class RevisionPicker extends DropdownLink {@Overridepublic IModel<?> getBody() {String iconClass;- DepotAndRevision repoAndRevision = new DepotAndRevision(depotModel.getObject(), revision);+ ProjectAndRevision repoAndRevision = new ProjectAndRevision(projectModel.getObject(), revision);String label = repoAndRevision.getBranch();if (label != null) {iconClass = "fa fa-code-fork";@@ -93,7 +93,7 @@ public abstract class RevisionPicker extends DropdownLink {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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 f69f320b4b..dddd8aa572 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@@ -39,7 +39,7 @@ import org.unbescape.html.HtmlEscape;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;@@ -58,7 +58,7 @@ public abstract class RevisionSelector extends Panel {private static final int PAGE_SIZE = 25;- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private static final String COMMIT_FLAG = "*";@@ -86,10 +86,10 @@ public abstract class RevisionSelector extends Panel {List<String> names = new ArrayList<>();if (branchesActive) {- for (RefInfo ref: depotModel.getObject().getBranches())+ for (RefInfo ref: projectModel.getObject().getBranches())names.add(GitUtils.ref2branch(ref.getRef().getName()));} else {- for (RefInfo ref: depotModel.getObject().getTags())+ for (RefInfo ref: projectModel.getObject().getTags())names.add(GitUtils.ref2tag(ref.getRef().getName()));}return names;@@ -106,23 +106,23 @@ public abstract class RevisionSelector extends Panel {target.focusComponent(revField);}- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision, boolean canCreateRef) {+ public RevisionSelector(String id, IModel<Project> projectModel, @Nullable String revision, boolean canCreateRef) {super(id);Preconditions.checkArgument(revision!=null || !canCreateRef);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revision = revision;if (canCreateRef) {- Depot depot = depotModel.getObject();- canCreateBranch = SecurityUtils.canWrite(depot);- canCreateTag = SecurityUtils.canCreateTag(depot, Constants.R_TAGS);+ Project project = projectModel.getObject();+ canCreateBranch = SecurityUtils.canWrite(project);+ canCreateTag = SecurityUtils.canCreateTag(project, Constants.R_TAGS);} else {canCreateBranch = false;canCreateTag = false;}if (revision != null) {- Ref ref = depotModel.getObject().getRef(revision);+ Ref ref = projectModel.getObject().getRef(revision);branchesActive = ref == null || GitUtils.ref2tag(ref.getName()) == null;} else {branchesActive = true;@@ -131,12 +131,12 @@ public abstract class RevisionSelector extends Panel {refs = findRefs();}- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision) {- this(id, depotModel, revision, false);+ public RevisionSelector(String id, IModel<Project> projectModel, @Nullable String revision) {+ this(id, projectModel, revision, false);}- public RevisionSelector(String id, IModel<Depot> depotModel) {- this(id, depotModel, null, false);+ public RevisionSelector(String id, IModel<Project> projectModel) {+ this(id, projectModel, null, false);}@Override@@ -270,18 +270,18 @@ public abstract class RevisionSelector extends Panel {itemValues.add(ref);}if (itemValues.size() < count && !found) {- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();try {- if (depot.getRepository().resolve(revInput) != null) {+ if (project.getRepository().resolve(revInput) != null) {itemValues.add(COMMIT_FLAG + revInput);} else if (branchesActive) {if (canCreateBranch) {- if (SecurityUtils.canWrite(depot))+ if (SecurityUtils.canWrite(project))itemValues.add(ADD_FLAG + revInput);}} else {if (canCreateTag) {- if (SecurityUtils.canCreateTag(depot, revInput)) {+ if (SecurityUtils.canCreateTag(project, revInput)) {itemValues.add(ADD_FLAG + revInput);}}@@ -302,14 +302,14 @@ public abstract class RevisionSelector extends Panel {private void onCreateRef(AjaxRequestTarget target, final String refName) {if (branchesActive) {- depotModel.getObject().createBranch(refName, revision);+ projectModel.getObject().createBranch(refName, revision);selectRevision(target, refName);} else {ModalPanel modal = new ModalPanel(target) {@Overrideprotected Component newContent(String id) {- return new CreateTagPanel(id, depotModel, refName, revision) {+ return new CreateTagPanel(id, projectModel, refName, revision) {@Overrideprotected void onCreate(AjaxRequestTarget target, String tagName) {@@ -440,7 +440,7 @@ public abstract class RevisionSelector extends Panel {private void selectRevision(AjaxRequestTarget target, String revision) {try {- if (depotModel.getObject().getRevCommit(revision, false) != null) {+ if (projectModel.getObject().getRevCommit(revision, false) != null) {onSelect(target, revision);} else {feedbackMessage = "Can not find commit of revision " + revision + "";@@ -468,7 +468,7 @@ public abstract class RevisionSelector extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.css b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.cssindex 3c372405b2..de2ef877c3 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.css+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.css@@ -1,7 +1,7 @@-.repository-and-revision {+.project-and-revision {white-space: nowrap;}-.repository-and-revision>a {+.project-and-revision>a {color: #444;text-decoration: none;font-size: 16px;diff --git a/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.html b/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.htmldeleted file mode 100644index 6782f32a72..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="role selection">- <a wicket:id="admin">- <div class="title">Admin</div>- <div class="description">Has administrative rights in the organization</div>- </a>- <a wicket:id="member">- <div class="title">Member</div>- <div class="description">Is ordinary member in the organization</div>- </a>- </div>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.java b/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.javadeleted file mode 100644index 9e41ad90ce..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.java+++ /dev/null@@ -1,63 +0,0 @@-package com.gitplex.server.web.component.roleselection;--import javax.annotation.Nullable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.panel.Panel;--@SuppressWarnings("serial")-public abstract class RoleSelectionPanel extends Panel {-- public static final String ROLE_ADMIN = "Admin";-- public static final String ROLE_MEMBER = "Member";-- private final String currentRole;-- public RoleSelectionPanel(String id, @Nullable String currentRole) {- super(id);-- this.currentRole = currentRole;- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new AjaxLink<Void>("admin") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (ROLE_ADMIN.equals(currentRole))- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelectAdmin(target);- }-- });- add(new AjaxLink<Void>("member") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (ROLE_MEMBER.equals(currentRole))- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelectOrdinary(target);- }-- });- }-- protected abstract void onSelectAdmin(AjaxRequestTarget target);-- protected abstract void onSelectOrdinary(AjaxRequestTarget target);-}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 907571e01a..8999cc537c 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@@ -33,7 +33,7 @@ import com.gitplex.jsymbol.Symbol;import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.IndexConstants;import com.gitplex.server.search.SearchManager;@@ -46,15 +46,15 @@ import com.gitplex.server.search.query.TextQuery;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.RunTaskBehavior;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")public abstract class SymbolTooltipPanel extends Panel {private static final int QUERY_ENTRIES = 20;- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private String revision = "";@@ -62,10 +62,10 @@ public abstract class SymbolTooltipPanel extends Panel {private List<QueryHit> symbolHits = new ArrayList<>();- public SymbolTooltipPanel(String id, IModel<Depot> depotModel) {+ public SymbolTooltipPanel(String id, IModel<Project> projectModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Override@@ -101,7 +101,7 @@ public abstract class SymbolTooltipPanel extends Panel {};- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, getQueryHitParams(hit));+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, getQueryHitParams(hit));link.add(AttributeAppender.replace("href", url.toString()));link.add(hit.render("label"));link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));@@ -154,8 +154,8 @@ public abstract class SymbolTooltipPanel extends Panel {.build();try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- ObjectId commit = depotModel.getObject().getRevCommit(revision);- hits = searchManager.search(depotModel.getObject(), commit, query);+ ObjectId commit = projectModel.getObject().getRevCommit(revision);+ hits = searchManager.search(projectModel.getObject(), commit, query);} catch (InterruptedException e) {throw new RuntimeException(e);}@@ -173,7 +173,7 @@ public abstract class SymbolTooltipPanel extends Panel {super.onComponentTag(tag);// set href in onComponentTag in order to keep it up to date with symbol value- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, getFindOccurrencesParams());+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, getFindOccurrencesParams());tag.put("href", url.toString());}@@ -208,11 +208,11 @@ public abstract class SymbolTooltipPanel extends Panel {// do this check to avoid TooGeneralQueryExceptionif (symbolName.length() != 0 && symbolName.indexOf('?') == -1 && symbolName.indexOf('*') == -1) {BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.TYPE_FILE);- Blob blob = depotModel.getObject().getBlob(blobIdent);+ Blob blob = projectModel.getObject().getBlob(blobIdent);if (symbolHits.size() < QUERY_ENTRIES) {// first find in current file for matched symbols- List<Symbol> symbols = GitPlex.getInstance(SearchManager.class).getSymbols(depotModel.getObject(),+ List<Symbol> symbols = GitPlex.getInstance(SearchManager.class).getSymbols(projectModel.getObject(),blob.getBlobId(), getBlobPath());if (symbols != null) {for (Symbol symbol: symbols) {@@ -238,7 +238,7 @@ public abstract class SymbolTooltipPanel extends Panel {// then find in other files for public symbolstry {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- ObjectId commit = depotModel.getObject().getRevCommit(revision);+ ObjectId commit = projectModel.getObject().getRevCommit(revision);BlobQuery query;if (symbolHits.size() < QUERY_ENTRIES) {query = new SymbolQuery.Builder().term(symbolName)@@ -248,7 +248,7 @@ public abstract class SymbolTooltipPanel extends Panel {.caseSensitive(true).count(QUERY_ENTRIES).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (symbolHits.size() < QUERY_ENTRIES) {query = new SymbolQuery.Builder().term(symbolName)@@ -258,11 +258,11 @@ public abstract class SymbolTooltipPanel extends Panel {.caseSensitive(true).count(QUERY_ENTRIES - symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (canBePath && symbolHits.size() < QUERY_ENTRIES) {query = new PathQuery(null, symbolName, QUERY_ENTRIES - symbolHits.size());- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}} catch (InterruptedException e) {throw new RuntimeException(e);@@ -297,16 +297,16 @@ public abstract class SymbolTooltipPanel extends Panel {public PageParameters getQueryHitParams(QueryHit hit) {BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());- return DepotBlobPage.paramsOf(depotModel.getObject(), state);+ return ProjectBlobPage.paramsOf(projectModel.getObject(), state);}public PageParameters getFindOccurrencesParams() {BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.query = symbolName;- return DepotBlobPage.paramsOf(depotModel.getObject(), state);+ return ProjectBlobPage.paramsOf(projectModel.getObject(), state);}public String getSymbol() {@@ -319,7 +319,7 @@ public abstract class SymbolTooltipPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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.javadeleted file mode 100644index b0330d9937..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java+++ /dev/null@@ -1,36 +0,0 @@-package com.gitplex.server.web.component.teamchoice;--import java.util.Collection;-import java.util.List;--import org.json.JSONException;-import org.json.JSONWriter;--import com.google.common.collect.Lists;-import com.gitplex.server.GitPlex;-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> {-- private static final long serialVersionUID = 1L;-- @Override- public void toJson(Team choice, JSONWriter writer) throws JSONException {- writer.key("id").value(choice.getId()).key("name").value(choice.getName());- }-- @Override- public Collection<Team> toChoices(Collection<String> ids) {- List<Team> teams = Lists.newArrayList();- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- for (String each : ids) {- Long id = Long.valueOf(each);- teams.add(teamManager.load(id));- }-- return teams;- }--}\ No newline at end of filediff --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.javadeleted file mode 100644index e0aec89387..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java+++ /dev/null@@ -1,50 +0,0 @@-package com.gitplex.server.web.component.teamchoice;--import java.util.List;--import org.apache.wicket.model.IModel;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Restrictions;--import com.gitplex.server.GitPlex;-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;--public class TeamChoiceProvider extends AbstractTeamChoiceProvider {-- private static final long serialVersionUID = 1L;-- private final IModel<Account> organizationModel;-- public TeamChoiceProvider(IModel<Account> organizationModel) {- this.organizationModel = organizationModel;- }-- @Override- public void query(String term, int page, Response<Team> response) {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- int first = page * WebConstants.DEFAULT_PAGE_SIZE;- EntityCriteria<Team> criteria = teamManager.newCriteria();- criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE))- .add(Restrictions.eq("organization", organizationModel.getObject()));- List<Team> teams = teamManager.findRange(criteria, first, WebConstants.DEFAULT_PAGE_SIZE + 1);-- if (teams.size() <= WebConstants.DEFAULT_PAGE_SIZE) {- response.addAll(teams);- } else {- response.addAll(teams.subList(0, WebConstants.DEFAULT_PAGE_SIZE));- response.setHasMore(true);- }- }-- @Override- public void detach() {- super.detach();-- organizationModel.detach();- }-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.javadeleted file mode 100644index 1692e166e7..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.teamchoice;--import com.gitplex.server.web.page.base.BaseDependentResourceReference;--public class TeamChoiceResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public TeamChoiceResourceReference() {- super(TeamChoiceResourceReference.class, "team-choice.js");- }--}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.javadeleted file mode 100644index 9ae537ef64..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java+++ /dev/null@@ -1,36 +0,0 @@-package com.gitplex.server.web.component.teamchoice;--import java.util.Collection;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Team;-import com.gitplex.server.web.component.select2.Select2MultiChoice;--@SuppressWarnings("serial")-public class TeamMultiChoice extends Select2MultiChoice<Team> {-- public TeamMultiChoice(String id, IModel<Collection<Team>> teamsModel,- AbstractTeamChoiceProvider choiceProvider) {- super(id, teamsModel, choiceProvider);- }-- @Override- protected void onInitialize() {- super.onInitialize();- getSettings().setPlaceholder("Choose teams ...");- getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.js b/web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.jsdeleted file mode 100644index 021a1c9e48..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.js+++ /dev/null@@ -1,13 +0,0 @@-gitplex.server.teamChoiceFormatter = {- formatSelection: function(team) {- return team.name;- },-- formatResult: function(team) {- return team.name;- },-- escapeMarkup: function(m) {- return m;- }-};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.javasimilarity index 57%rename from web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.javarename to web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.javaindex c8aa8e1635..f89251dd4c 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.accountchoice;+package com.gitplex.server.web.component.userchoice;import java.util.Collection;import java.util.List;@@ -9,32 +9,32 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.util.avatar.AvatarManager;-public abstract class AbstractAccountChoiceProvider extends ChoiceProvider<Account> {+public abstract class AbstractUserChoiceProvider extends ChoiceProvider<User> {private static final long serialVersionUID = 1L;@Override- public void toJson(Account choice, JSONWriter writer) throws JSONException {+ public void toJson(User choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(StringEscapeUtils.escapeHtml4(choice.getDisplayName()));String avatarUrl = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(choice);writer.key("avatar").value(avatarUrl);}@Override- public Collection<Account> toChoices(Collection<String> ids) {- List<Account> accounts = Lists.newArrayList();- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);+ public Collection<User> toChoices(Collection<String> ids) {+ List<User> users = Lists.newArrayList();+ UserManager userManager = GitPlex.getInstance(UserManager.class);for (String each : ids) {Long id = Long.valueOf(each);- accounts.add(accountManager.load(id));+ users.add(userManager.load(id));}- return accounts;+ return users;}}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.javanew file mode 100644index 0000000000..5903fdbe23--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java@@ -0,0 +1,71 @@+package com.gitplex.server.web.component.userchoice;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;++import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.util.WicketUtils;++public class UserChoiceProvider extends AbstractUserChoiceProvider {++ private static final long serialVersionUID = 1L;++ private final UserChoice.Type type;++ public UserChoiceProvider(UserChoice.Type type) {+ this.type = type;+ }++ @Override+ public void query(String term, int page, Response<User> response) {+ if (type == UserChoice.Type.ALL) {+ Dao dao = GitPlex.getInstance(Dao.class);+ int first = page * WebConstants.PAGE_SIZE;+ Criterion criterion = Restrictions.and(Restrictions.or(+ Restrictions.ilike("name", term, MatchMode.ANYWHERE),+ Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)));+ EntityCriteria<User> criteria = EntityCriteria.of(User.class);+ criteria.add(criterion);+ criteria.addOrder(Order.asc("name"));+ List<User> users = dao.findRange(criteria, first, WebConstants.PAGE_SIZE + 1);++ if (users.size() <= WebConstants.PAGE_SIZE) {+ response.addAll(users);+ } else {+ response.addAll(users.subList(0, WebConstants.PAGE_SIZE));+ response.setHasMore(true);+ }+ } else {+ Project project = ((ProjectPage) WicketUtils.getPage()).getProject();+ List<User> choices;+ if (type == UserChoice.Type.DEPOT_READER)+ choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.READ));+ else if (type == UserChoice.Type.DEPOT_WRITER)+ choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.WRITE));+ else+ choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.ADMIN));++ choices.sort(Comparator.comparing(User::getName));++ new ResponseFiller<User>(response).fill(choices, page, WebConstants.PAGE_SIZE);+ }+ }++}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceResourceReference.javasimilarity index 59%rename from web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.javarename to web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceResourceReference.javaindex 80fd48eafd..c672985bd6 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.accountchoice;+package com.gitplex.server.web.component.userchoice;import java.util.List;@@ -8,19 +8,19 @@ import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class AccountChoiceResourceReference extends BaseDependentResourceReference {+public class UserChoiceResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public AccountChoiceResourceReference() {- super(AccountChoiceResourceReference.class, "account-choice.js");+ public UserChoiceResourceReference() {+ super(UserChoiceResourceReference.class, "user-choice.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(CssHeaderItem.forReference(- new CssResourceReference(AccountChoiceResourceReference.class, "account-choice.css")));+ new CssResourceReference(UserChoiceResourceReference.class, "user-choice.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.javanew file mode 100644index 0000000000..5f1ec67bff--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.java@@ -0,0 +1,38 @@+package com.gitplex.server.web.component.userchoice;++import java.util.Collection;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import com.gitplex.server.model.User;+import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;+import com.gitplex.server.web.component.select2.Select2MultiChoice;++public class UserMultiChoice extends Select2MultiChoice<User> {++ private static final long serialVersionUID = 1L;++ public UserMultiChoice(String id, IModel<Collection<User>> model,+ AbstractUserChoiceProvider choiceProvider) {+ super(id, model, choiceProvider);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("Choose users ...");+ getSettings().setFormatResult("gitplex.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.userChoiceFormatter.escapeMarkup");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));+ }++}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/userchoice/UserSingleChoice.javasimilarity index 51%rename from web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.javarename to web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.javaindex 399b8af0f6..3537e76836 100644--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.java@@ -1,27 +1,27 @@-package com.gitplex.server.web.component.teamchoice;+package com.gitplex.server.web.component.userchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Team;+import com.gitplex.server.model.User;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class TeamSingleChoice extends Select2Choice<Team> {+public class UserSingleChoice extends Select2Choice<User> {- public TeamSingleChoice(String id, IModel<Team> teamModel,- AbstractTeamChoiceProvider choiceProvider) {- super(id, teamModel, choiceProvider);+ public UserSingleChoice(String id, IModel<User> model,+ AbstractUserChoiceProvider choiceProvider) {+ super(id, model, choiceProvider);}@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Choose a team ...");- getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");+ getSettings().setPlaceholder("Choose an user ...");+ getSettings().setFormatResult("gitplex.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.userChoiceFormatter.escapeMarkup");}@Override@@ -34,7 +34,7 @@ public class TeamSingleChoice extends Select2Choice<Team> {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));}-}\ No newline at end of file+}diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.css b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.csssimilarity index 54%rename from web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.cssrename to web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.cssindex 2c6959dd1a..57a57934a0 100644--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.css+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.css@@ -2,13 +2,13 @@margin-right: 6px;margin-top: -2px;}-.select2-container .account-name, .select2-container .account-fullname {+.select2-container .user-name, .select2-container .user-fullname {font-style: normal;}-.select2-results .account {+.select2-results .user {clear: both;}-.select2-results .account .avatar {+.select2-results .user .avatar {height: 24px;width: 24px;margin-right: 6px;diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.js b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.jsnew file mode 100644index 0000000000..d4c401c779--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.js@@ -0,0 +1,21 @@+gitplex.server.userChoiceFormatter = {+ formatSelection: function(user) {+ return "<img class='avatar' src='" + user.avatar + "'/>" + user.name;+ },++ formatResult: function(user) {+ if (!user.alias) {+ return "<div class='user'>" ++ "<img class='avatar' src='" + user.avatar + "'/>" ++ "<span class='name'>"+ user.name + "</span>" ++ "</div>";+ } else {+ return "<i><<" + user.alias + ">></i>";+ }+ },++ escapeMarkup: function(m) {+ return m;+ },++};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.javadeleted file mode 100644index be99dba92b..0000000000--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java+++ /dev/null@@ -1,73 +0,0 @@-package com.gitplex.server.web.editable.accountchoice;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.server.web.component.accountchoice.AccountMultiChoice;-import com.gitplex.server.web.editable.ErrorContext;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.editable.PropertyDescriptor;-import com.gitplex.server.web.editable.PropertyEditor;--@SuppressWarnings("serial")-public class AccountMultiChoiceEditor extends PropertyEditor<List<String>> {-- private AccountMultiChoice input;-- private final AccountChoice.Type type;-- public AccountMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<List<String>> propertyModel, AccountChoice.Type type) {- super(id, propertyDescriptor, propertyModel);- this.type = type;- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- @Override- protected void onInitialize() {- super.onInitialize();-- List<Account> accounts = new ArrayList<>();- if (getModelObject() != null) {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- for (String accountName: getModelObject()) {- Account account = accountManager.findByName(accountName);- if (account != null)- accounts.add(account);- }- }-- input = new AccountMultiChoice("input", new Model((Serializable)accounts), new AccountChoiceProvider(type));- input.setConvertEmptyInputStringToNull(true);-- add(input);- }-- @Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return null;- }-- @Override- protected List<String> convertInputToValue() throws ConversionException {- List<String> accountNames = new ArrayList<>();- Collection<Account> accounts = input.getConvertedInput();- if (accounts != null) {- for (Account account: accounts)- accountNames.add(account.getName());- }- return accountNames;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.javaindex 35e3b03de0..f598862580 100644--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java@@ -43,10 +43,10 @@ public class BranchEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- List<String> depotAndBranches = model.getObject();- if (depotAndBranches != null && !depotAndBranches.isEmpty()) {+ List<String> projectAndBranches = model.getObject();+ if (projectAndBranches != null && !projectAndBranches.isEmpty()) {List<String> branches = new ArrayList<>();- for (String each: depotAndBranches) {+ for (String each: projectAndBranches) {branches.add(each);}return new Label(id, StringUtils.join(branches, ", " ));@@ -73,9 +73,9 @@ public class BranchEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- String depotAndBranch = model.getObject();- if (depotAndBranch != null) {- return new Label(id, depotAndBranch);+ String projectAndBranch = model.getObject();+ if (projectAndBranch != null) {+ return new Label(id, projectAndBranch);} else {return new NotDefinedLabel(id);}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 a98f199673..2441df10d9 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,14 +9,14 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;import com.gitplex.server.web.component.branchchoice.BranchMultiChoice;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@@ -32,21 +32,21 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {+ BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- DepotPage page = (DepotPage) getPage();- return page.getDepot();+ protected Project load() {+ ProjectPage page = (ProjectPage) getPage();+ return page.getProject();}});- ArrayList<String> depotAndBranches = new ArrayList<>();+ ArrayList<String> projectAndBranches = new ArrayList<>();if (getModelObject() != null)- depotAndBranches.addAll(getModelObject());+ projectAndBranches.addAll(getModelObject());- input = new BranchMultiChoice("input", new Model(depotAndBranches), branchProvider);+ input = new BranchMultiChoice("input", new Model(projectAndBranches), branchProvider);add(input);}@@ -58,11 +58,11 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {- List<String> depotAndBranches = new ArrayList<>();+ List<String> projectAndBranches = new ArrayList<>();Collection<String> convertedInput = input.getConvertedInput();if (convertedInput != null)- depotAndBranches.addAll(convertedInput);- return depotAndBranches;+ projectAndBranches.addAll(convertedInput);+ return projectAndBranches;}}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 13afc44069..3a8809e1e7 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,14 +4,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BranchSingleChoiceEditor extends PropertyEditor<String> {@@ -26,12 +26,12 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {+ BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- DepotPage page = (DepotPage) getPage();- return page.getDepot();+ protected Project load() {+ ProjectPage page = (ProjectPage) getPage();+ return page.getProject();}});diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchpattern/BranchPatternEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchpattern/BranchPatternEditor.javaindex eecd5ddf9f..09a31bd12f 100644--- a/web/src/main/java/com/gitplex/server/web/editable/branchpattern/BranchPatternEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/branchpattern/BranchPatternEditor.java@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.BranchPatternAssistBehavior;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BranchPatternEditor extends PropertyEditor<String> {@@ -29,11 +29,11 @@ public class BranchPatternEditor extends PropertyEditor<String> {super.onInitialize();input = new TextField<String>("input", getModel());- input.add(new BranchPatternAssistBehavior(new AbstractReadOnlyModel<Depot>() {+ input.add(new BranchPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return ((DepotPage)getPage()).getDepot();+ public Project getObject() {+ return ((ProjectPage)getPage()).getProject();}}));diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupEditSupport.javasimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.javarename to web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupEditSupport.javaindex 0761f0f21a..a26650dd2c 100644--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.editable.teamchoice;+package com.gitplex.server.web.editable.groupchoice;import java.lang.reflect.Method;import java.util.Collection;@@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.util.StringUtils;import com.gitplex.server.util.editable.EditableUtils;-import com.gitplex.server.util.editable.annotation.TeamChoice;+import com.gitplex.server.util.editable.annotation.GroupChoice;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.EditSupport;import com.gitplex.server.web.editable.NotDefinedLabel;@@ -20,7 +20,7 @@ import com.gitplex.server.web.editable.PropertyEditor;import com.gitplex.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class TeamEditSupport implements EditSupport {+public class GroupEditSupport implements EditSupport {@Overridepublic BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {@@ -31,7 +31,7 @@ public class TeamEditSupport implements EditSupport {public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(TeamChoice.class) != null) {+ if (propertyGetter.getAnnotation(GroupChoice.class) != null) {if (Collection.class.isAssignableFrom(propertyGetter.getReturnType())&& EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {return new PropertyContext<Collection<String>>(propertyDescriptor) {@@ -42,9 +42,9 @@ public class TeamEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- Collection<String> teamNames = model.getObject();- if (teamNames != null && !teamNames.isEmpty()) {- return new Label(id, StringUtils.join(teamNames, ", " ));+ Collection<String> groupNames = model.getObject();+ if (groupNames != null && !groupNames.isEmpty()) {+ return new Label(id, StringUtils.join(groupNames, ", " ));} else {return new NotDefinedLabel(id);}@@ -55,7 +55,7 @@ public class TeamEditSupport implements EditSupport {@Overridepublic PropertyEditor<Collection<String>> renderForEdit(String componentId, IModel<Collection<String>> model) {- return new TeamMultiChoiceEditor(componentId, this, model);+ return new GroupMultiChoiceEditor(componentId, this, model);}};@@ -68,9 +68,9 @@ public class TeamEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- String teamName = model.getObject();- if (teamName != null) {- return new Label(id, teamName);+ String groupName = model.getObject();+ if (groupName != null) {+ return new Label(id, groupName);} else {return new NotDefinedLabel(id);}@@ -81,12 +81,12 @@ public class TeamEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new TeamSingleChoiceEditor(componentId, this, model);+ return new GroupSingleChoiceEditor(componentId, this, model);}};} else {- throw new RuntimeException("Annotation 'TeamChoice' should be applied to property with type String or Collection<String>.");+ throw new RuntimeException("Annotation 'GroupChoice' should be applied to property with type String or Collection<String>.");}} else {return null;diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.htmlrename to web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.javanew file mode 100644index 0000000000..1e9a402320--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -0,0 +1,68 @@+package com.gitplex.server.web.editable.groupchoice;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.web.component.groupchoice.GroupChoiceProvider;+import com.gitplex.server.web.component.groupchoice.GroupMultiChoice;+import com.gitplex.server.web.editable.ErrorContext;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.editable.PropertyDescriptor;+import com.gitplex.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {++ private GroupMultiChoice input;++ public GroupMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Group> groups = new ArrayList<>();+ if (getModelObject() != null) {+ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ for (String groupName: getModelObject()) {+ Group group = groupManager.find(groupName);+ if (group != null)+ groups.add(group);+ }+ }++ input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider());+ input.setConvertEmptyInputStringToNull(true);++ add(input);+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ List<String> groupNames = new ArrayList<>();+ Collection<Group> groups = input.getConvertedInput();+ if (groups != null) {+ for (Group group: groups)+ groupNames.add(group.getName());+ }+ return groupNames;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.htmlrename to web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.javanew file mode 100644index 0000000000..f314f26e71--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -0,0 +1,59 @@+package com.gitplex.server.web.editable.groupchoice;++import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.web.component.groupchoice.GroupChoiceProvider;+import com.gitplex.server.web.component.groupchoice.GroupSingleChoice;+import com.gitplex.server.web.editable.ErrorContext;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.editable.PropertyDescriptor;+import com.gitplex.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class GroupSingleChoiceEditor extends PropertyEditor<String> {++ private GroupSingleChoice input;++ public GroupSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Group group;+ if (getModelObject() != null)+ group = GitPlex.getInstance(GroupManager.class).find(getModelObject());+ else+ group = null;++ input = new GroupSingleChoice("input", Model.of(group), new GroupChoiceProvider());+ input.setConvertEmptyInputStringToNull(true);++ // add this to control allowClear flag of select2+ input.setRequired(propertyDescriptor.isPropertyRequired());++ add(input);+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ Group group = input.getConvertedInput();+ if (group != null)+ return group.getName();+ else+ return null;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/editable/pathpattern/PathPatternEditor.java b/web/src/main/java/com/gitplex/server/web/editable/pathpattern/PathPatternEditor.javaindex 06a8ec3c45..58860738f2 100644--- a/web/src/main/java/com/gitplex/server/web/editable/pathpattern/PathPatternEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/pathpattern/PathPatternEditor.java@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.PathPatternAssistBehavior;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class PathPatternEditor extends PropertyEditor<String> {@@ -29,11 +29,11 @@ public class PathPatternEditor extends PropertyEditor<String> {super.onInitialize();input = new TextField<String>("input", getModel());- input.add(new PathPatternAssistBehavior(new AbstractReadOnlyModel<Depot>() {+ input.add(new PathPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return ((DepotPage) getPage()).getDepot();+ public Project getObject() {+ return ((ProjectPage) getPage()).getProject();}}));diff --git a/web/src/main/java/com/gitplex/server/web/editable/reviewappointment/ReviewAppointmentEditor.java b/web/src/main/java/com/gitplex/server/web/editable/reviewappointment/ReviewAppointmentEditor.javaindex cfc9763637..7553fda878 100644--- a/web/src/main/java/com/gitplex/server/web/editable/reviewappointment/ReviewAppointmentEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/reviewappointment/ReviewAppointmentEditor.java@@ -6,13 +6,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.reviewappointment.ReviewAppointmentInput;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class ReviewAppointmentEditor extends PropertyEditor<String> {@@ -27,11 +27,11 @@ public class ReviewAppointmentEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new ReviewAppointmentInput("input", new AbstractReadOnlyModel<Depot>() {+ input = new ReviewAppointmentInput("input", new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return ((DepotPage) getPage()).getDepot();+ public Project getObject() {+ return ((ProjectPage) getPage()).getProject();}}, getModel());diff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.javaindex befab75785..26b6ce15d1 100644--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java@@ -7,14 +7,14 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.gitplex.server.util.editable.annotation.AccountChoice;+import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.editable.annotation.BranchPattern;import com.gitplex.server.util.editable.annotation.Markdown;import com.gitplex.server.util.editable.annotation.Multiline;import com.gitplex.server.util.editable.annotation.Password;import com.gitplex.server.util.editable.annotation.PathPattern;import com.gitplex.server.util.editable.annotation.TagPattern;-import com.gitplex.server.util.editable.annotation.TeamChoice;+import com.gitplex.server.util.editable.annotation.GroupChoice;import com.gitplex.server.web.component.MultilineLabel;import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.editable.BeanContext;@@ -42,8 +42,8 @@ public class StringEditSupport implements EditSupport {&& propertyDescriptor.getPropertyGetter().getAnnotation(Password.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(BranchPattern.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(TagPattern.class) == null- && propertyDescriptor.getPropertyGetter().getAnnotation(TeamChoice.class) == null- && propertyDescriptor.getPropertyGetter().getAnnotation(AccountChoice.class) == null+ && propertyDescriptor.getPropertyGetter().getAnnotation(GroupChoice.class) == null+ && propertyDescriptor.getPropertyGetter().getAnnotation(UserChoice.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(PathPattern.class) == null) {return new PropertyContext<String>(propertyDescriptor) {diff --git a/web/src/main/java/com/gitplex/server/web/editable/tagpattern/TagPatternEditor.java b/web/src/main/java/com/gitplex/server/web/editable/tagpattern/TagPatternEditor.javaindex 4f7b0838eb..e6dc672b5c 100644--- a/web/src/main/java/com/gitplex/server/web/editable/tagpattern/TagPatternEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/tagpattern/TagPatternEditor.java@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.behavior.TagPatternAssistBehavior;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class TagPatternEditor extends PropertyEditor<String> {@@ -30,11 +30,11 @@ public class TagPatternEditor extends PropertyEditor<String> {input = new TextField<String>("input", getModel());- input.add(new TagPatternAssistBehavior(new AbstractReadOnlyModel<Depot>() {+ input.add(new TagPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return ((DepotPage) getPage()).getDepot();+ public Project getObject() {+ return ((ProjectPage) getPage()).getProject();}}));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.javadeleted file mode 100644index 84cd791ba5..0000000000--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java+++ /dev/null@@ -1,79 +0,0 @@-package com.gitplex.server.web.editable.teamchoice;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.editable.PropertyDescriptor;-import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.account.AccountPage;--@SuppressWarnings("serial")-public class TeamMultiChoiceEditor extends PropertyEditor<Collection<String>> {-- private TeamMultiChoice input;-- public TeamMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {- super(id, propertyDescriptor, propertyModel);- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- @Override- protected void onInitialize() {- super.onInitialize();-- IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {-- @Override- public Account getObject() {- return ((AccountPage)getPage()).getAccount();- }-- };- List<Team> teams = new ArrayList<>();- if (getModelObject() != null) {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- for (String teamName: getModelObject()) {- Team team = teamManager.find(organizationModel.getObject(), teamName);- if (team != null)- teams.add(team);- }- }-- input = new TeamMultiChoice("input", new Model((Serializable)teams), new TeamChoiceProvider(organizationModel));- input.setConvertEmptyInputStringToNull(true);-- add(input);- }-- @Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return null;- }-- @Override- protected List<String> convertInputToValue() throws ConversionException {- List<String> teamNames = new ArrayList<>();- Collection<Team> teams = input.getConvertedInput();- if (teams != null) {- for (Team team: teams)- teamNames.add(team.getName());- }- return teamNames;- }--}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.javadeleted file mode 100644index c3e62ec8bc..0000000000--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java+++ /dev/null@@ -1,70 +0,0 @@-package com.gitplex.server.web.editable.teamchoice;--import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.editable.PropertyDescriptor;-import com.gitplex.server.web.editable.PropertyEditor;-import com.gitplex.server.web.page.account.AccountPage;--@SuppressWarnings("serial")-public class TeamSingleChoiceEditor extends PropertyEditor<String> {-- private TeamSingleChoice input;-- public TeamSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {- super(id, propertyDescriptor, propertyModel);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {-- @Override- public Account getObject() {- return ((AccountPage)getPage()).getAccount();- }-- };- Team team;- if (getModelObject() != null)- team = GitPlex.getInstance(TeamManager.class).find(organizationModel.getObject(), getModelObject());- else- team = null;-- input = new TeamSingleChoice("input", Model.of(team), new TeamChoiceProvider(organizationModel));- input.setConvertEmptyInputStringToNull(true);-- // add this to control allowClear flag of select2- input.setRequired(propertyDescriptor.isPropertyRequired());-- add(input);- }-- @Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return null;- }-- @Override- protected String convertInputToValue() throws ConversionException {- Team team = input.getConvertedInput();- if (team != null)- return team.getName();- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserEditSupport.javasimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.javarename to web/src/main/java/com/gitplex/server/web/editable/userchoice/UserEditSupport.javaindex 1df033625e..c1f7fd06a2 100644--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.editable.accountchoice;+package com.gitplex.server.web.editable.userchoice;import java.lang.reflect.Method;import java.util.List;@@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.util.StringUtils;import com.gitplex.server.util.editable.EditableUtils;-import com.gitplex.server.util.editable.annotation.AccountChoice;+import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.EditSupport;import com.gitplex.server.web.editable.NotDefinedLabel;@@ -20,7 +20,7 @@ import com.gitplex.server.web.editable.PropertyEditor;import com.gitplex.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class AccountEditSupport implements EditSupport {+public class UserEditSupport implements EditSupport {@Overridepublic BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {@@ -31,8 +31,8 @@ public class AccountEditSupport implements EditSupport {public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();- AccountChoice accountChoice = propertyGetter.getAnnotation(AccountChoice.class);- if (accountChoice != null) {+ UserChoice userChoice = propertyGetter.getAnnotation(UserChoice.class);+ if (userChoice != null) {if (List.class.isAssignableFrom(propertyGetter.getReturnType())&& EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {return new PropertyContext<List<String>>(propertyDescriptor) {@@ -56,7 +56,7 @@ public class AccountEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {- return new AccountMultiChoiceEditor(componentId, this, model, accountChoice.type());+ return new UserMultiChoiceEditor(componentId, this, model, userChoice.type());}};@@ -81,7 +81,7 @@ public class AccountEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new AccountSingleChoiceEditor(componentId, this, model, accountChoice.type());+ return new UserSingleChoiceEditor(componentId, this, model, userChoice.type());}};diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.htmlrename to web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.javanew file mode 100644index 0000000000..46c82166d3--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -0,0 +1,73 @@+package com.gitplex.server.web.editable.userchoice;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.web.component.userchoice.UserChoiceProvider;+import com.gitplex.server.web.component.userchoice.UserMultiChoice;+import com.gitplex.server.web.editable.ErrorContext;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.editable.PropertyDescriptor;+import com.gitplex.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {++ private UserMultiChoice input;++ private final UserChoice.Type type;++ public UserMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<List<String>> propertyModel, UserChoice.Type type) {+ super(id, propertyDescriptor, propertyModel);+ this.type = type;+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<User> users = new ArrayList<>();+ if (getModelObject() != null) {+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ for (String userName: getModelObject()) {+ User user = userManager.findByName(userName);+ if (user != null)+ users.add(user);+ }+ }++ input = new UserMultiChoice("input", new Model((Serializable)users), new UserChoiceProvider(type));+ input.setConvertEmptyInputStringToNull(true);++ add(input);+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ List<String> userNames = new ArrayList<>();+ Collection<User> users = input.getConvertedInput();+ if (users != null) {+ for (User user: users)+ userNames.add(user.getName());+ }+ return userNames;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.htmlrename to web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.javasimilarity index 51%rename from web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.javarename to web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 5479f04f74..07292eedde 100644--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -1,29 +1,29 @@-package com.gitplex.server.web.editable.accountchoice;+package com.gitplex.server.web.editable.userchoice;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.web.component.userchoice.UserChoiceProvider;+import com.gitplex.server.web.component.userchoice.UserSingleChoice;import com.gitplex.server.web.editable.ErrorContext;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.editable.PropertyDescriptor;import com.gitplex.server.web.editable.PropertyEditor;@SuppressWarnings("serial")-public class AccountSingleChoiceEditor extends PropertyEditor<String> {+public class UserSingleChoiceEditor extends PropertyEditor<String> {- private AccountSingleChoice input;+ private UserSingleChoice input;- private AccountChoice.Type type;+ private UserChoice.Type type;- public AccountSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<String> propertyModel, AccountChoice.Type type) {+ public UserSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel, UserChoice.Type type) {super(id, propertyDescriptor, propertyModel);this.type = type;}@@ -32,13 +32,13 @@ public class AccountSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- Account account;+ User user;if (getModelObject() != null)- account = GitPlex.getInstance(AccountManager.class).findByName(getModelObject());+ user = GitPlex.getInstance(UserManager.class).findByName(getModelObject());else- account = null;+ user = null;- input = new AccountSingleChoice("input", Model.of(account), new AccountChoiceProvider(type));+ input = new UserSingleChoice("input", Model.of(user), new UserChoiceProvider(type));input.setConvertEmptyInputStringToNull(true);// add this to control allowClear flag of select2@@ -54,9 +54,9 @@ public class AccountSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- Account account = input.getConvertedInput();- if (account != null)- return account.getName();+ User user = input.getConvertedInput();+ if (user != null)+ return user.getName();elsereturn null;}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.javadeleted file mode 100644index c5c6d5b858..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java+++ /dev/null@@ -1,96 +0,0 @@-package com.gitplex.server.web.page.account;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorPage;-import com.gitplex.server.web.page.account.members.MemberListPage;-import com.gitplex.server.web.page.account.members.MemberPage;-import com.gitplex.server.web.page.account.members.NewMembersPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.account.overview.NewDepotPage;-import com.gitplex.server.web.page.account.overview.NewOrganizationPage;-import com.gitplex.server.web.page.account.setting.AvatarEditPage;-import com.gitplex.server.web.page.account.setting.PasswordEditPage;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;-import com.gitplex.server.web.page.account.tasks.TaskListPage;-import com.gitplex.server.web.page.account.teams.TeamListPage;-import com.gitplex.server.web.page.account.teams.TeamPage;--@SuppressWarnings("serial")-public abstract class AccountLayoutPage extends AccountPage {-- public AccountLayoutPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",- AvatarEditPage.class, AvatarEditPage.paramsOf(getAccount())) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (!isEnabled())- tag.setName("span");- }-- };- if (!SecurityUtils.canManage(getAccount())) {- avatarLink.setEnabled(false);- }- add(avatarLink);- avatarLink.add(new Avatar("avatar", accountModel.getObject()));-- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new AccountTab("Overview", "fa fa-fw fa-list-alt", 0,- AccountOverviewPage.class, NewOrganizationPage.class, NewDepotPage.class));-- if (getAccount().isOrganization()) {- if (SecurityUtils.canAccess(getAccount())) {- tabs.add(new AccountTab("Members", "fa fa-fw fa-user",- getAccount().getOrganizationMembers().size(),- MemberListPage.class, NewMembersPage.class, MemberPage.class));- tabs.add(new AccountTab("Teams", "fa fa-fw fa-group",- getAccount().getDefinedTeams().size(), TeamListPage.class, TeamPage.class));- }- if (SecurityUtils.canManage(getAccount())) {- tabs.add(new AccountTab("Collaborators", "fa fa-fw fa-user",- getAccount().getAllUserAuthorizationsInOrganization().size(),- AccountCollaboratorListPage.class, CollaboratorPage.class));- tabs.add(new AccountTab("Setting", "fa fa-fw fa-cog", 0, ProfileEditPage.class, AvatarEditPage.class));- }- } else if (SecurityUtils.canManage(getAccount())) {- tabs.add(new AccountTab("Collaborators", "fa fa-fw fa-user",- getAccount().getAllUserAuthorizationsInOrganization().size(),- AccountCollaboratorListPage.class, CollaboratorPage.class));- tabs.add(new AccountTab("Tasks", "fa fa-fw fa-bell-o",- getAccount().getRequestTasks().size(), TaskListPage.class));- tabs.add(new AccountTab("Setting", "fa fa-fw fa-cog", 0,- ProfileEditPage.class, AvatarEditPage.class, PasswordEditPage.class));- }- add(new Tabbable("accountTabs", tabs));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AccountResourceReference()));- }--}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.javadeleted file mode 100644index 0fc514b5ec..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java+++ /dev/null@@ -1,65 +0,0 @@-package com.gitplex.server.web.page.account;--import javax.persistence.EntityNotFoundException;--import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.google.common.base.Strings;--@SuppressWarnings("serial")-public abstract class AccountPage extends LayoutPage {-- private static final String PARAM_ACCOUNT = "account";-- protected final IModel<Account> accountModel;-- public AccountPage(PageParameters params) {- super(params);-- String name = params.get(PARAM_ACCOUNT).toString();- Preconditions.checkArgument(!Strings.isNullOrEmpty(name));-- Account account = GitPlex.getInstance(AccountManager.class).findByName(name);- if (account == null)- throw (new EntityNotFoundException("Account " + name + " not found"));-- accountModel = new UserModel(account);- }-- @Override- protected void onDetach() {- accountModel.detach();-- super.onDetach();- }-- @Override- public Account getAccount() {- return accountModel.getObject();- }-- public static PageParameters paramsOf(Account user) {- return paramsOf(user.getName());- }-- public static PageParameters paramsOf(String accountName) {- PageParameters params = new PageParameters();- params.set(PARAM_ACCOUNT, accountName);- return params;- }-- @Override- protected Component newContextHead(String componentId) {- return new Label(componentId, getAccount().getDisplayName());- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.javadeleted file mode 100644index e53ebc2597..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.account;--import org.apache.wicket.request.resource.CssResourceReference;--public class AccountResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public AccountResourceReference() {- super(AccountResourceReference.class, "account.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.javadeleted file mode 100644index 7061d0e831..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java+++ /dev/null@@ -1,62 +0,0 @@-package com.gitplex.server.web.page.account;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import com.gitplex.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class AccountTab extends PageTab {-- private final String iconClass;-- private final int count;-- public AccountTab(String title, String iconClass, int count, Class<? extends AccountPage> mainPageClass) {- super(Model.of(title), mainPageClass);-- this.iconClass = iconClass;- this.count = count;- }-- public AccountTab(String title, String iconClass, int count, Class<? extends AccountPage> mainPageClass,- Class<? extends AccountPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);-- this.iconClass = iconClass;- this.count = count;- }-- public AccountTab(String title, String iconClass, int count, Class<? extends AccountPage> mainPageClass,- Class<? extends AccountPage> additionalPageClass1,- Class<? extends AccountPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);-- this.iconClass = iconClass;- this.count = count;- }-- public AccountTab(String title, String iconClass, int count, Class<? extends AccountPage> mainPageClass,- Class<? extends AccountPage> additionalPageClass1,- Class<? extends AccountPage> additionalPageClass2,- Class<? extends AccountPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);-- this.iconClass = iconClass;- this.count = count;- }-- @Override- public Component render(String componentId) {- return new AccountTabLink(componentId, this);- }-- public String getIconClass() {- return iconClass;- }-- public int getCount() {- return count;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.html b/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.htmldeleted file mode 100644index 8a547bab4a..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span> <span wicket:id="count" class="badge"></span></a>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/account/account.css b/web/src/main/java/com/gitplex/server/web/page/account/account.cssdeleted file mode 100644index 4492c4c0ab..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/account.css+++ /dev/null@@ -1,148 +0,0 @@-#account.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- width: 220px;-}-#account.sidebar>table>tbody>tr>td.nav>.head {- margin: -20px 0 20px 0;- padding: 10px 10px 0 10px;- border-bottom: 1px solid #DDD;-}-#account.sidebar>table>tbody>tr>td.nav>.head>div.avatar img {- height: 200px;- width: 200px;- margin-bottom: 10px;-}-#account.sidebar>table>tbody>tr>td.nav>.head .select2-container {- width: 200px;-}-#account.sidebar>table>tbody>tr>td.nav>.head .select2-container .avatar {- display: none;-}-#account.sidebar>table>tbody>tr>td.nav>.head .name {- font-size: 16px;-}-#account.sidebar>table>tbody>tr>td.nav>.head .dropdown-trigger {- font-size: 18px;- vertical-align: middle;-}-#account.sidebar>table>tbody>tr>td.nav>.head .dropdown-trigger {- font-size: 18px;- vertical-align: middle;-}-#account.sidebar>table>tbody>tr>td.nav>.run-as {- margin-bottom: 10px;- border-bottom: 1px solid #BBB;- padding: 0 10px 10px 10px;- color: #666;- display: block;-}-#account.sidebar>table>tbody>tr>td.content {- padding: 20px;-}-#account.sidebar>table>tbody>tr>td.content .list table td.actions {- width: 20%;- white-space: nowrap;-}-#account.sidebar>table>tbody>tr>td.content .teams.table td.members img.avatar {- margin-right: 4px;-}-#account.sidebar>table>tbody>tr>td.content .member.add .role label {- font-weight: normal;- margin-left: 8px;- vertical-align: middle;-}-#account.sidebar>table>tbody>tr>td.content .detail>.head {- padding: 12px;- border: 1px dashed #BBB;- background: #F0F0F0;- border-radius: 4px;- margin-bottom: 20px;-}-.team.detail>.head .title {- font-weight: bold;- font-size: 18px;- margin-bottom: 12px;-}-.team.detail>.head .description .md-preview {- font-size: 14px;-}-.team.detail>.head .actions {- border-top: 1px dashed #CCC;- padding-top: 12px;- margin-top: 16px;-}-.member.add .role label {- margin-right: 16px;-}-.list td.name .note {- font-size: 12px;- color: #888;- margin-top: 4px;-}--.user.detail>.head .avatar {- width: 32px;- height: 32px;-}-.user.detail>.head>a,-.user.detail>.head>span {- margin-left: 8px;-}-.user.detail>.head>a.name {- margin-left: 2px;- font-size: 16px;- vertical-align: middle;-}--.list td.privilege,-.list td.role {- width: 20%;-}--.account.overview>div {- margin-bottom: 20px;- border-bottom: 1px solid #DDD;- padding-bottom: 20px;-}-.account.overview>div>.head {- font-size: 18px;- margin-bottom: 12px;-}-.account.overview>div:last-child {- border-bottom: none;- margin-bottom: 0;- padding-bottom: 0;-}-.account.overview>.head>.title {- font-size: 18px;- font-weight: bold;-}-.account.overview>.head>.subtitle, .account.overview>.head>.subtitle a {- color: #777;-}-.account.overview>.head>.description {- margin-top: 8px;- background: #F5F5F5;- padding: 8px;- border-radius: 4px;-}-.account.overview>.head>.description .md-preview {- font-size: 14px;-}--.account.overview>.head>.subtitle span {- margin-right: 8px;-}--.account.overview>.organizations-and-depots td {- width: 50%;-}-.account.overview>.organizations-and-depots td:FIRST-CHILD {- padding-right: 20px;-}-.account.overview .panel-body>.operations {- margin-bottom: 20px;-}-.account.overview .panel-body table, .account.overview .panel-body .alert {- margin-bottom: 0;-}-diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.htmldeleted file mode 100644index 65488694be..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.html+++ /dev/null@@ -1,24 +0,0 @@-<wicket:extend>- <div class="collaborator list">- <div class="head">- <input wicket:id="searchCollaborators" class="form-control search" placeholder="Search collaborators"></input>- </div>- <table wicket:id="collaborators" class="collaborators table table-hover table-condensed">- <thead>- <tr>- <th class="name">User Name</th>- </tr>- </thead>- <tbody>- <tr wicket:id="collaborators">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><span wicket:id="name"></span></a>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noCollaborators" class="alert alert-warning">No collaborators found</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 872c301792..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java+++ /dev/null@@ -1,168 +0,0 @@-package com.gitplex.server.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class AccountCollaboratorListPage extends AccountLayoutPage {-- private PageableListView<Account> collaboratorsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer collaboratorsContainer;-- private WebMarkupContainer noCollaboratorsContainer;-- private String searchInput;-- public AccountCollaboratorListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchCollaborators", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(collaboratorsContainer);- target.add(pagingNavigator);- target.add(noCollaboratorsContainer);- }-- });-- collaboratorsContainer = new WebMarkupContainer("collaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!collaboratorsView.getModelObject().isEmpty());- }-- };- collaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(collaboratorsContainer);-- collaboratorsContainer.add(collaboratorsView = new PageableListView<Account>("collaborators",- new LoadableDetachableModel<List<Account>>() {-- @Override- protected List<Account> load() {- Set<Account> setOfCollaborators = new HashSet<>();-- UserAuthorizationManager userAuthorizationManager =- GitPlex.getInstance(UserAuthorizationManager.class);- for (UserAuthorization authorization: userAuthorizationManager.findAll(getAccount())) {- if (authorization.getUser().matches(searchInput)) {- setOfCollaborators.add(authorization.getUser());- }- }-- List<Account> listOfCollaborators = new ArrayList<>(setOfCollaborators);- Collections.sort(listOfCollaborators);- return listOfCollaborators;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account collaborator = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<>("avatarLink",- CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));- link.add(new Avatar("avatar", collaborator));- item.add(link);-- link = new ViewStateAwarePageLink<>("nameLink",- CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));- link.add(new Label("name", collaborator.getDisplayName()));- item.add(link);-- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", collaboratorsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(collaboratorsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noCollaboratorsContainer = new WebMarkupContainer("noCollaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(collaboratorsView.getModelObject().isEmpty());- }-- };- noCollaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(noCollaboratorsContainer);- }-- /*- * Collaborators page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to- * normal users as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.htmldeleted file mode 100644index 737e007d0d..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.html+++ /dev/null@@ -1,48 +0,0 @@-<wicket:extend>- <div class="collaborator depot list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchDepots" class="form-control search" placeholder="Search repositories"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="depots" class="depots table table-hover table-condensed">- <thead>- <tr>- <th class="name">Repository Name</th>- <th class="privilege">Privilege</th>- <td class="actions"></td>- </tr>- </thead>- <tbody>- <tr wicket:id="depots">- <td class="name">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="depotLink"><span wicket:id="name"></span></a>- <div wicket:id="greaterPrivileges" class="note">- This user has greater privileges from <a wicket:id="detail">other sources</a>.- </div>- </td>- <td class="privilege">- <a wicket:id="privilege" class="btn btn-default btn-xs"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove authorization"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No collaborating repositories</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index eed1de2990..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java+++ /dev/null@@ -1,407 +0,0 @@-package com.gitplex.server.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class CollaboratorDepotListPage extends CollaboratorPage {-- private PageableListView<UserAuthorization> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private String searchInput;-- private Set<Long> pendingRemovals = new HashSet<>();-- public CollaboratorDepotListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();-- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {-- @Override- public void query(String term, int page, Response<Depot> response) {- List<Depot> depots = new ArrayList<>();- term = term.toLowerCase();- for (Depot depot: getAccount().getDepots()) {- if (depot.getName().toLowerCase().contains(term)) {- boolean authorized = false;- for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {- if (authorization.getDepot().equals(depot)) {- authorized = true;- break;- }- }- if (!authorized)- depots.add(depot);- }- }-- Collections.sort(depots);-- new ResponseFiller<Depot>(response).fill(depots, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add Repository...");- getSettings().setFormatResult("gitplex.server.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.depotChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(collaboratorModel.getObject());- authorization.setDepot(selection);- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizations = new HashSet<>();- UserAuthorizationManager authorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<UserAuthorization>("depots",- new LoadableDetachableModel<List<UserAuthorization>>() {-- @Override- protected List<UserAuthorization> load() {- List<UserAuthorization> authorizations = new ArrayList<>();-- for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {- Depot depot = authorization.getDepot();- if (depot.getAccount().equals(getAccount())- && depot.matches(searchInput)) {- if (authorization.getPrivilege() != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {- authorizations.add(authorization);- }- }- }-- authorizations.sort((authorization1, authorization2)- -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));- return authorizations;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<UserAuthorization> item) {- UserAuthorization authorization = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>(- "depotLink",- DepotCollaboratorListPage.class,- DepotCollaboratorListPage.paramsOf(authorization.getDepot()));- link.add(new Label("name", authorization.getDepot().getName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- UserAuthorization authorization = item.getModelObject();- DepotAccess depotAccess = new DepotAccess(authorization.getUser(), authorization.getDepot());- setVisible(SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege()));- }-- };-- greaterPrivileges.add(new ViewStateAwarePageLink<Void>("detail",- CollaboratorPrivilegeSourcePage.class,- CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));-- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- UserAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.htmldeleted file mode 100644index a8b00c88cd..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html+++ /dev/null@@ -1,35 +0,0 @@-<wicket:extend>- <div class="effective permission list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchDepots" class="form-control search" placeholder="Search repositories"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- </div>- <table wicket:id="depots" class="depots table table-hover table-condensed">- <thead>- <tr>- <th class="name">Repository Name</th>- <th class="privilege">Privilege</th>- </tr>- </thead>- <tbody>- <tr wicket:id="depots">- <td class="name">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="depotLink"><span wicket:id="name"></span></a>- </td>- <td class="privilege">- <a wicket:id="privilegeLink"><span wicket:id="privilege"></span></a>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No accessible repositories</div>- <div class="help-block"><i class="fa fa-info-circle"></i> Effective privileges are the actual privileges- derived from all possible privilege sources</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index b1b4442e84..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java+++ /dev/null@@ -1,241 +0,0 @@-package com.gitplex.server.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--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;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {-- private PageableListView<DepotPermission> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private String searchInput;-- public CollaboratorEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();-- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",- new LoadableDetachableModel<List<DepotPermission>>() {-- @Override- protected List<DepotPermission> load() {- List<DepotPermission> permissions = new ArrayList<>();-- Account user = collaboratorModel.getObject();- for (Depot depot: getAccount().getDepots()) {- if (depot.matches(searchInput)) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new DepotPermission(depot, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getDepot().compareTo(permission2.getDepot()));- return permissions;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new ViewStateAwarePageLink<Void>(- "privilegeLink",- CollaboratorPrivilegeSourcePage.class,- CollaboratorPrivilegeSourcePage.paramsOf(permission.getDepot(), collaboratorModel.getObject()));- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- private static class DepotPermission {-- private final Depot depot;-- private final DepotPrivilege privilege;-- public DepotPermission(Depot depot, DepotPrivilege privilege) {- this.depot = depot;- this.privilege = privilege;- }-- public Depot getDepot() {- return depot;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.html b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.htmldeleted file mode 100644index 01e95d0b48..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.html+++ /dev/null@@ -1,14 +0,0 @@-<wicket:extend>- <div class="user detail">- <div class="head">- <a wicket:id="collaboratorAvatar"></a>- <a wicket:id="collaboratorName" class="name"></a>- </div>- <div class="body">- <ul wicket:id="collaboratorTabs" class="nav nav-tabs"></ul>- <div class="tab-panel">- <wicket:child></wicket:child>- </div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 7831857948..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java+++ /dev/null@@ -1,123 +0,0 @@-package com.gitplex.server.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.link.AccountLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.PageTabLink;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public abstract class CollaboratorPage extends AccountLayoutPage {-- private static final String PARAM_COLLABORATOR = "collaborator";-- protected final IModel<Account> collaboratorModel;-- public CollaboratorPage(PageParameters params) {- super(params);-- String collaboratorName = params.get(PARAM_COLLABORATOR).toString();- collaboratorModel = new LoadableDetachableModel<Account>() {-- @Override- protected Account load() {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account collaborator = accountManager.findByName(collaboratorName);- return Preconditions.checkNotNull(collaborator);- }-- };- }-- public static PageParameters paramsOf(Account account, Account collaborator) {- PageParameters params = paramsOf(account);- params.add(PARAM_COLLABORATOR, collaborator.getName());- return params;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AvatarLink("collaboratorAvatar", collaboratorModel.getObject()));- add(new AccountLink("collaboratorName", collaboratorModel.getObject()));-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Collaborating Repositories"), CollaboratorDepotListPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaboratorModel.getObject()));- }-- };- }-- });-- tabs.add(new PageTab(Model.of("Effective Privileges"),- CollaboratorEffectivePrivilegePage.class, CollaboratorPrivilegeSourcePage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, CollaboratorEffectivePrivilegePage.class,- CollaboratorEffectivePrivilegePage.paramsOf(getAccount(), collaboratorModel.getObject()));- }-- };- }-- });- add(new Tabbable("collaboratorTabs", tabs));- }-- /*- * Collaborators page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to- * normal users as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onDetach() {- collaboratorModel.detach();- super.onDetach();- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountCollaboratorListPage.class, AccountCollaboratorListPage.paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.htmldeleted file mode 100644index 02139973aa..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="privilegeSource"></div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index b082634eaa..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java+++ /dev/null@@ -1,56 +0,0 @@-package com.gitplex.server.web.page.account.collaborators;--import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;--@SuppressWarnings("serial")-public class CollaboratorPrivilegeSourcePage extends CollaboratorPage {-- private static final String PARAM_DEPOT = "depot";-- private final IModel<Depot> depotModel;-- public CollaboratorPrivilegeSourcePage(PageParameters params) {- super(params);-- String depotName = params.get(PARAM_DEPOT).toString();- depotModel = new LoadableDetachableModel<Depot>() {-- @Override- protected Depot load() {- return Preconditions.checkNotNull(- GitPlex.getInstance(DepotManager.class).find(getAccount(), depotName));- }-- };-- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new PrivilegeSourcePanel("privilegeSource", collaboratorModel, depotModel));- }-- public static PageParameters paramsOf(Depot depot, Account collaborator) {- PageParameters params = paramsOf(depot.getAccount(), collaborator);- params.add(PARAM_DEPOT, depot.getName());- return params;- }-- @Override- protected void onDetach() {- depotModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.htmldeleted file mode 100644index a8b00c88cd..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.html+++ /dev/null@@ -1,35 +0,0 @@-<wicket:extend>- <div class="effective permission list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchDepots" class="form-control search" placeholder="Search repositories"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- </div>- <table wicket:id="depots" class="depots table table-hover table-condensed">- <thead>- <tr>- <th class="name">Repository Name</th>- <th class="privilege">Privilege</th>- </tr>- </thead>- <tbody>- <tr wicket:id="depots">- <td class="name">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="depotLink"><span wicket:id="name"></span></a>- </td>- <td class="privilege">- <a wicket:id="privilegeLink"><span wicket:id="privilege"></span></a>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No accessible repositories</div>- <div class="help-block"><i class="fa fa-info-circle"></i> Effective privileges are the actual privileges- derived from all possible privilege sources</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 90ec53f818..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java+++ /dev/null@@ -1,246 +0,0 @@-package com.gitplex.server.web.page.account.members;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--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;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class MemberEffectivePrivilegePage extends MemberPage {-- private PageableListView<DepotPermission> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private String searchInput;-- public MemberEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();-- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",- new LoadableDetachableModel<List<DepotPermission>>() {-- @Override- protected List<DepotPermission> load() {- List<DepotPermission> permissions = new ArrayList<>();-- Account user = getMembership().getUser();- for (Depot depot: getAccount().getDepots()) {- if (depot.matches(searchInput)) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new DepotPermission(depot, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getDepot().compareTo(permission2.getDepot()));- return permissions;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new ViewStateAwarePageLink<Void>(- "privilegeLink",- MemberPrivilegeSourcePage.class,- MemberPrivilegeSourcePage.paramsOf(getMembership(), permission.getDepot()));- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }-- /*- * Member effective privilege page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to ordinary members- * as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- private static class DepotPermission {-- private final Depot depot;-- private final DepotPrivilege privilege;-- public DepotPermission(Depot depot, DepotPrivilege privilege) {- this.depot = depot;- this.privilege = privilege;- }-- public Depot getDepot() {- return depot;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.htmldeleted file mode 100644index 884187725f..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.html+++ /dev/null@@ -1,53 +0,0 @@-<wicket:extend>- <div class="member list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchMembers" class="form-control search" placeholder="Search members"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear role filter"><i class="fa fa-times"></i></a>- </div>- <div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="members" class="members table table-hover table-condensed">- <thead>- <tr>- <th class="name">Name</th>- <th class="role">Role</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="members">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><span wicket:id="name"></span></a>- </td>- <td class="role">- <a wicket:id="role" class="btn btn-default btn-xs"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove from organization"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noMembers" class="alert alert-warning">No members found</div>- <div class="help-block"><i class="fa fa-info-circle"></i>- <span wicket:id="hasDefaultPrivilege">- Organization members have <a wicket:id="organizationProfile"><span wicket:id="defaultPrivilege"></span></a>- on all organization repositories, and can be added to teams to gain extra repository privileges- </span>- <span wicket:id="noDefaultPrivilege">Organization members can be added to teams to gain repository privileges</span>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 9764491d7f..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java+++ /dev/null@@ -1,447 +0,0 @@-package com.gitplex.server.web.page.account.members;--import static com.gitplex.server.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;-import static com.gitplex.server.web.component.roleselection.RoleSelectionPanel.ROLE_MEMBER;--import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;-import com.google.common.base.Preconditions;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class MemberListPage extends AccountLayoutPage {-- private PageableListView<OrganizationMembership> membersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer membersContainer;-- private WebMarkupContainer noMembersContainer;-- private String filterRole;-- private Set<Long> pendingRemovals = new HashSet<>();-- private String searchInput;-- public MemberListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchMembers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterRole == null)- return "Filter by role";- else- return filterRole;- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new RoleSelectionPanel(id, filterRole) {-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- dropdown.close();- filterRole = ROLE_ADMIN;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- dropdown.close();- filterRole = ROLE_MEMBER;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterRole = null;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterRole != null);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(NewMembersPage.class, NewMembersPage.paramsOf(getAccount()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Set<OrganizationMembership> organizationMemberships = new HashSet<>();- OrganizationMembershipManager organizationMembershipManager =- GitPlex.getInstance(OrganizationMembershipManager.class);- for (Long pendingRemoval: pendingRemovals) {- OrganizationMembership organizationMembership = organizationMembershipManager.load(pendingRemoval);- organizationMemberships.add(organizationMembership);- }- GitPlex.getInstance(OrganizationMembershipManager.class).delete(organizationMemberships);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- membersContainer = new WebMarkupContainer("members") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!membersView.getModelObject().isEmpty());- }-- };- membersContainer.setOutputMarkupPlaceholderTag(true);- add(membersContainer);-- membersContainer.add(membersView = new PageableListView<OrganizationMembership>("members",- new LoadableDetachableModel<List<OrganizationMembership>>() {-- @Override- protected List<OrganizationMembership> load() {- List<OrganizationMembership> memberships = new ArrayList<>();-- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- Account user = membership.getUser();- if (user.matches(searchInput)) {- if (filterRole == null- || filterRole.equals(ROLE_ADMIN) && membership.isAdmin()- || filterRole.equals(ROLE_MEMBER) && !membership.isAdmin()) {- memberships.add(membership);- }- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().compareTo(membership2.getUser()));- return memberships;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<OrganizationMembership> item) {- OrganizationMembership membership = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<>("avatarLink", MemberTeamListPage.class,- MemberTeamListPage.paramsOf(membership));- link.add(new Avatar("avatar", membership.getUser()));- item.add(link);-- link = new ViewStateAwarePageLink<>("nameLink", MemberTeamListPage.class,- MemberTeamListPage.paramsOf(membership));- link.add(new Label("name", membership.getUser().getDisplayName()));- item.add(link);-- item.add(new DropdownLink("role") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return membership.isAdmin()?ROLE_ADMIN:ROLE_MEMBER;- }-- }));- Account user = item.getModelObject().getUser();- if (!SecurityUtils.canManage(getAccount()) || user.equals(getLoginUser()))- add(AttributeAppender.append("disabled", "disabled"));- }-- @Override- protected void onConfigure() {- super.onConfigure();- Account user = item.getModelObject().getUser();- setEnabled(SecurityUtils.canManage(getAccount()) && !user.equals(getLoginUser()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- dropdown.close();- membership.setAdmin(false);- GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- Session.get().success("Role updated");- }-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- dropdown.close();- membership.setAdmin(true);- GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- Session.get().success("Role updated");- }-- };- }-- });- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- Account user = item.getModelObject().getUser();- setVisible(SecurityUtils.canManage(getAccount())- && !user.equals(getLoginUser())- && !pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noMembersContainer = new WebMarkupContainer("noMembers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getModelObject().isEmpty());- }-- };- noMembersContainer.setOutputMarkupPlaceholderTag(true);- add(noMembersContainer);-- add(new WebMarkupContainer("hasDefaultPrivilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ViewStateAwarePageLink<Void>("organizationProfile",- ProfileEditPage.class, ProfileEditPage.paramsOf(getAccount())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(SecurityUtils.canManage(getAccount()));- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("defaultPrivilege", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return "the default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege";- }-- }).setEscapeModelStrings(false));- }-- });- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getAccount().getDefaultPrivilege() != DepotPrivilege.NONE);- }-- });- add(new WebMarkupContainer("noDefaultPrivilege") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getAccount().getDefaultPrivilege() == DepotPrivilege.NONE);- }-- });- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(MemberListPage.class, paramsOf(account));- else if (SecurityUtils.canManage(account))- setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.htmldeleted file mode 100644index 77b9a19227..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.html+++ /dev/null@@ -1,16 +0,0 @@-<wicket:extend>- <div class="user detail">- <div class="head">- <a wicket:id="memberAvatar"></a>- <a wicket:id="memberLink" class="name"></a>- <a wicket:id="memberRole" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="removeMember" class="btn btn-danger">Remove</a>- </div>- <div class="body">- <ul wicket:id="memberTabs" class="nav nav-tabs"></ul>- <div class="tab-panel">- <wicket:child></wicket:child>- </div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 4f41e29815..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java+++ /dev/null@@ -1,215 +0,0 @@-package com.gitplex.server.web.page.account.members;--import static com.gitplex.server.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;-import static com.gitplex.server.web.component.roleselection.RoleSelectionPanel.ROLE_MEMBER;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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.avatar.AvatarLink;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.AccountLink;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.PageTabLink;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.util.ConfirmOnClick;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public abstract class MemberPage extends AccountLayoutPage {-- private static final String PARAM_MEMBER = "member";-- private final IModel<OrganizationMembership> membershipModel;-- public MemberPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());-- String userName = params.get(PARAM_MEMBER).toString();- Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).findByName(userName));- membershipModel = new LoadableDetachableModel<OrganizationMembership>() {-- @Override- protected OrganizationMembership load() {- return Preconditions.checkNotNull(- GitPlex.getInstance(OrganizationMembershipManager.class).find(getAccount(), user));- }-- };- }-- protected OrganizationMembership getMembership() {- return membershipModel.getObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AvatarLink("memberAvatar", getMembership().getUser()));- add(new AccountLink("memberLink", getMembership().getUser()));- add(new DropdownLink("memberRole") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (getMembership().isAdmin())- return "Role: "+ ROLE_ADMIN;- else- return "Role: " + ROLE_MEMBER;- }-- }));- Account user = getMembership().getUser();- if (!SecurityUtils.canManage(getAccount()) || user.equals(getLoginUser()))- add(AttributeAppender.append("disabled", "disabled"));- }-- @Override- protected void onConfigure() {- super.onConfigure();- Account user = getMembership().getUser();- setEnabled(SecurityUtils.canManage(getAccount()) && !user.equals(getLoginUser()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new RoleSelectionPanel(id, getMembership().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- dropdown.close();- getMembership().setAdmin(false);- GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());- setResponsePage(getPageClass(), getPageParameters());- Session.get().success("Role updated");- }-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- dropdown.close();- getMembership().setAdmin(true);- GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());- setResponsePage(getPageClass(), getPageParameters());- Session.get().success("Role updated");- }-- };- }-- });-- String confirmMessage = String.format("Do you really want to remove user '%s' from organization '%s'?",- getMembership().getUser().getDisplayName(), getAccount().getDisplayName());- add(new Link<Void>("removeMember") {-- @Override- public void onClick() {- GitPlex.getInstance(OrganizationMembershipManager.class).delete(getMembership());- setResponsePage(MemberListPage.class, MemberListPage.paramsOf(getAccount()));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- }.add(new ConfirmOnClick(confirmMessage)));-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Joined Teams"), MemberTeamListPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, MemberTeamListPage.class,- MemberTeamListPage.paramsOf(getMembership()));- }-- };- }-- });-- tabs.add(new PageTab(Model.of("Effective Privileges"),- MemberEffectivePrivilegePage.class, MemberPrivilegeSourcePage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, MemberEffectivePrivilegePage.class,- MemberEffectivePrivilegePage.paramsOf(getMembership()));- }-- };- }-- });-- add(new Tabbable("memberTabs", tabs).setVisible(SecurityUtils.canManage(getAccount())));- }-- public static PageParameters paramsOf(OrganizationMembership membership) {- PageParameters params = paramsOf(membership.getOrganization());- params.set(PARAM_MEMBER, membership.getUser().getName());- return params;- }-- @Override- protected void onDetach() {- membershipModel.detach();- super.onDetach();- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(MemberListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.htmldeleted file mode 100644index 02139973aa..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="privilegeSource"></div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 80e64b3ab0..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java+++ /dev/null@@ -1,73 +0,0 @@-package com.gitplex.server.web.page.account.members;--import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;--@SuppressWarnings("serial")-public class MemberPrivilegeSourcePage extends MemberPage {-- private static final String PARAM_DEPOT = "depot";-- private final IModel<Depot> depotModel;-- public MemberPrivilegeSourcePage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());-- String depotName = params.get(PARAM_DEPOT).toString();- depotModel = new LoadableDetachableModel<Depot>() {-- @Override- protected Depot load() {- return Preconditions.checkNotNull(- GitPlex.getInstance(DepotManager.class).find(getAccount(), depotName));- }-- };-- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new PrivilegeSourcePanel("privilegeSource", new AbstractReadOnlyModel<Account>() {-- @Override- public Account getObject() {- return getMembership().getUser();- }-- }, depotModel));- }-- public static PageParameters paramsOf(OrganizationMembership membership, Depot depot) {- PageParameters params = paramsOf(membership);- params.add(PARAM_DEPOT, depot.getName());- return params;- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onDetach() {- depotModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.htmldeleted file mode 100644index 3b5630d8f7..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.html+++ /dev/null@@ -1,35 +0,0 @@-<wicket:extend>- <div class="member team list">- <wicket:enclosure child="addNew">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- </wicket:enclosure>- <table wicket:id="teams" class="members table table-hover table-condensed">- <thead>- <tr>- <th class="name">Team Name</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="teams">- <td class="name">- <a wicket:id="link"><span wicket:id="name"></span></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove from team"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div wicket:id="noTeams" class="alert alert-warning">No teams found</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index fc710e8631..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java+++ /dev/null@@ -1,264 +0,0 @@-package com.gitplex.server.web.page.account.members;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.json.JSONException;-import org.json.JSONWriter;--import com.gitplex.server.GitPlex;-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.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.select2.ChoiceProvider;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;-import com.gitplex.server.web.page.account.teams.TeamMemberListPage;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;--@SuppressWarnings("serial")-public class MemberTeamListPage extends MemberPage {-- private ListView<TeamMembership> teamsView;-- private WebMarkupContainer teamsContainer;-- private WebMarkupContainer noTeamsContainer;-- private Set<Long> pendingRemovals = new HashSet<>();-- public MemberTeamListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- TeamMembershipManager teamMembershipManager = GitPlex.getInstance(TeamMembershipManager.class);- Collection<TeamMembership> memberships = new ArrayList<>();- for (Long id: pendingRemovals) {- memberships.add(teamMembershipManager.load(id));- }- GitPlex.getInstance(TeamMembershipManager.class).delete(memberships);- pendingRemovals.clear();- target.add(this);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- add(new SelectToAddChoice<Team>("addNew", new ChoiceProvider<Team>() {-- @Override- public void query(String term, int page, Response<Team> response) {- List<Team> teams = new ArrayList<>();- Account user = getMembership().getUser();- Collection<Team> joinedTeams = new HashSet<>();- for (TeamMembership membership: user.getJoinedTeams()) {- joinedTeams.add(membership.getTeam());- }- for (Team team: getAccount().getDefinedTeams()) {- if (team.matches(term) && !joinedTeams.contains(team)) {- teams.add(team);- }- }-- Collections.sort(teams);-- new ResponseFiller<Team>(response).fill(teams, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- @Override- public void toJson(Team choice, JSONWriter writer) throws JSONException {- writer.key("id").value(choice.getId()).key("name").value(choice.getName());- }-- @Override- public Collection<Team> toChoices(Collection<String> ids) {- List<Team> teams = Lists.newArrayList();- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- for (String each : ids) {- Long id = Long.valueOf(each);- teams.add(teamManager.load(id));- }-- return teams;- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Select team to join...");- getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));- }-- @Override- protected void onSelect(AjaxRequestTarget target, Team selection) {- TeamMembership membership = new TeamMembership();- membership.setTeam(selection);- membership.setUser(getMembership().getUser());- GitPlex.getInstance(TeamMembershipManager.class).save(membership);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- });-- teamsContainer = new WebMarkupContainer("teams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!teamsView.getModelObject().isEmpty());- }-- };- teamsContainer.setOutputMarkupPlaceholderTag(true);- add(teamsContainer);-- teamsContainer.add(teamsView = new ListView<TeamMembership>("teams",- new LoadableDetachableModel<List<TeamMembership>>() {-- @Override- protected List<TeamMembership> load() {- List<TeamMembership> memberships = new ArrayList<>(getMembership().getUser().getJoinedTeams());-- memberships.sort((membership1, membership2)- -> membership1.getTeam().getName().compareTo(membership2.getTeam().getName()));- return memberships;- }-- }) {-- @Override- protected void populateItem(ListItem<TeamMembership> item) {- Team team = item.getModelObject().getTeam();-- Link<Void> teamLink = new ViewStateAwarePageLink<Void>("link",- TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));- teamLink.add(new Label("name", team.getName()));- item.add(teamLink);- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount())- && !pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- noTeamsContainer = new WebMarkupContainer("noTeams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(teamsView.getModelObject().isEmpty());- }-- };- noTeamsContainer.setOutputMarkupPlaceholderTag(true);- add(noTeamsContainer);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.html b/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.htmldeleted file mode 100644index a2da129679..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.html+++ /dev/null@@ -1,22 +0,0 @@-<wicket:extend>- <section class="member add">- <div class="head">Add New Members</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="users" class="form-group">- <label>Select Users</label> <span class="required">*</span>- <input wicket:id="users" type="hidden" class="form-control"></input>- <div wicket:id="feedback"></div>- </div>- <div wicket:id="role" class="role form-group"></div>- <div class="form-group">- <label>Optionally Add to Teams</label>- <input wicket:id="teams" type="hidden" class="form-control"></input>- </div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Add"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 538a5111c5..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java+++ /dev/null@@ -1,168 +0,0 @@-package com.gitplex.server.web.page.account.members;--import java.util.ArrayList;-import java.util.Arrays;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.RadioChoice;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public class NewMembersPage extends AccountLayoutPage {-- private static final String USERS_ID = "users";-- private static final List<String> ROLES =- Arrays.asList("Add as ordinary members", "Add as organization administrators");-- private Collection<Account> users;-- private String role = ROLES.get(0);-- private Collection<Team> teams;-- public NewMembersPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Collection<OrganizationMembership> organizationMemberships = new ArrayList<>();- Collection<TeamMembership> teamMemberships = new ArrayList<>();- for (Account user: users) {- OrganizationMembership organizationMembership = new OrganizationMembership();- organizationMembership.setUser(user);- organizationMembership.setOrganization(getAccount());- organizationMembership.setAdmin(!role.equals(ROLES.get(0)));- organizationMemberships.add(organizationMembership);- for (Team team: teams) {- TeamMembership teamMembership = new TeamMembership();- teamMembership.setUser(user);- teamMembership.setTeam(team);- teamMemberships.add(teamMembership);- }- }-- GitPlex.getInstance(OrganizationMembershipManager.class).save(organizationMemberships, teamMemberships);- setResponsePage(MemberListPage.class, MemberListPage.paramsOf(getAccount()));- }-- };- add(form);-- WebMarkupContainer usersContainer = new WebMarkupContainer(USERS_ID);- usersContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (usersContainer.get(USERS_ID).hasErrorMessage())- return "has-error";- else- return "";- }-- }));- form.add(usersContainer);-- usersContainer.add(new NonMemberChoices(USERS_ID, accountModel, new IModel<Collection<Account>>() {-- @Override- public void detach() {- }-- @Override- public Collection<Account> getObject() {- return users;- }-- @Override- public void setObject(Collection<Account> object) {- users = object;- }-- }).setRequired(true));-- usersContainer.add(new FencedFeedbackPanel("feedback", usersContainer));-- form.add(new RadioChoice<String>("role", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return role;- }-- @Override- public void setObject(String object) {- role = object;- }-- }, ROLES));-- form.add(new TeamMultiChoice("teams", new IModel<Collection<Team>>() {-- @Override- public void detach() {- }-- @Override- public Collection<Team> getObject() {- return teams;- }-- @Override- public void setObject(Collection<Team> object) {- teams = object;- }-- }, new TeamChoiceProvider(accountModel)));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(MemberListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}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.javadeleted file mode 100644index 75e4e00e8d..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java+++ /dev/null@@ -1,65 +0,0 @@-package com.gitplex.server.web.page.account.members;--import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.model.IModel;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import com.gitplex.server.GitPlex;-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.util.editable.annotation.AccountChoice;-import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;--public class NonMemberChoiceProvider extends AccountChoiceProvider {-- private static final long serialVersionUID = 1L;-- private final IModel<Account> organizationModel;-- public NonMemberChoiceProvider(IModel<Account> organizationModel) {- super(AccountChoice.Type.USER);- this.organizationModel = organizationModel;- }-- @Override- public void query(String term, int page, Response<Account> response) {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Criterion criterion = Restrictions.and(- Restrictions.or(- Restrictions.ilike("name", term, MatchMode.ANYWHERE),- Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)),- Restrictions.eq("organization", false));-- Set<Account> members = new HashSet<>();- for (OrganizationMembership membership: organizationModel.getObject().getOrganizationMembers())- members.add(membership.getUser());-- List<Account> nonMembers = new ArrayList<>();- EntityCriteria<Account> criteria = accountManager.newCriteria();- for (Account user: accountManager.findRange(criteria.add(criterion).addOrder(Order.asc("name")), 0, 0)) {- if (!members.contains(user))- nonMembers.add(user);- }-- new ResponseFiller<Account>(response).fill(nonMembers, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- @Override- public void detach() {- organizationModel.detach();- super.detach();- }--}\ No newline at end of filediff --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.javadeleted file mode 100644index 809ff26406..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java+++ /dev/null@@ -1,38 +0,0 @@-package com.gitplex.server.web.page.account.members;--import java.util.Collection;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.server.web.component.select2.Select2MultiChoice;--public class NonMemberChoices extends Select2MultiChoice<Account> {-- private static final long serialVersionUID = 1L;-- public NonMemberChoices(String id, IModel<Account> organizationModel,- IModel<Collection<Account>> nonMembersModel) {- super(id, nonMembersModel, new NonMemberChoiceProvider(organizationModel));- }-- @Override- protected void onInitialize() {- super.onInitialize();- getSettings().setPlaceholder("Choose new members...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.htmldeleted file mode 100644index d93f935cce..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="content"></div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index a36f5d4e52..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java+++ /dev/null@@ -1,31 +0,0 @@-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.model.Account;-import com.gitplex.server.web.page.account.AccountLayoutPage;--@SuppressWarnings("serial")-public class AccountOverviewPage extends AccountLayoutPage {-- public AccountOverviewPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- if (getAccount().isOrganization())- add(new OrganizationOverviewPanel("content", accountModel));- else- add(new UserOverviewPanel("content", accountModel));- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.htmldeleted file mode 100644index 7f42ae762a..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.html+++ /dev/null@@ -1,32 +0,0 @@-<wicket:panel>- <div class="depot list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchDepots" class="form-control search" placeholder="Search..."></input>- </div>- <div class="pull-left actions">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>- </div>- </div>- <table wicket:id="depotsContainer" class="depots table table-hover table-condensed">- <thead>- <tr>- <th class="name">Name</th>- <th class="public">Public</th>- </tr>- </thead>- <tbody>- <tr wicket:id="depots">- <td class="name">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="depotLink"><span wicket:id="depotName"></span></a>- </td>- <td class="public">- <span wicket:id="public"></span>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="depotsPageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No repositories found</div>- </div>-</wicket:panel>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.javadeleted file mode 100644index 9ee7bad7f6..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java+++ /dev/null@@ -1,155 +0,0 @@-package com.gitplex.server.web.page.account.overview;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;--@SuppressWarnings("serial")-public class DepotListPanel extends GenericPanel<Account> {-- private PageableListView<Depot> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private String searchInput;-- public DepotListPanel(String id, IModel<Account> accountModel) {- super(id, accountModel);- }-- private Account getAccount() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(noDepotsContainer);- target.add(pagingNavigator);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(NewDepotPage.class, NewDepotPage.paramsOf(getAccount()));- }-- });-- depotsContainer = new WebMarkupContainer("depotsContainer") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- depotsContainer.add(depotsView = new PageableListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @Override- protected List<Depot> load() {- List<Depot> depots = new ArrayList<>();- for (Depot depot: GitPlex.getInstance(DepotManager.class)- .findAllAccessible(getAccount(), SecurityUtils.getAccount())) {- if (depot.matches(searchInput)) {- depots.add(depot);- }- }-- Collections.sort(depots);- return depots;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(final ListItem<Depot> item) {- Depot depot = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<>("depotLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- link.add(new Label("depotName", depot.getName()));- item.add(link);-- item.add(new Label("public", depot.isPublicRead()?"yes":"no"));- }-- });-- add(pagingNavigator = new BootstrapPagingNavigator("depotsPageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.htmldeleted file mode 100644index 739b1301d7..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <section class="depot add">- <div class="head">Create New Repository</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 9cb9caec17..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java+++ /dev/null@@ -1,68 +0,0 @@-package com.gitplex.server.web.page.account.overview;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-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.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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;--@SuppressWarnings("serial")-public class NewDepotPage extends AccountLayoutPage {-- public NewDepotPage(PageParameters params) {- super(params);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Depot depot = new Depot();-- BeanEditor<?> editor = BeanContext.editBean("editor", depot);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- depot.setAccount(getAccount());- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- Depot depotWithSameName = depotManager.find(getAccount(), depot.getName());- if (depotWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another repository in this account.");- } else {- depotManager.save(depot, null, null);- Session.get().success("New repository created");- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- }- }-- };- form.add(editor);- add(form);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.htmldeleted file mode 100644index a971284d04..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <section class="organization-add">- <div class="head">Create New Organization</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 31dc65f774..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java+++ /dev/null@@ -1,74 +0,0 @@-package com.gitplex.server.web.page.account.overview;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-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.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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountLayoutPage;--@SuppressWarnings("serial")-public class NewOrganizationPage extends AccountLayoutPage {-- public NewOrganizationPage(PageParameters params) {- super(params);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Account organization = new Account();- organization.setOrganization(true);- OrganizationMembership membership = new OrganizationMembership();- membership.setAdmin(true);- membership.setUser(getAccount());- membership.setOrganization(organization);-- BeanEditor<?> editor = BeanContext.editBean("editor", membership.getOrganization(), Account.getOrganizationExcludeProperties());-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Account organization = membership.getOrganization();- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account accountWithSameName = accountManager.findByName(organization.getName());- if (accountWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another account.");- } else {- GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);- Session.get().success("New organization created");- setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(organization));- }- }-- };- form.add(editor);-- add(form);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.htmldeleted file mode 100644index edab212c54..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.html+++ /dev/null@@ -1,14 +0,0 @@-<wicket:panel>- <div class="organization account overview">- <div class="head">- <div wicket:id="title" class="title"></div>- <div class="subtitle">- <span wicket:id="loginName"></span>- </div>- </div>- <div class="depots">- <div class="head">Repositories</div>- <div wicket:id="depots" class="body"></div>- </div>- </div>-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index de6ff9d8fe..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java+++ /dev/null@@ -1,39 +0,0 @@-package com.gitplex.server.web.page.account.overview;--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.model.Account;--@SuppressWarnings("serial")-public class OrganizationOverviewPanel extends GenericPanel<Account> {-- public OrganizationOverviewPanel(String id, IModel<Account> model) {- super(id, model);- }-- private Account getOrganization() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Account user = getOrganization();- add(new Label("title", user.getDisplayName()));- add(new Label("loginName", user.getName()) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(user.getFullName()!=null);- }-- });-- add(new DepotListPanel("depots", getModel()));- }--}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.html b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.htmldeleted file mode 100644index df72ba59e7..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.html+++ /dev/null@@ -1,52 +0,0 @@-<wicket:panel>- <div class="user account overview">- <div class="head">- <div wicket:id="title" class="title"></div>- <div class="subtitle">- <span wicket:id="loginName"></span> <i class="fa fa-envelope-o"></i> <a wicket:id="email"></a>- </div>- </div>- <table class="organizations-and-depots">- <tr>- <td class="depots">- <div class="panel panel-default">- <div class="panel-heading"><span class="panel-title">Repositories</span></div>- <div class="panel-body">- <div wicket:id="depots" class="body"></div>- </div>- </div>- </td>- <td class="organizations">- <div class="panel panel-default">- <div class="panel-heading"><span class="panel-title">Organizations</span></div>- <div class="panel-body">- <div class="operations">- <a wicket:id="addOrganization" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>- </div>- <table wicket:id="organizations" class="table table-hover table-condensed">- <thead>- <tr>- <th class="name">Name</th>- <th class="role">Role</th>- </tr>- </thead>- <tbody>- <tr wicket:id="organizations">- <td class="name">- <a wicket:id="avatarLink"></a>- <a wicket:id="accountLink"></a>- </td>- <td class="role">- <span wicket:id="role"></span>- </td>- </tr>- </tbody>- </table>- <div wicket:id="noOrganizations" class="alert alert-warning">No organizations found</div>- </div>- </div>- </td>- </tr>- </table>- </div>-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 76cf72704e..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java+++ /dev/null@@ -1,108 +0,0 @@-package com.gitplex.server.web.page.account.overview;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.link.AccountLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;--@SuppressWarnings("serial")-public class UserOverviewPanel extends GenericPanel<Account> {-- public UserOverviewPanel(String id, IModel<Account> model) {- super(id, model);- }-- private Account getUser() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Account user = getUser();- add(new Label("title", user.getDisplayName()));- add(new Label("loginName", user.getName()) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(user.getFullName()!=null);- }-- });- add(new Label("email", user.getEmail())- .add(AttributeAppender.append("href", "mailto:" + user.getEmail())));-- add(new ViewStateAwarePageLink<Void>("addOrganization",- NewOrganizationPage.class, NewOrganizationPage.paramsOf(getUser())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(user));- }-- });-- WebMarkupContainer organizationsContainer = new WebMarkupContainer("organizations") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getUser().getOrganizations().isEmpty());- }-- };- add(organizationsContainer);- IModel<List<OrganizationMembership>> organizationsModel = new AbstractReadOnlyModel<List<OrganizationMembership>>() {-- @Override- public List<OrganizationMembership> getObject() {- List<OrganizationMembership> memberships = new ArrayList<>(getUser().getOrganizations());- memberships.sort((o1, o2)->o1.getOrganization().getDisplayName().compareTo(o2.getOrganization().getDisplayName()));- return memberships;- }-- };- organizationsContainer.add(new ListView<OrganizationMembership>("organizations", organizationsModel) {-- @Override- protected void populateItem(ListItem<OrganizationMembership> item) {- OrganizationMembership membership = item.getModelObject();- item.add(new AvatarLink("avatarLink", membership.getOrganization()));- item.add(new AccountLink("accountLink", membership.getOrganization()));- item.add(new Label("role", membership.isAdmin()?RoleSelectionPanel.ROLE_ADMIN:RoleSelectionPanel.ROLE_MEMBER));- }-- });-- add(new WebMarkupContainer("noOrganizations") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getUser().getOrganizations().isEmpty());- }-- });-- add(new DepotListPanel("depots", getModel()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.htmldeleted file mode 100644index f00e1a6a72..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.html+++ /dev/null@@ -1,8 +0,0 @@-<wicket:extend>- <div class="account-setting">- <ul wicket:id="accountSettingTabs" class="nav nav-tabs"></ul>- <div class="content">- <wicket:child></wicket:child>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.javadeleted file mode 100644index b9ac6eac7b..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java+++ /dev/null@@ -1,40 +0,0 @@-package com.gitplex.server.web.page.account.setting;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.AccountTab;--@SuppressWarnings("serial")-public abstract class AccountSettingPage extends AccountLayoutPage {-- public AccountSettingPage(PageParameters params) {- super(params);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new AccountTab("Profile", "", 0, ProfileEditPage.class));- tabs.add(new AccountTab("Avatar", "", 0, AvatarEditPage.class));-- if (!getAccount().isOrganization())- tabs.add(new AccountTab("Change Password", "", 0, PasswordEditPage.class));-- add(new Tabbable("accountSettingTabs", tabs));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.javadeleted file mode 100644index a94df8c8c9..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.account.setting;--import org.apache.wicket.request.resource.CssResourceReference;--public class AvatarEditResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public AvatarEditResourceReference() {- super(AvatarEditResourceReference.class, "avatar-edit.css");- }--}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.javadeleted file mode 100644index 426e460daa..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java+++ /dev/null@@ -1,134 +0,0 @@-package com.gitplex.server.web.page.account.setting;--import java.io.Serializable;-import java.util.HashSet;-import java.util.Set;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountPage;--@SuppressWarnings("serial")-public class ProfileEditPage extends AccountSettingPage {-- private String oldName;-- private BeanEditor<?> editor;-- public ProfileEditPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Set<String> excludedProperties = new HashSet<>();- excludedProperties.add("password");- if (getAccount().isOrganization()) {- excludedProperties.add("email");- } else {- excludedProperties.add("description");- excludedProperties.add("defaultPrivilege");- }- editor = BeanContext.editModel("editor", new IModel<Serializable>() {-- @Override- public void detach() {- }-- @Override- public Serializable getObject() {- return getAccount();- }-- @Override- public void setObject(Serializable object) {- // check contract of AccountManager.save on why we assign oldName here- oldName = getAccount().getName();- editor.getBeanDescriptor().copyProperties(object, getAccount());- }-- }, excludedProperties);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Account account = getAccount();- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account accountWithSameName = accountManager.findByName(account.getName());- if (accountWithSameName != null && !accountWithSameName.equals(account)) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another account.");- }- Account accountWithSameEmail = accountManager.findByEmail(account.getEmail());- if (accountWithSameEmail != null && !accountWithSameEmail.equals(account)) {- editor.getErrorContext(new PathSegment.Property("email"))- .addError("This email has already been used by another account.");- }- if (!editor.hasErrors(true)) {- accountManager.save(account, oldName);- Session.get().success("Profile has been updated");- setResponsePage(ProfileEditPage.class, AccountPage.paramsOf(account));- }- }-- };- form.add(editor);-- form.add(new AjaxLink<Void>("delete") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!getAccount().isAdministrator());- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (!getAccount().getDepots().isEmpty()) {- target.appendJavaScript("alert('Please delete or transfer repositories under this account first');");- } else {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- setResponsePage(getApplication().getHomePage());- }-- @Override- protected Account getAccount() {- return ProfileEditPage.this.getAccount();- }-- };- }- }-- });-- add(form);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(ProfileEditPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/avatar-edit.css b/web/src/main/java/com/gitplex/server/web/page/account/setting/avatar-edit.cssdeleted file mode 100644index 2833aa5cc3..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/avatar-edit.css+++ /dev/null@@ -1,3 +0,0 @@-.avatar-edit .upload {- margin-right: 8px;-}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.javadeleted file mode 100644index 92572f09cd..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java+++ /dev/null@@ -1,58 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.server.web.component.select2.Response;--public class MemberChoiceProvider extends AccountChoiceProvider {-- private static final long serialVersionUID = 1L;-- private final IModel<Account> organizationModel;-- public MemberChoiceProvider(IModel<Account> organizationModel) {- super(AccountChoice.Type.USER);- this.organizationModel = organizationModel;- }-- @Override- public void query(String term, int page, Response<Account> response) {- List<Account> members = new ArrayList<>();- term = term.toLowerCase();- for (OrganizationMembership membership: organizationModel.getObject().getOrganizationMembers()) {- Account user = membership.getUser();- if (user.getName().toLowerCase().contains(term)- || user.getFullName()!=null && user.getFullName().toLowerCase().contains(term)) {- members.add(user);- }- }- members.sort((user1, user2) -> user1.getName().compareTo(user2.getName()));-- int from = page * WebConstants.DEFAULT_PAGE_SIZE;- int to = from + WebConstants.DEFAULT_PAGE_SIZE;-- if (to > members.size()) {- to = members.size();- }- if (from > to) {- from = to;- }- response.addAll(members.subList(from, to));- response.setHasMore(to<members.size());- }-- @Override- public void detach() {- organizationModel.detach();- super.detach();- }--}\ No newline at end of filediff --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.javadeleted file mode 100644index 1fdd576853..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java+++ /dev/null@@ -1,37 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.Collection;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.server.web.component.select2.Select2MultiChoice;--public class MemberChoices extends Select2MultiChoice<Account> {-- private static final long serialVersionUID = 1L;-- public MemberChoices(String id, IModel<Account> organizationModel, IModel<Collection<Account>> membersModel) {- super(id, membersModel, new MemberChoiceProvider(organizationModel));- }-- @Override- protected void onInitialize() {- super.onInitialize();- getSettings().setPlaceholder("Choose team members...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.htmldeleted file mode 100644index 9aa967b0a1..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <section class="team add">- <div class="head">Create New Team</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Add"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 8774a26ece..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java+++ /dev/null@@ -1,74 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.io.Serializable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.google.common.base.Preconditions;-import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;--@SuppressWarnings("serial")-public class NewTeamPage extends AccountLayoutPage {-- public NewTeamPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Team team = new Team();-- BeanEditor<Serializable> editor = BeanContext.editBean("editor", team);- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- Account organization = getAccount();- team.setOrganization(organization);- if (teamManager.find(organization, team.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another team in the organization");- } else {- GitPlex.getInstance(TeamManager.class).save(team, null);- setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));- }- }-- };- form.add(editor);-- add(form);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(TeamListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.htmldeleted file mode 100644index 93c957be1b..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.html+++ /dev/null@@ -1,49 +0,0 @@-<wicket:extend>- <div class="team depot list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchDepots" class="form-control search" placeholder="Search repositories"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="depots" class="depots table table-hover table-condensed">- <thead>- <tr>- <th class="name">Repository Name</th>- <th class="privilege">Privilege</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="depots">- <td class="name">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a>- <div wicket:id="greaterPrivileges" class="note">- Some members have greater privileges. <a wicket:id="detail">View details</a>- </div>- </td>- <td class="privilege">- <a wicket:id="privilege" class="btn btn-default btn-xs"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove authorization"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No team specific repository authorizations found</div>- <div wicket:id="tip" class="help-block"></div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 74b1ecf70b..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java+++ /dev/null@@ -1,452 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.modal.ModalLink;-import com.gitplex.server.web.component.modal.ModalPanel;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamAuthorizationPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;-import com.google.common.base.Preconditions;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class TeamDepotListPage extends TeamPage {-- private PageableListView<TeamAuthorization> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private Set<Long> pendingRemovals = new HashSet<>();-- private String searchInput;-- public TeamDepotListPage(PageParameters params) {- super(params);- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<TeamAuthorization> authorizations = new HashSet<>();- TeamAuthorizationManager authorizationManager = GitPlex.getInstance(TeamAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {-- @Override- public void query(String term, int page, Response<Depot> response) {- List<Depot> depots = new ArrayList<>();- for (Depot depot: getAccount().getDepots()) {- if (depot.matches(term)) {- boolean authorized = false;- for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {- if (authorization.getDepot().equals(depot)) {- authorized = true;- break;- }- }- if (!authorized)- depots.add(depot);- }- }-- Collections.sort(depots);-- new ResponseFiller<Depot>(response).fill(depots, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add repository...");- getSettings().setFormatResult("gitplex.server.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.depotChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot selection) {- TeamAuthorization authorization = new TeamAuthorization();- authorization.setDepot(selection);- authorization.setTeam(teamModel.getObject());- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<TeamAuthorization>("depots",- new LoadableDetachableModel<List<TeamAuthorization>>() {-- @Override- protected List<TeamAuthorization> load() {- List<TeamAuthorization> authorizations = new ArrayList<>();-- for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {- if (authorization.getDepot().matches(searchInput)- && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {- authorizations.add(authorization);- }- }-- authorizations.sort((authorization1, authorization2)- -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));- return authorizations;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<TeamAuthorization> item) {- TeamAuthorization authorization = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotTeamAuthorizationPage.class,- DepotTeamAuthorizationPage.paramsOf(authorization.getDepot()));- link.add(new Label("name", authorization.getDepot().getName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasGreaterPrivileges = false;- Team team = teamModel.getObject();- TeamAuthorization authorization = item.getModelObject();- for (Account user: team.getMembers()) {- DepotAccess depotAccess = new DepotAccess(user, authorization.getDepot());- if (SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege())) {- hasGreaterPrivileges = true;- break;- }- }- setVisible(hasGreaterPrivileges);- }-- };- greaterPrivileges.add(new ModalLink("detail") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new GreaterPrivilegesPanel(id, item.getModel()) {-- @Override- protected void onClose(AjaxRequestTarget target) {- modal.close();- }-- };- }-- });- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- TeamAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- add(new Label("tip", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- StringBuilder builder = new StringBuilder("<i class='fa fa-info-circle'></i> ");- if (getAccount().getDefaultPrivilege() == DepotPrivilege.NONE) {- builder.append("Grant repository privileges here for the team");- } else {- builder.append("Grant extra repository privileges here for the team besides the "- + "default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege "- + "in organization setting");- }- return builder.toString();- }-- }).setEscapeModelStrings(false));-- }-- /*- * Team authorization page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to ordinary members- * as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.htmldeleted file mode 100644index a7b51df931..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <section class="team edit">- <div class="head">Edit Team</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index a30724984b..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java+++ /dev/null@@ -1,122 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.io.Serializable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.google.common.base.Preconditions;-import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;--@SuppressWarnings("serial")-public class TeamEditPage extends AccountLayoutPage {-- private static final String PARAM_TEAM = "team";-- private final IModel<Team> teamModel;-- private BeanEditor<?> editor;-- private String oldName;-- public static PageParameters paramsOf(Team team) {- PageParameters params = paramsOf(team.getOrganization());- params.add(PARAM_TEAM, team.getName());- return params;- }-- public TeamEditPage(PageParameters params) {- super(params);-- String teamName = params.get(PARAM_TEAM).toString();- teamModel = new LoadableDetachableModel<Team>() {-- @Override- protected Team load() {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- return Preconditions.checkNotNull(teamManager.find(getAccount(), teamName));- }-- };- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- editor = BeanContext.editModel("editor", new IModel<Serializable>() {-- @Override- public void detach() {- }-- @Override- public Serializable getObject() {- return teamModel.getObject();- }-- @Override- public void setObject(Serializable object) {- // check contract of TeamManager.save on why we assign oldName here- oldName = teamModel.getObject().getName();- editor.getBeanDescriptor().copyProperties(object, teamModel.getObject());- }-- });-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- Team team = teamModel.getObject();- if (!oldName.equals(team.getName()) && teamManager.find(getAccount(), team.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another team in the organization");- } else {- teamManager.save(team, oldName);- setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));- }- }-- };- form.add(editor);-- add(form);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(TeamListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }-- @Override- protected void onDetach() {- teamModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.htmldeleted file mode 100644index d924a49579..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.html+++ /dev/null@@ -1,32 +0,0 @@-<wicket:extend>- <div class="team list">- <div class="head clearfix">- <div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>- </div>- </div>- <table wicket:id="teams" class="teams table table-hover table-condensed">- <thead>- <tr>- <th class="name">Name</th>- <th class="members">Members</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="teams">- <td class="name">- <a wicket:id="link"><span wicket:id="name"></span></a>- </td>- <td class="members">- <span wicket:id="members"><a wicket:id="member"></a></span> <a wicket:id="more">and more</a>- </td>- <td class="actions">- <a wicket:id="delete" title="Delete this team"><i class="fa fa-trash"></i></a>- </td>- </tr>- </tbody>- </table>- <div wicket:id="noTeams" class="alert alert-warning">No teams found</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 4ea151288e..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java+++ /dev/null@@ -1,200 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public class TeamListPage extends AccountLayoutPage {-- private static final int MAX_DISPLAY_MEMBERS = 20;-- private final IModel<Collection<TeamMembership>> teamMembershipsModel =- new LoadableDetachableModel<Collection<TeamMembership>>() {-- @Override- protected Collection<TeamMembership> load() {- TeamMembershipManager teamMembershipManager = GitPlex.getInstance(TeamMembershipManager.class);- return teamMembershipManager.findAll(getAccount());- }-- };-- private ListView<Team> teamsView;-- private WebMarkupContainer teamsContainer;-- private WebMarkupContainer noTeamsContainer;-- public TeamListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(NewTeamPage.class, NewTeamPage.paramsOf(getAccount()));- }-- });-- teamsContainer = new WebMarkupContainer("teams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!teamsView.getModelObject().isEmpty());- }-- };- teamsContainer.setOutputMarkupPlaceholderTag(true);- add(teamsContainer);-- noTeamsContainer = new WebMarkupContainer("noTeams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(teamsView.getModelObject().isEmpty());- }-- };- noTeamsContainer.setOutputMarkupPlaceholderTag(true);- add(noTeamsContainer);-- teamsContainer.add(teamsView = new ListView<Team>("teams", new LoadableDetachableModel<List<Team>>() {-- @Override- protected List<Team> load() {- List<Team> teams = new ArrayList<>(getAccount().getDefinedTeams());- Collections.sort(teams);- return teams;- }-- }) {-- @Override- protected void populateItem(ListItem<Team> item) {- Team team = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<>("link", TeamMemberListPage.class,- TeamMemberListPage.paramsOf(team));- link.add(new Label("name", team.getName()));- item.add(link);-- RepeatingView membersView = new RepeatingView("members");- int count = 0;- for (TeamMembership teamMembership: teamMembershipsModel.getObject()) {- if (teamMembership.getTeam().equals(team) && count++<MAX_DISPLAY_MEMBERS) {- WebMarkupContainer child = new WebMarkupContainer(membersView.newChildId());- child.add(new AvatarLink("member", teamMembership.getUser(), true));- membersView.add(child);- }- }- item.add(membersView);- if (count > MAX_DISPLAY_MEMBERS) {- item.add(new Link<Void>("more") {-- @Override- public void onClick() {- setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(item.getModelObject()));- }-- });- } else {- item.add(new WebMarkupContainer("more").setVisible(false));- }-- Long teamId = team.getId();- item.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmListener(- "Do you really want to delete team " + item.getModelObject().getName() + "?"));- }-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- teamManager.delete(teamManager.load(teamId));- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- });- }-- });- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(TeamListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }-- @Override- protected void onDetach() {- teamMembershipsModel.detach();-- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.htmldeleted file mode 100644index 621d8975e8..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.html+++ /dev/null@@ -1,44 +0,0 @@-<wicket:extend>- <div class="team member list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchMembers" class="form-control search" placeholder="Search members"></input>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="members" class="members table table-hover table-condensed">- <thead>- <tr>- <th class="name">Member Name</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="members">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><span wicket:id="name"></span></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove from team"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noMembers" class="alert alert-warning">No members found</div>- <wicket:enclosure child="organizationMembers">- <div class="help-block">- <i class="fa fa-info-circle"></i>- Users need to be added as <a wicket:id="organizationMembers">organization members</a> before they can be added to team- </div>- </wicket:enclosure>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 33e7fb2e3a..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java+++ /dev/null@@ -1,327 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.commons.lang3.StringEscapeUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.json.JSONException;-import org.json.JSONWriter;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.select2.ChoiceProvider;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.page.account.members.MemberListPage;-import com.gitplex.server.web.page.account.members.MemberTeamListPage;-import com.gitplex.server.web.util.avatar.AvatarManager;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class TeamMemberListPage extends TeamPage {-- private PageableListView<TeamMembership> membersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer membersContainer;-- private WebMarkupContainer noMembersContainer;-- private Set<Long> pendingRemovals = new HashSet<>();-- private String searchInput;-- public TeamMemberListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchMembers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- TeamMembershipManager teamMembershipManager = GitPlex.getInstance(TeamMembershipManager.class);- Collection<TeamMembership> memberships = new ArrayList<>();- for (Long id: pendingRemovals) {- memberships.add(teamMembershipManager.load(id));- }- GitPlex.getInstance(TeamMembershipManager.class).delete(memberships);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- add(new SelectToAddChoice<OrganizationMembership>("addNew", new ChoiceProvider<OrganizationMembership>() {-- @Override- public void query(String term, int page, Response<OrganizationMembership> response) {- List<OrganizationMembership> memberships = new ArrayList<>();- term = term.toLowerCase();- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- Account user = membership.getUser();- if (user.matches(term) && !teamModel.getObject().getMembers().contains(user)) {- memberships.add(membership);- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().compareTo(membership2.getUser()));-- new ResponseFiller<OrganizationMembership>(response).fill(memberships, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- @Override- public void toJson(OrganizationMembership choice, JSONWriter writer) throws JSONException {- String displayName = StringEscapeUtils.escapeHtml4(choice.getUser().getDisplayName());- writer.key("id").value(choice.getId()).key("name").value(displayName);- String avatarUrl = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(choice.getUser());- writer.key("avatar").value(avatarUrl);- }-- @Override- public Collection<OrganizationMembership> toChoices(Collection<String> ids) {- List<OrganizationMembership> memberships = Lists.newArrayList();- OrganizationMembershipManager membershipManager = GitPlex.getInstance(OrganizationMembershipManager.class);- for (String each : ids) {- Long id = Long.valueOf(each);- memberships.add(membershipManager.load(id));- }-- return memberships;- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add user to team...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }-- @Override- protected void onSelect(AjaxRequestTarget target, OrganizationMembership selection) {- TeamMembership membership = new TeamMembership();- membership.setTeam(teamModel.getObject());- membership.setUser(selection.getUser());- GitPlex.getInstance(TeamMembershipManager.class).save(membership);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- membersContainer = new WebMarkupContainer("members") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!membersView.getModelObject().isEmpty());- }-- };- membersContainer.setOutputMarkupPlaceholderTag(true);- add(membersContainer);-- membersContainer.add(membersView = new PageableListView<TeamMembership>("members",- new LoadableDetachableModel<List<TeamMembership>>() {-- @Override- protected List<TeamMembership> load() {- List<TeamMembership> memberships = new ArrayList<>();-- for (TeamMembership membership: teamModel.getObject().getMemberships()) {- if (membership.getUser().matches(searchInput)) {- memberships.add(membership);- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().getDisplayName().compareTo(membership2.getUser().getDisplayName()));- return memberships;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<TeamMembership> item) {- Account member = item.getModelObject().getUser();-- OrganizationMembership membership =- Preconditions.checkNotNull(getAccount().getOrganizationMembersMap().get(member));- PageParameters params = MemberTeamListPage.paramsOf(membership);- Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",- MemberTeamListPage.class, params);- link.add(new Avatar("avatar", member));- item.add(link);-- link = new ViewStateAwarePageLink<Void>("nameLink",- MemberTeamListPage.class, params);- link.add(new Label("name", member.getDisplayName()));- item.add(link);-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount())- && !pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noMembersContainer = new WebMarkupContainer("noMembers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getModelObject().isEmpty());- }-- };- noMembersContainer.setOutputMarkupPlaceholderTag(true);- add(noMembersContainer);-- add(new ViewStateAwarePageLink<Void>("organizationMembers",- MemberListPage.class, MemberListPage.paramsOf(getAccount())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- });- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.html b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.htmldeleted file mode 100644index 909b71b81c..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.html+++ /dev/null@@ -1,20 +0,0 @@-<wicket:extend>- <div class="team detail">- <div class="head">- <div wicket:id="teamName" class="title"></div>- <div wicket:id="teamDescription" class="description"></div>- <wicket:enclosure child="editTeam">- <div class="actions">- <a wicket:id="editTeam" class="btn btn-primary">Edit</a>- <a wicket:id="deleteTeam" class="btn btn-danger">Delete</a>- </div>- </wicket:enclosure>- </div>- <div class="body">- <ul wicket:id="teamTabs" class="nav nav-tabs"></ul>- <div class="tab-panel">- <wicket:child></wicket:child>- </div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 0cc1259ce5..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java+++ /dev/null@@ -1,158 +0,0 @@-package com.gitplex.server.web.page.account.teams;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.PageTabLink;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.util.ConfirmOnClick;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public abstract class TeamPage extends AccountLayoutPage {-- private static final String PARAM_TEAM = "team";-- protected final IModel<Team> teamModel;-- public TeamPage(PageParameters params) {- super(params);-- String teamName = params.get(PARAM_TEAM).toString();- teamModel = new LoadableDetachableModel<Team>() {-- @Override- protected Team load() {- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);- return Preconditions.checkNotNull(teamManager.find(getAccount(), teamName));- }-- };- Preconditions.checkState(getAccount().isOrganization());- }-- public static PageParameters paramsOf(Team team) {- PageParameters params = paramsOf(team.getOrganization());- params.set(PARAM_TEAM, team.getName());- return params;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("teamName", teamModel.getObject().getName()));- if (teamModel.getObject().getDescription() != null) {- add(new MarkdownViewer("teamDescription", Model.of(teamModel.getObject().getDescription()), null));- } else {- add(new Label("teamDescription", "<i>No description</i>").setEscapeModelStrings(false));- }- add(new Link<Void>("editTeam") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(TeamEditPage.class, TeamEditPage.paramsOf(teamModel.getObject()));- }-- });- add(new Link<Void>("deleteTeam") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- GitPlex.getInstance(TeamManager.class).delete(teamModel.getObject());- setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getAccount()));- }-- }.add(new ConfirmOnClick("Do you really want to delete this team?")));-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Team Members"), TeamMemberListPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, TeamMemberListPage.class,- TeamMemberListPage.paramsOf(teamModel.getObject()));- }-- };- }-- });- tabs.add(new PageTab(Model.of("Repository Authorizations"), TeamDepotListPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, TeamDepotListPage.class,- TeamDepotListPage.paramsOf(teamModel.getObject()));- }-- };- }-- });-- add(new Tabbable("teamTabs", tabs).setVisible(SecurityUtils.canManage(getAccount())));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }-- @Override- protected void onDetach() {- teamModel.detach();- super.onDetach();- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(TeamListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.javaindex 920d4f8c30..f885c898d3 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java@@ -11,8 +11,10 @@ import org.apache.wicket.markup.html.basic.Label;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.admin.account.NewUserPage;-import com.gitplex.server.web.page.admin.account.UserListPage;+import com.gitplex.server.web.page.admin.group.NewGroupPage;+import com.gitplex.server.web.page.admin.group.GroupListPage;+import com.gitplex.server.web.page.admin.user.NewUserPage;+import com.gitplex.server.web.page.admin.user.UserListPage;import com.gitplex.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")@@ -20,7 +22,7 @@ public abstract class AdministrationPage extends LayoutPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManageSystem();+ return SecurityUtils.isAdministrator();}@Override@@ -33,6 +35,7 @@ public abstract class AdministrationPage extends LayoutPage {tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));tabs.add(new AdministrationTab("User Management", "fa fa-fw fa-user", UserListPage.class, NewUserPage.class));+ tabs.add(new AdministrationTab("Group Management", "fa fa-fw fa-group", GroupListPage.class, NewGroupPage.class));tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));diff --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 e315898d30..ca512c0510 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.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.util.ExceptionUtils;import com.gitplex.server.web.behavior.testform.TestFormBehavior;import com.gitplex.server.web.behavior.testform.TestResult;@@ -62,7 +62,7 @@ public class MailSettingPage extends AdministrationPage {@Overrideprotected TestResult test() {- Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();+ User currentUser = GitPlex.getInstance(UserManager.class).getCurrent();try {GitPlex.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(),Sets.newHashSet(currentUser.getEmail()),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.javadeleted file mode 100644index 68c23723bb..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java+++ /dev/null@@ -1,57 +0,0 @@-package com.gitplex.server.web.page.admin.account;--import org.apache.shiro.authc.credential.PasswordService;-import org.apache.wicket.Session;-import org.apache.wicket.markup.html.form.Form;--import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.page.admin.AdministrationPage;--@SuppressWarnings("serial")-public class NewUserPage extends AdministrationPage {-- @Override- protected void onInitialize() {- super.onInitialize();-- Account user = new Account();-- BeanEditor<?> editor = BeanContext.editBean("editor", user, Account.getUserExcludeProperties());-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account accountWithSameName = accountManager.findByName(user.getName());- if (accountWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another account.");- }- Account accountWithSameEmail = accountManager.findByEmail(user.getEmail());- if (accountWithSameEmail != null) {- editor.getErrorContext(new PathSegment.Property("email"))- .addError("This email has already been used by another account.");- }- if (!editor.hasErrors(true)){- user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));- accountManager.save(user, null);- Session.get().success("New user account created");- setResponsePage(UserListPage.class);- }- }-- };- form.add(editor);- add(form);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.html b/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.htmldeleted file mode 100644index 9c2227f62a..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:panel>- <div class="account type selection">- <a wicket:id="user">User</a>- <a wicket:id="organization">Organization</a>- </div>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.javadeleted file mode 100644index 01363a7f57..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.java+++ /dev/null@@ -1,63 +0,0 @@-package com.gitplex.server.web.page.admin.account;--import javax.annotation.Nullable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.panel.Panel;--@SuppressWarnings("serial")-abstract class TypeSelectionPanel extends Panel {-- public static final String TYPE_USER = "User";-- public static final String TYPE_ORGANIZATIOIN = "Organization";-- private final String currentType;-- public TypeSelectionPanel(String id, @Nullable String currentType) {- super(id);-- this.currentType = currentType;- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new AjaxLink<Void>("user") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (TYPE_USER.equals(currentType))- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelectUser(target);- }-- });- add(new AjaxLink<Void>("organization") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (TYPE_ORGANIZATIOIN.equals(currentType))- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelectOrganization(target);- }-- });- }-- protected abstract void onSelectUser(AjaxRequestTarget target);-- protected abstract void onSelectOrganization(AjaxRequestTarget target);-}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.htmldeleted file mode 100644index c4d6367535..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html+++ /dev/null@@ -1,27 +0,0 @@-<wicket:extend>- <section class="account list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchAccounts" class="form-control search" placeholder="Search..."></input>- </div>- <div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New User</a>- </div>- </div>- <div class="body">- <table wicket:id="accounts" class="accounts table table-hover"></table>- <div class="center"><ul wicket:id="accountsPageNav"></ul></div>- <div wicket:id="noAccounts" class="alert alert-warning">No users found</div>- </div>- </section>- <wicket:fragment wicket:id="nameFrag">- <a wicket:id="avatarLink"></a>- <a wicket:id="nameLink"></a>- </wicket:fragment>- <wicket:fragment wicket:id="actionFrag">- <div class="btn-group">- <a wicket:id="setting" class="btn btn-default"><i class="fa fa-cog"></i> Profile</a>- <a wicket:id="delete" class="btn btn-default"><i class="fa fa-trash"></i> Delete</a>- </div>- </wicket:fragment>-</wicket:extend>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.javadeleted file mode 100644index 950bfcb7c7..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java+++ /dev/null@@ -1,234 +0,0 @@-package com.gitplex.server.web.page.admin.account;--import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;-import com.gitplex.server.web.component.link.AccountLink;-import com.gitplex.server.web.page.account.AccountPage;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;-import com.gitplex.server.web.page.admin.AdministrationPage;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class UserListPage extends AdministrationPage {-- private DataTable<Account, Void> accountsTable;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer noAccountsContainer;-- private String searchInput;-- private EntityCriteria<Account> getCriteria() {- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);- if (searchInput != null) {- criteria.add(Restrictions.or(- Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE),- Restrictions.ilike("fullName", searchInput, MatchMode.ANYWHERE)));- }- return criteria;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("searchAccounts", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(accountsTable);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManageSystem());- }-- @Override- public void onClick() {- setResponsePage(NewUserPage.class);- }-- });-- List<IColumn<Account, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<Account, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,- IModel<Account> rowModel) {- Account account = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);- fragment.add(new AvatarLink("avatarLink", account));- fragment.add(new AccountLink("nameLink", account));- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Account, Void>(Model.of("Email")) {-- @Override- public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,- IModel<Account> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getEmail()));- }- });-- columns.add(new AbstractColumn<Account, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,- IModel<Account> rowModel) {- Account account = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);- fragment.add(new Link<Void>("setting") {-- @Override- public void onClick() {- PageParameters params = AccountPage.paramsOf(rowModel.getObject());- setResponsePage(ProfileEditPage.class, params);- }-- });-- Long accountId = account.getId();- fragment.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- Account account = GitPlex.getInstance(AccountManager.class).load(accountId);- if (!account.getDepots().isEmpty()) {- target.appendJavaScript("alert('Please delete or transfer repositories under this account first');");- } else {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- target.add(accountsTable);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- @Override- protected Account getAccount() {- return GitPlex.getInstance(AccountManager.class).load(accountId);- }- };- }- }-- });- cellItem.add(fragment);- }- });-- SortableDataProvider<Account, Void> dataProvider = new SortableDataProvider<Account, Void>() {-- @Override- public Iterator<? extends Account> iterator(long first, long count) {- EntityCriteria<Account> criteria = getCriteria();- criteria.addOrder(Order.asc("name"));- return GitPlex.getInstance(AccountManager.class).findRange(criteria, (int)first, (int)count).iterator();- }-- @Override- public long size() {- return GitPlex.getInstance(AccountManager.class).count(getCriteria());- }-- @Override- public IModel<Account> model(Account object) {- Long id = object.getId();- return new LoadableDetachableModel<Account>() {-- @Override- protected Account load() {- return GitPlex.getInstance(AccountManager.class).load(id);- }-- };- }- };-- add(accountsTable = new DataTable<Account, Void>("accounts", columns, dataProvider,- WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getItemCount() != 0);- }-- });- accountsTable.setOutputMarkupPlaceholderTag(true);-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsTable) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsTable.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- add(noAccountsContainer = new WebMarkupContainer("noAccounts") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsTable.getItemCount() == 0);- }-- });- noAccountsContainer.setOutputMarkupPlaceholderTag(true);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css b/web/src/main/java/com/gitplex/server/web/page/admin/administration.cssindex 2c426ecee3..8d1475bf2b 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css+++ b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css@@ -25,4 +25,12 @@background: black;border: 1px solid black;color: white;+}++#user-add .actions .btn {+ margin-right: 20px;+}++.group.list .actions a, .user.list .actions a {+ color: #666;}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.htmlnew file mode 100644index 0000000000..fa04965be8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.html@@ -0,0 +1,22 @@+<wicket:extend>+ <section class="group list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Group</a>+ </div>+ </div>+ <div class="body">+ <table wicket:id="groups" class="groups table table-hover"></table>+ </div>+ </section>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="name"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="setting" title="Setting of this group"><i class="fa fa-cog"></i></a>+ <a wicket:id="delete" title="Delete this group"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.javanew file mode 100644index 0000000000..41d543512f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.java@@ -0,0 +1,181 @@+package com.gitplex.server.web.page.admin.group;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.link.LabelLink;+import com.gitplex.server.web.page.admin.AdministrationPage;+import com.gitplex.server.web.page.group.GroupProfilePage;+import com.gitplex.server.web.util.ConfirmOnClick;++@SuppressWarnings("serial")+public class GroupListPage extends AdministrationPage {++ private DataTable<Group, Void> groupsTable;++ private String searchInput;++ private EntityCriteria<Group> getCriteria() {+ EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);+ if (searchInput != null)+ criteria.add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("filterGroups", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(groupsTable);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ public void onClick() {+ setResponsePage(NewGroupPage.class);+ }++ });++ List<IColumn<Group, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Group, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId, IModel<Group> rowModel) {+ Fragment fragment = new Fragment(componentId, "nameFrag", GroupListPage.this);+ fragment.add(new LabelLink<Void>("name", Model.of(rowModel.getObject().getName())) {++ @Override+ public void onClick() {+ setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(rowModel.getObject()));+ }++ });+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Group, Void>(Model.of("Is Administrator")) {++ @Override+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,+ IModel<Group> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().isAdministrator()));+ }++ });++ columns.add(new AbstractColumn<Group, Void>(Model.of("Can Create Projects")) {++ @Override+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,+ IModel<Group> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().isCanCreateProjects()));+ }++ });++ columns.add(new AbstractColumn<Group, Void>(Model.of("Actions")) {++ @Override+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,+ IModel<Group> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", GroupListPage.this);+ fragment.add(AttributeAppender.append("class", "actions"));++ Group group = rowModel.getObject();++ fragment.add(new Link<Void>("setting") {++ @Override+ public void onClick() {+ setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(rowModel.getObject()));+ }++ });+ fragment.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ GitPlex.getInstance(GroupManager.class).delete(rowModel.getObject());+ setResponsePage(GroupListPage.class);+ }++ }.add(new ConfirmOnClick("Do you really want to delete group '" + group.getName() + "'?")));++ cellItem.add(fragment);+ }++ });++ SortableDataProvider<Group, Void> dataProvider = new SortableDataProvider<Group, Void>() {++ @Override+ public Iterator<? extends Group> iterator(long first, long count) {+ EntityCriteria<Group> criteria = getCriteria();+ criteria.addOrder(Order.asc("name"));+ return GitPlex.getInstance(GroupManager.class).findRange(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return GitPlex.getInstance(GroupManager.class).count(getCriteria());+ }++ @Override+ public IModel<Group> model(Group object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Group>() {++ @Override+ protected Group load() {+ return GitPlex.getInstance(GroupManager.class).load(id);+ }++ };+ }+ };++ add(groupsTable = new DefaultDataTable<Group, Void>("groups", columns, dataProvider,+ WebConstants.PAGE_SIZE));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.htmlnew file mode 100644index 0000000000..e1a19af7ca--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.html@@ -0,0 +1,25 @@+<wicket:extend>+ <section id="group-add">+ <div class="head">Add New Group</div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="checkbox">+ <label>+ <input wicket:id="administrator" type="checkbox"/> Is Administrator+ <div class="help-block">Members of administrator group have administrative rights over the whole system</div>+ </label>+ </div>+ <div class="checkbox">+ <label>+ <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects+ <div class="help-block">Check this to make members of this group able to fork/create projects</div>+ </label>+ </div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>+ </div>+ </form>+ </div>+ </section>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.javanew file mode 100644index 0000000000..8c1af6cc80--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.java@@ -0,0 +1,86 @@+package com.gitplex.server.web.page.admin.group;++import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.Model;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.admin.AdministrationPage;+import com.gitplex.server.web.page.group.GroupMembershipsPage;+import com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class NewGroupPage extends AdministrationPage {++ private Group group = new Group();++ private CheckBox administratorInput;++ private CheckBox canCreateProjectsInput;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BeanEditor<?> editor = BeanContext.editBean("editor", group,+ Sets.newHashSet("administrator", "canCreateProjects"));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ Group groupWithSameName = groupManager.find(group.getName());+ if (groupWithSameName != null) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another group");+ }+ if (!editor.hasErrors(true)) {+ group.setAdministrator(administratorInput.getModelObject());+ group.setCanCreateProjects(canCreateProjectsInput.getModelObject());+ groupManager.save(group, null);+ Session.get().success("Group created");+ setResponsePage(GroupMembershipsPage.class, GroupMembershipsPage.paramsOf(group));+ }+ }++ };+ form.add(editor);+ administratorInput = new CheckBox("administrator", Model.of(group.isAdministrator()));+ administratorInput.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ if (administratorInput.getModelObject())+ canCreateProjectsInput.setModelObject(true);+ target.add(canCreateProjectsInput);+ }++ });+ form.add(administratorInput);++ canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(group.isCanCreateProjects())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!administratorInput.getModelObject());+ }++ };+ canCreateProjectsInput.setOutputMarkupId(true);+ form.add(canCreateProjectsInput);+ add(form);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.htmlnew file mode 100644index 0000000000..f894bd1f21--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.html@@ -0,0 +1,16 @@+<wicket:extend>+ <section id="user-add">+ <div class="head">Add New User</div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Create" type="submit"></input>+ <div class="checkbox pull-left">+ <label> <input wicket:id="continueToAdd" type="checkbox"> Continue to add other user after create</label>+ </div>+ </div>+ </form>+ </div>+ </section>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.javanew file mode 100644index 0000000000..9fb13cfc06--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.java@@ -0,0 +1,84 @@+package com.gitplex.server.web.page.admin.user;++import org.apache.shiro.authc.credential.PasswordService;+import org.apache.wicket.Session;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.IModel;++import com.gitplex.launcher.loader.AppLoader;+import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.admin.AdministrationPage;+import com.gitplex.server.web.page.user.UserMembershipsPage;++@SuppressWarnings("serial")+public class NewUserPage extends AdministrationPage {++ private User user = new User();++ private boolean continueToAdd;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BeanEditor<?> editor = BeanContext.editBean("editor", user);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ UserManager userManager = GitPlex.getInstance(UserManager.class);+ User userWithSameName = userManager.findByName(user.getName());+ if (userWithSameName != null) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another user.");+ }+ User userWithSameEmail = userManager.findByEmail(user.getEmail());+ if (userWithSameEmail != null) {+ editor.getErrorContext(new PathSegment.Property("email"))+ .addError("This email has already been used by another user.");+ }+ if (!editor.hasErrors(true)){+ user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));+ userManager.save(user, null);+ Session.get().success("New user created");+ if (continueToAdd) {+ user = new User();+ replace(BeanContext.editBean("editor", user));+ } else {+ setResponsePage(UserMembershipsPage.class, UserMembershipsPage.paramsOf(user));+ }+ }+ }++ };+ form.add(editor);+ form.add(new CheckBox("continueToAdd", new IModel<Boolean>() {++ @Override+ public void detach() {+ }++ @Override+ public Boolean getObject() {+ return continueToAdd;+ }++ @Override+ public void setObject(Boolean object) {+ continueToAdd = object;+ }++ }));+ add(form);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.htmlnew file mode 100644index 0000000000..bc4e100ebc--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.html@@ -0,0 +1,23 @@+<wicket:extend>+ <section class="user list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New User</a>+ </div>+ </div>+ <div class="body">+ <table wicket:id="users" class="users table table-hover"></table>+ </div>+ </section>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="avatarLink"></a>+ <a wicket:id="nameLink"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="setting" title="Setting of this user"><i class="fa fa-cog"></i></a>+ <a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.javanew file mode 100644index 0000000000..301021c9eb--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.java@@ -0,0 +1,171 @@+package com.gitplex.server.web.page.admin.user;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.link.UserLink;+import com.gitplex.server.web.page.admin.AdministrationPage;+import com.gitplex.server.web.page.user.UserPage;+import com.gitplex.server.web.page.user.UserProfilePage;+import com.gitplex.server.web.util.ConfirmOnClick;++@SuppressWarnings("serial")+public class UserListPage extends AdministrationPage {++ private DataTable<User, Void> usersTable;++ private String searchInput;++ private EntityCriteria<User> getCriteria() {+ EntityCriteria<User> criteria = EntityCriteria.of(User.class);+ if (searchInput != null) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE),+ Restrictions.ilike("fullName", searchInput, MatchMode.ANYWHERE)));+ }+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("filterUsers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(usersTable);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ public void onClick() {+ setResponsePage(NewUserPage.class);+ }++ });++ List<IColumn<User, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<User, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ User user = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);+ fragment.add(new AvatarLink("avatarLink", user));+ fragment.add(new UserLink("nameLink", user));+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<User, Void>(Model.of("Email")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getEmail()));+ }+ });++ columns.add(new AbstractColumn<User, Void>(Model.of("Actions")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);+ fragment.add(AttributeAppender.append("class", "actions"));++ fragment.add(new Link<Void>("setting") {++ @Override+ public void onClick() {+ PageParameters params = UserPage.paramsOf(rowModel.getObject());+ setResponsePage(UserProfilePage.class, params);+ }++ });++ User user = rowModel.getObject();++ fragment.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ GitPlex.getInstance(UserManager.class).delete(rowModel.getObject());+ }++ }.add(new ConfirmOnClick("Do you really want to delete user '" + user.getDisplayName() + "'?")));++ cellItem.add(fragment);+ }+ });++ SortableDataProvider<User, Void> dataProvider = new SortableDataProvider<User, Void>() {++ @Override+ public Iterator<? extends User> iterator(long first, long count) {+ EntityCriteria<User> criteria = getCriteria();+ criteria.addOrder(Order.asc("name"));+ return GitPlex.getInstance(UserManager.class).findRange(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return GitPlex.getInstance(UserManager.class).count(getCriteria());+ }++ @Override+ public IModel<User> model(User object) {+ Long id = object.getId();+ return new LoadableDetachableModel<User>() {++ @Override+ protected User load() {+ return GitPlex.getInstance(UserManager.class).load(id);+ }++ };+ }+ };++ add(usersTable = new DefaultDataTable<User, Void>("users", columns, dataProvider,+ WebConstants.PAGE_SIZE));+ }++}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 32066e5f88..34e5e22536 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@@ -42,8 +42,8 @@ import org.unbescape.javascript.JavaScriptEscape;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.web.assets.Assets;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.page.init.ServerInitPage;@@ -267,8 +267,8 @@ public abstract class BasePage extends WebPage {}@Nullable- protected final Account getLoginUser() {- return GitPlex.getInstance(AccountManager.class).getCurrent();+ protected final User getLoginUser() {+ return GitPlex.getInstance(UserManager.class).getCurrent();}public void unauthorized() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.htmldeleted file mode 100644index ddc44896e9..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.html+++ /dev/null@@ -1,25 +0,0 @@-<wicket:extend>- <div id="depot">- <div class="sidebar">- <table>- <tr>- <td wicket:id="sidebar" class="nav">- <a class="mini-toggle"><span></span></a>- <ul wicket:id="depotTabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>- </div>- </div>- <wicket:fragment wicket:id="contextHeadFrag">- <div id="depot-head" class="clearfix">- <a wicket:id="accountLink" class="pull-left"><span wicket:id="accountName"></span></a>- <span class="separator pull-left">/</span>- <a wicket:id="depotLink" class="pull-left"><span wicket:id="depotName"></span></a>- <a wicket:id="depotMoreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a>- </div>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index c9d152998d..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java+++ /dev/null@@ -1,220 +0,0 @@-package com.gitplex.server.web.page.depot;--import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import javax.persistence.EntityNotFoundException;-import javax.servlet.http.Cookie;--import org.apache.wicket.Component;-import org.apache.wicket.RestartResponseException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;--import com.gitplex.server.GitPlex;-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.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.account.AccountPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.moreinfo.MoreInfoPanel;-import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.server.web.page.depot.setting.DepotSettingPage;-import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.server.web.page.depot.tags.DepotTagsPage;-import com.google.common.base.Preconditions;--@SuppressWarnings("serial")-public abstract class DepotPage extends AccountPage {-- private static final String PARAM_DEPOT = "depot";-- protected final IModel<Depot> depotModel;-- public static PageParameters paramsOf(Depot depot) {- return paramsOf(depot.getAccount(), depot.getName());- }-- public static PageParameters paramsOf(Account account, String depotName) {- PageParameters params = paramsOf(account);- params.set(PARAM_DEPOT, depotName);- return params;- }-- public DepotPage(PageParameters params) {- super(params);-- String depotName = params.get(PARAM_DEPOT).toString();- Preconditions.checkNotNull(depotName);-- if (depotName.endsWith(Constants.DOT_GIT_EXT))- depotName = depotName.substring(0, depotName.length() - Constants.DOT_GIT_EXT.length());-- Depot depot = GitPlex.getInstance(DepotManager.class).find(getAccount(), depotName);-- if (depot == null)- throw new EntityNotFoundException("Unable to find repository " + getAccount().getName() + "/" + depotName);-- Long depotId = depot.getId();-- depotModel = new LoadableDetachableModel<Depot>() {-- @Override- protected Depot load() {- Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);-- /*- * Give child page a chance to cache object id of known revisions upon- * loading the depot object- */- for (Map.Entry<String, ObjectId> entry: getObjectIdCache().entrySet()) {- depot.cacheObjectId(entry.getKey(), entry.getValue());- }- return depot;- }-- };-- // we do not need to reload the depot this time as we already have that object on hand- depotModel.setObject(depot);-- if (!(this instanceof NoBranchesPage)- && !(this instanceof DepotSettingPage)- && getDepot().getDefaultBranch() == null) {- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));- }- }-- protected Map<String, ObjectId> getObjectIdCache() {- return new HashMap<>();- }-- @Override- protected void onAfterRender() {- super.onAfterRender();- if (getLoginUser() != null)- GitPlex.getInstance(VisitInfoManager.class).visit(getLoginUser(), getDepot());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new DepotTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, DepotBlobPage.class));- tabs.add(new DepotTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,- DepotCommitsPage.class, CommitDetailPage.class));- tabs.add(new DepotTab(Model.of("Branches"), "fa fa-fw fa-code-fork",- 0, DepotBranchesPage.class));- tabs.add(new DepotTab(Model.of("Tags"), "fa fa-fw fa-tag",- 0, DepotTagsPage.class));-- tabs.add(new DepotTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class));-- tabs.add(new DepotTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));-- if (SecurityUtils.canManage(getDepot()))- tabs.add(new DepotTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, DepotSettingPage.class));-- WebMarkupContainer sidebar = new WebMarkupContainer("sidebar");- add(sidebar);-- /*- * Add mini class here instead of repository.js as we want the sidebar to- * be minimized initially even if the page takes some time to load- */- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie("repository.miniSidebar");- if (cookie != null && "yes".equals(cookie.getValue()))- sidebar.add(AttributeAppender.append("class", " mini"));-- sidebar.add(new Tabbable("depotTabs", tabs));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.depot();"));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canRead(getDepot());- }-- @Override- public Depot getDepot() {- return depotModel.getObject();- }-- @Override- protected void onDetach() {- depotModel.detach();- super.onDetach();- }-- @Override- protected Component newContextHead(String componentId) {- Fragment fragment = new Fragment(componentId, "contextHeadFrag", this);- Link<Void> accountLink = new ViewStateAwarePageLink<>("accountLink",- AccountOverviewPage.class, AccountOverviewPage.paramsOf(getAccount()));- accountLink.add(new Label("accountName", getAccount().getName()));- fragment.add(accountLink);-- Link<Void> depotLink = new ViewStateAwarePageLink<>("depotLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot()));- depotLink.add(new Label("depotName", getDepot().getName()));- fragment.add(depotLink);- fragment.add(new DropdownLink("depotMoreInfo") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new MoreInfoPanel(id, depotModel) {-- @Override- protected void onPromptForkOption(AjaxRequestTarget target) {- dropdown.close();- }-- };- }-- });- return fragment;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.javadeleted file mode 100644index cad99aa93f..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java+++ /dev/null@@ -1,91 +0,0 @@-package com.gitplex.server.web.page.depot;--import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;--import com.gitplex.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class DepotTab extends PageTab {-- private final String iconClass;-- private final int count;-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass) {- super(titleModel, mainPageClass);- this.iconClass = iconClass;- this.count = count;- }-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass,- Class<? extends DepotPage> additionalPageClass1) {- super(titleModel, mainPageClass, additionalPageClass1);- this.iconClass = iconClass;- this.count = count;- }-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass,- Class<? extends DepotPage> additionalPageClass1,- Class<? extends DepotPage> additionalPageClass2) {- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2);- this.iconClass = iconClass;- this.count = count;- }-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass,- Class<? extends DepotPage> additionalPageClass1,- Class<? extends DepotPage> additionalPageClass2,- Class<? extends DepotPage> additionalPageClass3) {- super(titleModel, mainPageClass, additionalPageClass1,- additionalPageClass2, additionalPageClass3);- this.iconClass = iconClass;- this.count = count;- }-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass,- Class<? extends DepotPage> additionalPageClass1,- Class<? extends DepotPage> additionalPageClass2,- Class<? extends DepotPage> additionalPageClass3,- Class<? extends DepotPage> additionalPageClass4) {- super(titleModel, mainPageClass, additionalPageClass1,- additionalPageClass2, additionalPageClass3, additionalPageClass4);- this.iconClass = iconClass;- this.count = count;- }-- public DepotTab(IModel<String> titleModel, String iconClass, int count,- Class<? extends DepotPage> mainPageClass,- Class<? extends DepotPage> additionalPageClass1,- Class<? extends DepotPage> additionalPageClass2,- Class<? extends DepotPage> additionalPageClass3,- Class<? extends DepotPage> additionalPageClass4,- Class<? extends DepotPage> additionalPageClass5) {- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2,- additionalPageClass3, additionalPageClass4, additionalPageClass5);- this.iconClass = iconClass;- this.count = count;- }-- public String getIconClass() {- return iconClass;- }-- /**- * @return the count- */- public int getCount() {- return count;- }-- @Override- public Component render(String componentId) {- return new DepotTabLink(componentId, this);- }--}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.javadeleted file mode 100644index 0464942da6..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java+++ /dev/null@@ -1,43 +0,0 @@-package com.gitplex.server.web.page.depot;--import org.apache.wicket.RestartResponseException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.CssHeaderItem;-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.model.Depot;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;--@SuppressWarnings("serial")-public class NoBranchesPage extends DepotPage {-- public NoBranchesPage(PageParameters params) {- super(params);-- if (getDepot().getDefaultBranch() != null)- throw new RestartResponseException(DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot()));- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("url1", getDepot().getUrl()));- add(new Label("url2", getDepot().getUrl()));- add(new Label("url3", getDepot().getUrl()));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new NoBranchesResourceReference()));- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.javadeleted file mode 100644index bd7b819d7f..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.depot.branches;--import org.apache.wicket.request.resource.CssResourceReference;--public class DepotBranchesResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public DepotBranchesResourceReference() {- super(DepotBranchesResourceReference.class, "depot-branches.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.javadeleted file mode 100644index e6bcd21b91..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.depot.commit;--import org.apache.wicket.request.resource.CssResourceReference;--public class DepotCommitsResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public DepotCommitsResourceReference() {- super(DepotCommitsResourceReference.class, "depot-commits.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/depot.css b/web/src/main/java/com/gitplex/server/web/page/depot/depot.cssdeleted file mode 100644index 5c6abec764..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/depot.css+++ /dev/null@@ -1,52 +0,0 @@-#depot-head .separator {- margin: 0 8px;-}-#depot-head .more-info {- background: #444;- padding: 0 8px;- border-radius: 4px;- font-size: 14px;- margin-top: 6px;- margin-left: 8px;-}-#depot-head .more-info:hover, #depot-head .more-info.dropdown-open {- background: #777;-}--#depot>.sidebar>table>tbody>tr>td.nav>.mini-toggle {- display: block;- margin-top: -20px;- text-align: right;- font-size: 20px;- padding-right: 20px;- border-bottom: 1px solid #BBB;- text-decoration: none;- color: #666;- height: 31px;-}-#depot>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {- color: #333;-}-#depot>.sidebar>table>tbody>tr>td.nav>.mini-toggle>span:before {- font-family: "FontAwesome";- content: "\f100";-}-#depot>.sidebar>table>tbody>tr>td.mini.nav>.mini-toggle>span:before {- content: "\f101";-}-#depot>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {- background: #EEE;-}-#depot>.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- width: 220px;-}-#depot>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a {- width: auto;-}-#depot>.sidebar>table>tbody>tr>td.mini.nav {- width: 40px;-}-#depot>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.text,-#depot>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.badge {- display: none;-}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.javadeleted file mode 100644index 59c93bbc38..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java+++ /dev/null@@ -1,126 +0,0 @@-package com.gitplex.server.web.page.depot.moreinfo;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-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 org.apache.wicket.model.IModel;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.editable.BeanEditor;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;--@SuppressWarnings("serial")-abstract class ForkOptionPanel extends Panel {-- private final IModel<Depot> depotModel;-- private Long ownerId;-- public ForkOptionPanel(String id, IModel<Depot> depotModel) {- super(id);- this.depotModel = depotModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Depot depot = new Depot();- depot.setForkedFrom(getDepot());- depot.setName(getDepot().getName());-- BeanEditor<?> editor = BeanContext.editBean("editor", depot);-- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);- form.add(editor);-- IModel<Account> choiceModel = new IModel<Account>() {-- @Override- public void detach() {- }-- @Override- public Account getObject() {- return getOwner();- }-- @Override- public void setObject(Account object) {- ownerId = object.getId();- }-- };- form.add(new AccountSingleChoice("owner", choiceModel, new AdministrativeAccountChoiceProvider()).setRequired(true));-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- Account owner = getOwner();- depot.setAccount(owner);- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- Depot depotWithSameName = depotManager.find(owner, depot.getName());- if (depotWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another repository in account '" + owner.getDisplayName() + "'");- target.add(form);- } else {- depotManager.fork(getDepot(), depot);- Session.get().success("Repository forked");- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- }- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- onClose(target);- }-- });- add(form);- }-- private Account getOwner() {- if (ownerId == null)- return SecurityUtils.getAccount();- else- return GitPlex.getInstance(AccountManager.class).load(ownerId);- }-- private Depot getDepot() {- return depotModel.getObject();- }-- @Override- protected void onDetach() {- depotModel.detach();- super.onDetach();- }-- protected abstract void onClose(AjaxRequestTarget target);--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.javadeleted file mode 100644index 9b3fe46d88..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java+++ /dev/null@@ -1,74 +0,0 @@-package com.gitplex.server.web.page.depot.setting;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.tabbable.PageTab;-import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamAuthorizationPage;-import com.gitplex.server.web.page.depot.setting.branchprotection.BranchProtectionPage;-import com.gitplex.server.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;-import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.server.web.page.depot.setting.tagprotection.TagProtectionPage;--@SuppressWarnings("serial")-public abstract class DepotSettingPage extends DepotPage {-- public DepotSettingPage(PageParameters params) {- super(params);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getDepot());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new DepotSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));- if (getAccount().isOrganization()) {- tabs.add(new DepotSettingTab("Team Authorizations", "fa fa-fw fa-group", DepotTeamAuthorizationPage.class));- tabs.add(new DepotSettingTab("Collaborators", "fa fa-fw fa-user", DepotCollaboratorListPage.class));- tabs.add(new DepotSettingTab("Effective Privileges", "fa fa-fw fa-key", DepotEffectivePrivilegePage.class));- } else {- /*- * Team list page is not applicable for user accounts, and effective privilege- * page does not make sense for user accounts, as permissions assigned in- * collaborator list page is actually effective as:- * 1. site administrator and depot owner is not allowed to be added as collaborator- * 2. no other source can access user's depot as user account does not have- * concept of organization member- */- tabs.add(new DepotSettingTab("Collaborators", "fa fa-fw fa-user", DepotCollaboratorListPage.class));- }- tabs.add(new DepotSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));- tabs.add(new DepotSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));- tabs.add(new DepotSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));-- add(new Tabbable("depotSettingTabs", tabs));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new DepotSettingResourceReference()));- String script = String.format(""- + "var $depotSetting = $('#depot-setting');"- + "$depotSetting.find('>table').height($depotSetting.parent().outerHeight());");- response.render(OnDomReadyHeaderItem.forScript(script));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.javadeleted file mode 100644index 7c7ec4a201..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.depot.setting;--import org.apache.wicket.request.resource.CssResourceReference;--public class DepotSettingResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public DepotSettingResourceReference() {- super(DepotSettingResourceReference.class, "depot-setting.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.javadeleted file mode 100644index 2e6624ffcc..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java+++ /dev/null@@ -1,75 +0,0 @@-package com.gitplex.server.web.page.depot.setting;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import com.gitplex.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class DepotSettingTab extends PageTab {-- private final String iconClass;-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass) {- super(Model.of(title), mainPageClass);- this.iconClass = iconClass;- }-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass,- Class<? extends DepotSettingPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);- this.iconClass = iconClass;- }-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass,- Class<? extends DepotSettingPage> additionalPageClass1,- Class<? extends DepotSettingPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);- this.iconClass = iconClass;- }-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass,- Class<? extends DepotSettingPage> additionalPageClass1,- Class<? extends DepotSettingPage> additionalPageClass2,- Class<? extends DepotSettingPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);- this.iconClass = iconClass;- }-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass,- Class<? extends DepotSettingPage> additionalPageClass1,- Class<? extends DepotSettingPage> additionalPageClass2,- Class<? extends DepotSettingPage> additionalPageClass3,- Class<? extends DepotSettingPage> additionalPageClass4) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,- additionalPageClass3, additionalPageClass4);- this.iconClass = iconClass;- }-- public DepotSettingTab(String title, String iconClass,- Class<? extends DepotSettingPage> mainPageClass,- Class<? extends DepotSettingPage> additionalPageClass1,- Class<? extends DepotSettingPage> additionalPageClass2,- Class<? extends DepotSettingPage> additionalPageClass3,- Class<? extends DepotSettingPage> additionalPageClass4,- Class<? extends DepotSettingPage> additionalPageClass5) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,- additionalPageClass3, additionalPageClass4, additionalPageClass5);- this.iconClass = iconClass;- }-- @Override- public Component render(String componentId) {- return new DepotSettingTabLink(componentId, this);- }-- public String getIconClass() {- return iconClass;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.htmldeleted file mode 100644index 7b70635940..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.html+++ /dev/null@@ -1,45 +0,0 @@-<wicket:extend>- <div class="collaborator list">- <div class="head clearfix">- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="collaborators" class="collabrators table table-hover table-condensed">- <thead>- <tr>- <th class="name">User Name</th>- <th class="privilege">Privilege</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="collaborators">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><img wicket:id="name"></img></a>- <div wicket:id="greaterPrivileges" class="note">- This user has greater privileges from <a wicket:id="detail">other sources</a>.- </div>- </td>- <td class="privilege">- <a wicket:id="privilege" class="btn btn-default btn-xs"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove authorization"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div wicket:id="noCollaborators" class="alert alert-warning">No collaborators found</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 6be6686627..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java+++ /dev/null@@ -1,375 +0,0 @@-package com.gitplex.server.web.page.depot.setting.authorization;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;-import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.server.web.page.depot.setting.DepotSettingPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--@SuppressWarnings("serial")-public class DepotCollaboratorListPage extends DepotSettingPage {-- private ListView<UserAuthorization> collaboratorsView;-- private WebMarkupContainer collaboratorsContainer;-- private WebMarkupContainer noCollaboratorsContainer;-- private DepotPrivilege filterPrivilege;-- private Set<Long> pendingRemovals = new HashSet<>();-- public DepotCollaboratorListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(collaboratorsContainer);- target.add(noCollaboratorsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(collaboratorsContainer);- target.add(noCollaboratorsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- add(new SelectToAddChoice<Account>("addNew", new AbstractAccountChoiceProvider() {-- @Override- public void query(String term, int page, Response<Account> response) {- List<Account> collaborators = new ArrayList<>();- term = term.toLowerCase();- for (Account user: GitPlex.getInstance(AccountManager.class).findAllUsers()) {- if (user.matches(term) && !user.equals(getAccount()) && !user.isAdministrator()) {- boolean authorized = false;- for (UserAuthorization authorization: depotModel.getObject().getAuthorizedUsers()) {- if (authorization.getUser().equals(user)) {- authorized = true;- break;- }- }- if (!authorized)- collaborators.add(user);- }- }-- Collections.sort(collaborators);-- new ResponseFiller<Account>(response).fill(collaborators, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add collaborator...");- getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(selection);- authorization.setDepot(depotModel.getObject());- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(collaboratorsContainer);- target.add(noCollaboratorsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizations = new HashSet<>();- UserAuthorizationManager authorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(collaboratorsContainer);- target.add(noCollaboratorsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- collaboratorsContainer = new WebMarkupContainer("collaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!collaboratorsView.getModelObject().isEmpty());- }-- };- collaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(collaboratorsContainer);-- collaboratorsContainer.add(collaboratorsView = new ListView<UserAuthorization>("collaborators",- new LoadableDetachableModel<List<UserAuthorization>>() {-- @Override- protected List<UserAuthorization> load() {- List<UserAuthorization> authorizations = new ArrayList<>();-- for (UserAuthorization authorization: depotModel.getObject().getAuthorizedUsers()) {- if ((filterPrivilege == null || filterPrivilege == authorization.getPrivilege())- && !authorization.getUser().isAdministrator()- && !authorization.getUser().equals(getAccount())) {- authorizations.add(authorization);- }- }-- authorizations.sort((authorization1, authorization2)- -> authorization1.getUser().getDisplayName().compareTo(authorization2.getUser().getDisplayName()));- return authorizations;- }-- }) {-- @Override- protected void populateItem(ListItem<UserAuthorization> item) {- UserAuthorization authorization = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink", CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));- link.add(new Avatar("avatar", authorization.getUser()));- item.add(link);-- link = new ViewStateAwarePageLink<Void>("nameLink", CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));- link.add(new Label("name", authorization.getUser().getDisplayName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- UserAuthorization authorization = item.getModelObject();- DepotAccess depotAccess = new DepotAccess(authorization.getUser(), depotModel.getObject());- setVisible(SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege()));- }-- };-- greaterPrivileges.add(new ViewStateAwarePageLink<Void>("detail",- CollaboratorPrivilegeSourcePage.class,- CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));-- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- UserAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(collaboratorsContainer);- target.add(noCollaboratorsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- noCollaboratorsContainer = new WebMarkupContainer("noCollaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(collaboratorsView.getModelObject().isEmpty());- }-- };- noCollaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(noCollaboratorsContainer);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotCollaboratorListPage.class, DepotCollaboratorListPage.paramsOf(depot));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.htmldeleted file mode 100644index 3968ceb67d..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html+++ /dev/null@@ -1,36 +0,0 @@-<wicket:extend>- <div class="effective permission list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="searchUsers" class="form-control search" placeholder="Search users"></input>- </div>- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- </div>- <table wicket:id="users" class="users table table-hover table-condensed">- <thead>- <tr>- <th class="name">User Name</th>- <th class="privilege">Privilege</th>- </tr>- </thead>- <tbody>- <tr wicket:id="users">- <td class="name">- <a wicket:id="avatarLink"><img wicket:id="avatar"></img></a>- <a wicket:id="nameLink"><span wicket:id="name"></span></a>- </td>- <td class="privilege">- <a wicket:id="privilegeLink"><span wicket:id="privilege"></span></a>- </td>- </tr>- </tbody>- </table>- <div class="center"><ul wicket:id="pageNav"></ul></div>- <div wicket:id="noUsers" class="alert alert-warning">No authorized users</div>- <div class="help-block"><i class="fa fa-info-circle"></i> Effective privileges are the actual privileges- derived from all possible privilege sources</div>- </div>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index bc4c60caea..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java+++ /dev/null@@ -1,296 +0,0 @@-package com.gitplex.server.web.page.depot.setting.authorization;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--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;-import com.gitplex.server.web.component.avatar.Avatar;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.server.web.page.depot.setting.DepotSettingPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class DepotEffectivePrivilegePage extends DepotSettingPage {-- private PageableListView<UserPermission> usersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer usersContainer;-- private WebMarkupContainer noUsersContainer;-- private DepotPrivilege filterPrivilege;-- private String searchInput;-- public DepotEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchUsers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- usersContainer = new WebMarkupContainer("users") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!usersView.getModelObject().isEmpty());- }-- };- usersContainer.setOutputMarkupPlaceholderTag(true);- add(usersContainer);-- usersContainer.add(usersView = new PageableListView<UserPermission>("users",- new LoadableDetachableModel<List<UserPermission>>() {-- @Override- protected List<UserPermission> load() {- List<UserPermission> permissions = new ArrayList<>();-- Depot depot = depotModel.getObject();- Collection<Account> users = new HashSet<>();- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- users.add(membership.getUser());- }- for (UserAuthorization authorization: depot.getAuthorizedUsers()) {- users.add(authorization.getUser());- }- for (Account user: users) {- if (user.matches(searchInput)) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new UserPermission(user, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getUser().getDisplayName().compareTo(permission2.getUser().getDisplayName()));- return permissions;- }-- }, WebConstants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<UserPermission> item) {- UserPermission permission = item.getModelObject();-- OrganizationMembership membership =- getAccount().getOrganizationMembersMap().get(permission.getUser());- if (membership != null) {- PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);- Link<Void> link = new ViewStateAwarePageLink<Void>(- "avatarLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new ViewStateAwarePageLink<Void>(- "nameLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());- link = new ViewStateAwarePageLink<Void>(- "privilegeLink",- MemberPrivilegeSourcePage.class,- params);- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- } else {- PageParameters params = CollaboratorDepotListPage.paramsOf(- getAccount(), permission.getUser());-- Link<Void> link = new ViewStateAwarePageLink<Void>(- "avatarLink",- CollaboratorDepotListPage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new ViewStateAwarePageLink<Void>(- "nameLink",- CollaboratorDepotListPage.class,- params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = CollaboratorPrivilegeSourcePage.paramsOf(depotModel.getObject(), permission.getUser());- link = new ViewStateAwarePageLink<Void>(- "privilegeLink",- CollaboratorPrivilegeSourcePage.class,- params);- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", usersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(usersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noUsersContainer = new WebMarkupContainer("noUsers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(usersView.getModelObject().isEmpty());- }-- };- noUsersContainer.setOutputMarkupPlaceholderTag(true);- add(noUsersContainer);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- if (depot.getAccount().isOrganization())- setResponsePage(DepotEffectivePrivilegePage.class, DepotEffectivePrivilegePage.paramsOf(depot));- else- setResponsePage(DepotCollaboratorListPage.class, DepotCollaboratorListPage.paramsOf(depot));- }-- private static class UserPermission {-- private final Account user;-- private final DepotPrivilege privilege;-- public UserPermission(Account user, DepotPrivilege privilege) {- this.user = user;- this.privilege = privilege;- }-- public Account getUser() {- return user;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.htmldeleted file mode 100644index 3331f2c385..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.html+++ /dev/null@@ -1,45 +0,0 @@-<wicket:extend>- <div class="authorization list">- <div class="head clearfix">- <div wicket:id="filter" class="pull-left filter btn-group">- <a wicket:id="selection" class="btn btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="clear" class="btn btn-default" title="Clear privilege filter"><i class="fa fa-times"></i></a>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="confirmRemove" class="btn btn-danger"><i class="fa fa-times"></i> Confirm Remove</a>- </div>- </div>- <table wicket:id="teams" class="teams table table-hover table-condensed">- <thead>- <tr>- <th class="name">Team Name</th>- <th class="privilege">Privilege</th>- <th class="actions"></th>- </tr>- </thead>- <tbody>- <tr wicket:id="teams">- <td class="name">- <a wicket:id="link"><span wicket:id="name"></span></a>- <div wicket:id="greaterPrivileges" class="note">- Some members have greater privileges. <a wicket:id="detail">View details</a>- </div>- </td>- <td class="privilege">- <a wicket:id="privilege" class="btn btn-default btn-xs"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </td>- <td class="actions">- <a wicket:id="remove" title="Remove authorization"><i class="fa fa-times"></i></a>- <a wicket:id="undoRemove" title="Do not remove"><i class="fa fa-undo"></i></a>- <span wicket:id="pendingRemoval" class="label label-danger">Pending removal</span>- </td>- </tr>- </tbody>- </table>- <div wicket:id="noTeams" class="alert alert-warning">No teams found</div>- <div wicket:id="tip" class="help-block"></div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.javadeleted file mode 100644index 1d34302573..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamAuthorizationPage.java+++ /dev/null@@ -1,406 +0,0 @@-package com.gitplex.server.web.page.depot.setting.authorization;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;-import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.component.modal.ModalLink;-import com.gitplex.server.web.component.modal.ModalPanel;-import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.component.select2.SelectToAddChoice;-import com.gitplex.server.web.component.teamchoice.AbstractTeamChoiceProvider;-import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;-import com.gitplex.server.web.page.account.teams.TeamDepotListPage;-import com.gitplex.server.web.page.depot.setting.DepotSettingPage;-import com.gitplex.server.web.util.depotaccess.DepotAccess;--@SuppressWarnings("serial")-public class DepotTeamAuthorizationPage extends DepotSettingPage {-- private ListView<TeamAuthorization> teamsView;-- private WebMarkupContainer teamsContainer;-- private WebMarkupContainer noTeamsContainer;-- private DepotPrivilege filterPrivilege;-- private Set<Long> pendingRemovals = new HashSet<>();-- public DepotTeamAuthorizationPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- add(new SelectToAddChoice<Team>("addNew", new AbstractTeamChoiceProvider() {-- @Override- public void query(String term, int page, Response<Team> response) {- List<Team> teams = new ArrayList<>();- for (Team team: getAccount().getDefinedTeams()) {- if (team.matches(term)) {- boolean authorized = false;- for (TeamAuthorization authorization: depotModel.getObject().getAuthorizedTeams()) {- if (authorization.getTeam().equals(team)) {- authorized = true;- break;- }- }- if (!authorized)- teams.add(team);- }- }-- Collections.sort(teams);-- new ResponseFiller<Team>(response).fill(teams, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Select team to authorize...");- getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Team selection) {- TeamAuthorization authorization = new TeamAuthorization();- authorization.setTeam(selection);- authorization.setDepot(depotModel.getObject());- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<TeamAuthorization> authorizations = new HashSet<>();- TeamAuthorizationManager authorizationManager = GitPlex.getInstance(TeamAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(teamsContainer);- target.add(noTeamsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- teamsContainer = new WebMarkupContainer("teams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!teamsView.getModelObject().isEmpty());- }-- };- teamsContainer.setOutputMarkupPlaceholderTag(true);- add(teamsContainer);-- teamsContainer.add(teamsView = new ListView<TeamAuthorization>("teams",- new LoadableDetachableModel<List<TeamAuthorization>>() {-- @Override- protected List<TeamAuthorization> load() {- List<TeamAuthorization> authorizations = new ArrayList<>();-- for (TeamAuthorization authorization: depotModel.getObject().getAuthorizedTeams()) {- if (filterPrivilege == null || filterPrivilege == authorization.getPrivilege()) {- authorizations.add(authorization);- }- }-- authorizations.sort((o1, o2)->o1.getTeam().getName().compareTo(o2.getTeam().getName()));- return authorizations;- }-- }) {-- @Override- protected void populateItem(ListItem<TeamAuthorization> item) {- TeamAuthorization authorization = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>("link", TeamDepotListPage.class,- TeamDepotListPage.paramsOf(authorization.getTeam()));- link.add(new Label("name", authorization.getTeam().getName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasGreaterPrivileges = false;- TeamAuthorization authorization = item.getModelObject();- Team team = authorization.getTeam();- for (Account user: team.getMembers()) {- DepotAccess depotAccess = new DepotAccess(user, depotModel.getObject());- if (SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege())) {- hasGreaterPrivileges = true;- break;- }- }- setVisible(hasGreaterPrivileges);- }-- };- greaterPrivileges.add(new ModalLink("detail") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new GreaterPrivilegesPanel(id, item.getModel()) {-- @Override- protected void onClose(AjaxRequestTarget target) {- modal.close();- }-- };- }-- });- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- dropdown.close();- TeamAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(teamsContainer);- target.add(noTeamsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- noTeamsContainer = new WebMarkupContainer("noTeams") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(teamsView.getModelObject().isEmpty());- }-- };- noTeamsContainer.setOutputMarkupPlaceholderTag(true);- add(noTeamsContainer);-- add(new Label("tip", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- StringBuilder builder = new StringBuilder("<i class='fa fa-info-circle'></i> ");- if (getAccount().getDefaultPrivilege() == DepotPrivilege.NONE) {- builder.append("Grant repository privileges to teams");- } else {- builder.append("Grant extra repository privileges here for teams besides the "- + "default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege "- + "in organization setting");- }- return builder.toString();- }-- }).setEscapeModelStrings(false));-- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- if (depot.getAccount().isOrganization())- setResponsePage(DepotTeamAuthorizationPage.class, DepotTeamAuthorizationPage.paramsOf(depot));- else- setResponsePage(DepotCollaboratorListPage.class, DepotCollaboratorListPage.paramsOf(depot));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionEditor.javadeleted file mode 100644index 5401d1b2a7..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionEditor.java+++ /dev/null@@ -1,138 +0,0 @@-package com.gitplex.server.web.page.depot.setting.branchprotection;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-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.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.support.BranchProtection;-import com.gitplex.server.model.support.FileProtection;-import com.gitplex.server.util.reviewappointment.ReviewAppointment;-import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.page.depot.DepotPage;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--@SuppressWarnings("serial")-abstract class BranchProtectionEditor extends Panel {-- private final BranchProtection protection;-- public BranchProtectionEditor(String id, BranchProtection protection) {- super(id);-- this.protection = protection;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupId(true);-- Form<?> form = new Form<Void>("form");- form.add(new NotificationPanel("feedback", form));-- TeamlessBranchProtection teamlessProtection = new TeamlessBranchProtection();- teamlessProtection.setBranch(protection.getBranch());- teamlessProtection.setFileProtections(protection.getFileProtections());- teamlessProtection.setNoDeletion(protection.isNoDeletion());- teamlessProtection.setNoForcedPush(protection.isNoForcedPush());-- Depot depot = ((DepotPage) getPage()).getDepot();-- List<String> reviewerNames = new ArrayList<>();- ReviewAppointment reviewAppointment = protection.getReviewAppointment(depot);- if (reviewAppointment != null) {- for (Account user: reviewAppointment.getUsers())- reviewerNames.add(user.getName());- }- teamlessProtection.setReviewerNames(reviewerNames);-- for (FileProtection fileProtection: teamlessProtection.getFileProtections()) {- TeamlessFileProtection teamlessFileProtection = new TeamlessFileProtection();- teamlessFileProtection.setPath(fileProtection.getPath());-- reviewerNames = new ArrayList<>();- reviewAppointment = fileProtection.getReviewAppointment(depot);- if (reviewAppointment != null) {- for (Account user: reviewAppointment.getUsers())- reviewerNames.add(user.getName());- }- teamlessFileProtection.setReviewerNames(reviewerNames);-- teamlessProtection.getTeamlessFileProtections().add(teamlessFileProtection);- }-- if (depot.getAccount().isOrganization())- form.add(BeanContext.editBean("editor", protection));- else- form.add(BeanContext.editBean("editor", teamlessProtection));-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Depot depot = ((DepotPage) getPage()).getDepot();- if (!depot.getAccount().isOrganization()) {- protection.setBranch(teamlessProtection.getBranch());- protection.setFileProtections(teamlessProtection.getFileProtections());- protection.setNoDeletion(teamlessProtection.isNoDeletion());- protection.setNoForcedPush(teamlessProtection.isNoForcedPush());-- StringBuilder builder = new StringBuilder();- for (String userName: teamlessProtection.getReviewerNames())- builder.append("user(").append(userName).append(") ");- if (builder.length() != 0)- protection.setReviewAppointmentExpr(builder.toString().trim());- else- protection.setReviewAppointmentExpr(null);-- protection.getFileProtections().clear();- for (TeamlessFileProtection teamlessFileProtection: teamlessProtection.getTeamlessFileProtections()) {- FileProtection fileProtection = new FileProtection();- fileProtection.setPath(teamlessFileProtection.getPath());-- builder = new StringBuilder();- for (String userName: teamlessFileProtection.getReviewerNames())- builder.append("user(").append(userName).append(") ");- if (builder.length() != 0)- fileProtection.setReviewAppointmentExpr(builder.toString().trim());-- protection.getFileProtections().add(fileProtection);- }- }-- onSave(target, protection);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- add(form);- }-- protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);-- protected abstract void onCancel(AjaxRequestTarget target);-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessBranchProtection.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessBranchProtection.javadeleted file mode 100644index 48613d89bf..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessBranchProtection.java+++ /dev/null@@ -1,55 +0,0 @@-package com.gitplex.server.web.page.depot.setting.branchprotection;--import java.util.ArrayList;-import java.util.List;--import javax.validation.constraints.NotNull;--import com.gitplex.server.model.support.BranchProtection;-import com.gitplex.server.model.support.FileProtection;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable-public class TeamlessBranchProtection extends BranchProtection {-- private static final long serialVersionUID = 1L;-- private List<String> reviewerNames;-- private List<TeamlessFileProtection> teamlessFileProtections = new ArrayList<>();-- @Override- public String getReviewAppointmentExpr() {- return super.getReviewAppointmentExpr();- }-- @Override- public List<FileProtection> getFileProtections() {- return super.getFileProtections();- }-- @Editable(order=400, name="Reviewers", description="Optionally specify required reviewers for changes of "- + "specified branch. Note that the user submitting the change is considered to reviewed the change "- + "automatically")- @AccountChoice(type=AccountChoice.Type.DEPOT_READER)- public List<String> getReviewerNames() {- return reviewerNames;- }-- public void setReviewerNames(List<String> reviewerNames) {- this.reviewerNames = reviewerNames;- }-- @Editable(order=500, name="File Protections", description="Optionally specify additional users to review particular paths. For each changed file, "- + "the first matched file protection setting will be used")- @NotNull- public List<TeamlessFileProtection> getTeamlessFileProtections() {- return teamlessFileProtections;- }-- public void setTeamlessFileProtections(List<TeamlessFileProtection> teamlessFileProtections) {- this.teamlessFileProtections = teamlessFileProtections;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessFileProtection.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessFileProtection.javadeleted file mode 100644index a2138687b1..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/TeamlessFileProtection.java+++ /dev/null@@ -1,34 +0,0 @@-package com.gitplex.server.web.page.depot.setting.branchprotection;--import java.util.List;--import org.hibernate.validator.constraints.NotEmpty;--import com.gitplex.server.model.support.FileProtection;-import com.gitplex.server.util.editable.annotation.AccountChoice;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable-public class TeamlessFileProtection extends FileProtection {-- private static final long serialVersionUID = 1L;-- private List<String> reviewerNames;-- public String getReviewAppointmentExpr() {- return super.getReviewAppointmentExpr();- }-- @Editable(order=200, name="Reviewers", description="Optionally specify required reviewers if specified path is "- + "changed. Note that the user submitting the change is considered to reviewed the change automatically")- @AccountChoice(type=AccountChoice.Type.DEPOT_READER)- @NotEmpty- public List<String> getReviewerNames() {- return reviewerNames;- }-- public void setReviewerNames(List<String> reviewerNames) {- this.reviewerNames = reviewerNames;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/depot-setting.css b/web/src/main/java/com/gitplex/server/web/page/depot/setting/depot-setting.cssdeleted file mode 100644index b2df5fb8ba..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/depot-setting.css+++ /dev/null@@ -1,87 +0,0 @@-#depot-setting>table>tbody>tr>td.nav {- width: 200px;- border-right: 1px solid #DDD;- white-space: nowrap;- padding: 20px 0;-}-#depot-setting>table>tbody>tr>td.nav a {- display: block;- color: #666;- text-decoration: none;- padding: 6px 12px;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;-}-#depot-setting>table>tbody>tr>td.nav li:hover a {- background: #F5F5F5;- color: #010203;-}-#depot-setting>table>tbody>tr>td.nav li.active a {- background: #E8E8E8;- color: #010203;- font-weight: bold;-}-#depot-setting>table>tbody>tr>td.content {- padding: 20px;-}-#depot-setting .general-setting form .delete {- margin-right: 0;-}-#depot-setting .drag-handle {- cursor: move;-}-#depot-setting .panel-list .drag-handle {- margin-right: 8px;-}-#depot-setting .panel-list .panel-heading a {- color: #444;- margin-right: 8px;-}-#depot-setting .panel-list .add-new {- display: block;- padding: 16px;- background: #F2F2F2;- border: 1px solid #DDD;- border-radius: 4px;- font-size: 16px;- color: #444;- margin-bottom: 16px;-}-#depot-setting .panel-list a.add-new:hover {- text-decoration: none;- background-color: #EBEBEB;- border-color: #ADADAD;-}-#depot-setting .panel-list a.add-new .fa {- margin-left: 8px;-}-#depot-setting .panel-list .concrete.list td.path,-#depot-setting .panel-list .concrete.list td.reviewerNames,-#depot-setting .panel-list .concrete.list td.reviewAppointment {- width: 45%;-}--#depot-setting .authorization .list table td.actions {- width: 20%;- white-space: nowrap;-}-#depot-setting .authorization .list td.name .note {- font-size: 12px;- color: #888;- margin-top: 4px;-}-#depot-setting .authorization .list td.privilege {- width: 20%;-}--.modal .transfer-depot .message {- font-size: 13px;- margin-bottom: 20px;-}--#depot-setting .commit-message-transform>label {- float: left;- margin-right: 4px;-}-#depot-setting .commit-message-transform>.help-block {- margin-top: 20px;-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.htmldeleted file mode 100644index a54cd8e2a1..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.html+++ /dev/null@@ -1,37 +0,0 @@-<wicket:extend>- <div class="general-setting">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input class="btn btn-primary dirty-aware" value="Update" type="submit"></input>- <a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a>- <a wicket:id="transfer" class="transfer btn btn-danger pull-right">Transfer</a>- </div>- </form>- </div>- <wicket:fragment wicket:id="transferFrag">- <div class="transfer-depot">- <!-- Add form tag so that the default delete button can be triggered when user hits return -->- <form wicket:id="form">- <div class="modal-header">- <h4 id="modal-title" class="modal-title">- Transfer repository to another account- </h4>- </div>- <div class="modal-body">- <div class="message">You can only transfer repository to accounts you have administrative- rights on. Also note that original team references in repository- authorization and gatekeeper definition will be removed after transferring as teams are local to account.</div>- <div class="form-group">- <input wicket:id="account" type="hidden" class="form-control" placeholder="Select destination account..."></input>- <div wicket:id="feedback"></div>- </div>- </div>- <div class="modal-footer">- <input wicket:id="transfer" type="submit" class="btn btn-danger dirty-aware" value="Transfer"></input>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>- </div>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 49ce62d43a..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java+++ /dev/null@@ -1,217 +0,0 @@-package com.gitplex.server.web.page.depot.setting.general;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;-import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteDepotModal;-import com.gitplex.server.web.component.modal.ModalPanel;-import com.gitplex.server.web.component.select2.Response;-import com.gitplex.server.web.component.select2.ResponseFiller;-import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.editable.BeanEditor;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.depot.setting.DepotSettingPage;--@SuppressWarnings("serial")-public class GeneralSettingPage extends DepotSettingPage {-- private String oldName;-- private BeanEditor<?> editor;-- public GeneralSettingPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- editor = BeanContext.editModel("editor", new IModel<Serializable>() {-- @Override- public void detach() {- }-- @Override- public Serializable getObject() {- return getDepot();- }-- @Override- public void setObject(Serializable object) {- // check contract of DepotManager.save on why we assign oldName here- oldName = getDepot().getName();- editor.getBeanDescriptor().copyProperties(object, getDepot());- }-- });-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- }-- @Override- protected void onSubmit() {- super.onSubmit();-- Depot depot = getDepot();- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- Depot depotWithSameName = depotManager.find(getAccount(), depot.getName());- if (depotWithSameName != null && !depotWithSameName.equals(depot)) {- String errorMessage = "This name has already been used by another repository in account "- + getAccount().getName() + ".";- editor.getErrorContext(new PathSegment.Property("name")).addError(errorMessage);- } else {- depotManager.save(depot, null, oldName);- Session.get().success("General setting has been updated");- setResponsePage(GeneralSettingPage.class, paramsOf(depot));- }- }-- };- form.add(editor);-- form.add(new AjaxLink<Void>("transfer") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ModalPanel(target) {-- private Account account;-- @Override- protected Component newContent(String id) {- Fragment fragment = new Fragment(id, "transferFrag", GeneralSettingPage.this);- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);- fragment.add(form);- form.add(new AccountSingleChoice("account", new IModel<Account>() {-- @Override- public void detach() {- }-- @Override- public Account getObject() {- return account;- }-- @Override- public void setObject(Account object) {- account = object;- }-- }, new AbstractAccountChoiceProvider() {-- @Override- public void query(String term, int page, Response<Account> response) {- List<Account> accounts = new ArrayList<>();- for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {- if (!account.equals(getAccount()) && SecurityUtils.canManage(account)) {- accounts.add(account);- }- }- new ResponseFiller<Account>(response).fill(accounts, page, WebConstants.DEFAULT_PAGE_SIZE);- }-- }).setRequired(true));-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(new AjaxButton("transfer") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- if (depotManager.find(account, getDepot().getName()) != null) {- form.error("A repository with name '" + getDepot().getName() + "' already exist "- + "under this account, please rename the repository and try transfer "- + "again");- target.add(form);- } else {- getDepot().setAccount(account);- depotManager.save(getDepot(), getAccount().getId(), null);- setResponsePage(GeneralSettingPage.class, GeneralSettingPage.paramsOf(getDepot()));- Session.get().success("Repository has been transferred successfully");- }- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- return fragment;- }-- };- }-- });-- form.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ConfirmDeleteDepotModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(getAccount()));- }-- @Override- protected Depot getDepot() {- return GeneralSettingPage.this.getDepot();- }- };- }-- });-- add(form);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(GeneralSettingPage.class, GeneralSettingPage.paramsOf(depot));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionEditor.javadeleted file mode 100644index b2132e76ba..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionEditor.java+++ /dev/null@@ -1,109 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-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.model.Depot;-import com.gitplex.server.model.support.TagProtection;-import com.gitplex.server.model.support.tagcreator.DepotAdministrators;-import com.gitplex.server.model.support.tagcreator.DepotWriters;-import com.gitplex.server.model.support.tagcreator.SpecifiedUser;-import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.page.depot.DepotPage;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--@SuppressWarnings("serial")-abstract class TagProtectionEditor extends Panel {-- private final TagProtection protection;-- public TagProtectionEditor(String id, TagProtection protection) {- super(id);-- this.protection = protection;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupId(true);-- TeamlessTagProtection teamlessProtection = new TeamlessTagProtection();- teamlessProtection.setNoDeletion(protection.isNoDeletion());- teamlessProtection.setNoUpdate(protection.isNoUpdate());- teamlessProtection.setTag(protection.getTag());- if (protection.getTagCreator() instanceof DepotAdministrators) {- teamlessProtection.setTeamlessTagCreator(new TeamlessDepotAdministrators());- } else if (protection.getTagCreator() instanceof SpecifiedUser) {- SpecifiedUser specifiedUser = (SpecifiedUser) protection.getTagCreator();- TeamlessSpecifiedUser teamlessSpecifiedUser = new TeamlessSpecifiedUser();- teamlessSpecifiedUser.setUserName(specifiedUser.getUserName());- teamlessProtection.setTeamlessTagCreator(teamlessSpecifiedUser);- } else {- teamlessProtection.setTeamlessTagCreator(new TeamlessDepotWriters());- }-- Form<?> form = new Form<Void>("form");- form.add(new NotificationPanel("feedback", form));-- Depot depot = ((DepotPage) getPage()).getDepot();- if (depot.getAccount().isOrganization())- form.add(BeanContext.editBean("editor", protection));- else- form.add(BeanContext.editBean("editor", teamlessProtection));-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Depot depot = ((DepotPage) getPage()).getDepot();- if (!depot.getAccount().isOrganization()) {- protection.setNoDeletion(teamlessProtection.isNoDeletion());- protection.setNoUpdate(teamlessProtection.isNoUpdate());- protection.setTag(teamlessProtection.getTag());-- if (teamlessProtection.getTeamlessTagCreator() instanceof TeamlessDepotAdministrators) {- protection.setTagCreator(new DepotAdministrators());- } else if (teamlessProtection.getTeamlessTagCreator() instanceof TeamlessSpecifiedUser) {- TeamlessSpecifiedUser teamlessSpecifiedUser =- (TeamlessSpecifiedUser) teamlessProtection.getTeamlessTagCreator();- SpecifiedUser specifiedUser = new SpecifiedUser();- specifiedUser.setUserName(teamlessSpecifiedUser.getUserName());- protection.setTagCreator(specifiedUser);- } else {- protection.setTagCreator(new DepotWriters());- }- }-- onSave(target, protection);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- add(form);- }-- protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);-- protected abstract void onCancel(AjaxRequestTarget target);-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotAdministrators.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotAdministrators.javadeleted file mode 100644index 646a3276a8..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotAdministrators.java+++ /dev/null@@ -1,11 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import com.gitplex.server.model.support.tagcreator.DepotAdministrators;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable(order=200, name="Repository Administrators")-public class TeamlessDepotAdministrators extends DepotAdministrators implements TeamlessTagCreator {-- private static final long serialVersionUID = 1L;--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotWriters.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotWriters.javadeleted file mode 100644index f3724c4a88..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessDepotWriters.java+++ /dev/null@@ -1,11 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import com.gitplex.server.model.support.tagcreator.DepotWriters;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable(order=100, name="All Users Able to Write to the Repository")-public class TeamlessDepotWriters extends DepotWriters implements TeamlessTagCreator {-- private static final long serialVersionUID = 1L;--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessSpecifiedUser.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessSpecifiedUser.javadeleted file mode 100644index dfc59808f5..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessSpecifiedUser.java+++ /dev/null@@ -1,11 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import com.gitplex.server.model.support.tagcreator.SpecifiedUser;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable(order=400, name="Specified User")-public class TeamlessSpecifiedUser extends SpecifiedUser implements TeamlessTagCreator {-- private static final long serialVersionUID = 1L;--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagCreator.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagCreator.javadeleted file mode 100644index 62a900d77f..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagCreator.java+++ /dev/null@@ -1,9 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import com.gitplex.server.model.support.tagcreator.TagCreator;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable-public interface TeamlessTagCreator extends TagCreator {--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagProtection.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagProtection.javadeleted file mode 100644index 707d2cc0e9..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TeamlessTagProtection.java+++ /dev/null@@ -1,31 +0,0 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;--import javax.validation.constraints.NotNull;--import com.gitplex.server.model.support.TagProtection;-import com.gitplex.server.model.support.tagcreator.TagCreator;-import com.gitplex.server.util.editable.annotation.Editable;--@Editable-public class TeamlessTagProtection extends TagProtection {-- private static final long serialVersionUID = 1L;-- private TeamlessTagCreator teamlessTagCreator = new TeamlessDepotWriters();-- @Override- public TagCreator getTagCreator() {- return super.getTagCreator();- }-- @Editable(order=400, name="Allowed Creator", description="Specify users allowed to create specified tag")- @NotNull- public TeamlessTagCreator getTeamlessTagCreator() {- return teamlessTagCreator;- }-- public void setTeamlessTagCreator(TeamlessTagCreator teamlessTagCreator) {- this.teamlessTagCreator = teamlessTagCreator;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.javadeleted file mode 100644index 5039671fe5..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.depot.tags;--import org.apache.wicket.request.resource.CssResourceReference;--public class DepotTagsResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public DepotTagsResourceReference() {- super(DepotTagsResourceReference.class, "depot-tags.css");- }--}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 61900b4055..b752538e42 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@@ -35,7 +35,7 @@ import org.apache.wicket.util.string.Strings;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.page.home.DashboardPage;@@ -63,7 +63,7 @@ public class UnexpectedExceptionPage extends BaseErrorPage {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- Account user = getLoginUser();+ User user = getLoginUser();if (user != null)tag.put("value", user.getDisplayName());}@@ -74,7 +74,7 @@ public class UnexpectedExceptionPage extends BaseErrorPage {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- Account user = getLoginUser();+ User user = getLoginUser();if (user != null)tag.put("value", user.getEmail());}@@ -99,7 +99,7 @@ public class UnexpectedExceptionPage extends BaseErrorPage {+ System.getProperty("java.version") + ", "+ System.getProperty("java.vm.vendor")));serverProps.add(new Property("GitPlex Version", "EAP"));- Account user = getLoginUser();+ User user = getLoginUser();if (user != null)serverProps.add(new Property("GitPlex User", user.getName()));elsediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.htmlnew file mode 100644index 0000000000..750aaa0f7a--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.html@@ -0,0 +1,22 @@+<wicket:extend>+ <div class="authorization list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="projectFrag">+ <a wicket:id="project"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="privilegeFrag">+ <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.javanew file mode 100644index 0000000000..c20476ae7f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java@@ -0,0 +1,266 @@+package com.gitplex.server.web.page.group;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupAuthorizationManager;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.projectchoice.AbstractProjectChoiceProvider;+import com.gitplex.server.web.component.projectchoice.ProjectChoiceResourceReference;+import com.gitplex.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public class GroupAuthorizationsPage extends GroupPage {++ private String searchInput;++ private DataTable<GroupAuthorization, Void> authorizationsTable;++ private SelectionColumn<GroupAuthorization, Void> selectionColumn;++ public GroupAuthorizationsPage(PageParameters params) {+ super(params);+ }++ private EntityCriteria<GroupAuthorization> getCriteria() {+ EntityCriteria<GroupAuthorization> criteria = EntityCriteria.of(GroupAuthorization.class);+ if (searchInput != null)+ criteria.createCriteria("project").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));+ criteria.add(Restrictions.eq("group", getGroup()));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterProjects", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(authorizationsTable);+ }++ });++ add(new SelectToAddChoice<Project>("addNew", new AbstractProjectChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Project> response) {+ List<Project> notAuthorized = new ArrayList<>();+ for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {+ if (project.matches(searchInput) && !getGroup().getAuthorizedProjects().contains(project))+ notAuthorized.add(project);+ }+ Collections.sort(notAuthorized);+ Collections.reverse(notAuthorized);+ new ResponseFiller<Project>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add project...");+ getSettings().setFormatResult("gitplex.server.projectChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.projectChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.projectChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Project selection) {+ GroupAuthorization authorization = new GroupAuthorization();+ authorization.setGroup(getGroup());+ authorization.setProject(selection);+ GitPlex.getInstance(GroupAuthorizationManager.class).save(authorization);+ target.add(authorizationsTable);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<GroupAuthorization> authorizationsToDelete = new HashSet<>();+ for (IModel<GroupAuthorization> model: selectionColumn.getSelections()) {+ authorizationsToDelete.add(model.getObject());+ }+ GitPlex.getInstance(GroupAuthorizationManager.class).delete(authorizationsToDelete);+ target.add(authorizationsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!selectionColumn.getSelections().isEmpty());+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<GroupAuthorization, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<GroupAuthorization, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,+ IModel<GroupAuthorization> rowModel) {+ GroupAuthorization authorization = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "projectFrag", GroupAuthorizationsPage.this);+ fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(authorization.getProject())) {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getProject().getName());+ }++ });+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Permission")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,+ IModel<GroupAuthorization> rowModel) {+ Fragment fragment = new Fragment(componentId, "privilegeFrag", GroupAuthorizationsPage.this);+ WebMarkupContainer dropdown = new DropdownLink("dropdown") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new PrivilegeSelectionPanel(id, rowModel.getObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {+ dropdown.close();+ GroupAuthorization authorization = rowModel.getObject();+ authorization.setPrivilege(privilege);+ GitPlex.getInstance(GroupAuthorizationManager.class).save(authorization);+ target.add(fragment);+ }++ };+ }++ };+ dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return rowModel.getObject().getPrivilege().name();+ }++ }));+ fragment.add(dropdown);+ fragment.setOutputMarkupId(true);+ cellItem.add(fragment);+ }+ });++ SortableDataProvider<GroupAuthorization, Void> dataProvider = new SortableDataProvider<GroupAuthorization, Void>() {++ @Override+ public Iterator<? extends GroupAuthorization> iterator(long first, long count) {+ EntityCriteria<GroupAuthorization> criteria = getCriteria();+ criteria.addOrder(Order.desc("id"));+ return GitPlex.getInstance(GroupAuthorizationManager.class).findRange(criteria, (int)first,+ (int)count).iterator();+ }++ @Override+ public long size() {+ return GitPlex.getInstance(GroupAuthorizationManager.class).count(getCriteria());+ }++ @Override+ public IModel<GroupAuthorization> model(GroupAuthorization object) {+ Long id = object.getId();+ return new LoadableDetachableModel<GroupAuthorization>() {++ @Override+ protected GroupAuthorization load() {+ return GitPlex.getInstance(GroupAuthorizationManager.class).load(id);+ }++ };+ }+ };++ add(authorizationsTable = new DefaultDataTable<GroupAuthorization, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.htmlnew file mode 100644index 0000000000..e6a6c26f62--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.html@@ -0,0 +1,20 @@+<wicket:extend>+ <div class="user list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="memberships" class="memberships table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="avatarLink"></a>+ <a wicket:id="nameLink"></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.javanew file mode 100644index 0000000000..75ec6b4810--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java@@ -0,0 +1,230 @@+package com.gitplex.server.web.page.group;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.MembershipManager;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Membership;+import com.gitplex.server.model.User;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.link.UserLink;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;+import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;++@SuppressWarnings("serial")+public class GroupMembershipsPage extends GroupPage {++ private String searchInput;++ private DataTable<Membership, Void> membershipsTable;++ private SelectionColumn<Membership, Void> selectionColumn;++ public GroupMembershipsPage(PageParameters params) {+ super(params);+ }++ private EntityCriteria<Membership> getCriteria() {+ EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);+ if (searchInput != null)+ criteria.createCriteria("user").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));+ criteria.add(Restrictions.eq("group", getGroup()));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterUsers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(membershipsTable);+ }++ });++ add(new SelectToAddChoice<User>("addNew", new AbstractUserChoiceProvider() {++ @Override+ public void query(String term, int page, Response<User> response) {+ List<User> nonMembers = new ArrayList<>();+ for (User user: GitPlex.getInstance(UserManager.class).findAll()) {+ if (user.matches(searchInput) && !getGroup().getMembers().contains(user))+ nonMembers.add(user);+ }+ Collections.sort(nonMembers);+ Collections.reverse(nonMembers);+ new ResponseFiller<User>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add member...");+ getSettings().setFormatResult("gitplex.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.userChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, User selection) {+ Membership membership = new Membership();+ membership.setGroup(getGroup());+ membership.setUser(selection);+ GitPlex.getInstance(MembershipManager.class).save(membership);+ target.add(membershipsTable);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<Membership> membershipsToDelete = new HashSet<>();+ for (IModel<Membership> model: selectionColumn.getSelections()) {+ membershipsToDelete.add(model.getObject());+ }+ GitPlex.getInstance(MembershipManager.class).delete(membershipsToDelete);+ target.add(membershipsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!selectionColumn.getSelections().isEmpty());+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<Membership, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<Membership, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ if (SecurityUtils.isAdministrator())+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<Membership, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,+ IModel<Membership> rowModel) {+ Membership membership = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "nameFrag", GroupMembershipsPage.this);+ fragment.add(new AvatarLink("avatarLink", membership.getUser()));+ fragment.add(new UserLink("nameLink", membership.getUser()));+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Membership, Void>(Model.of("Email")) {++ @Override+ public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,+ IModel<Membership> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getUser().getEmail()));+ }+ });++ SortableDataProvider<Membership, Void> dataProvider = new SortableDataProvider<Membership, Void>() {++ @Override+ public Iterator<? extends Membership> iterator(long first, long count) {+ EntityCriteria<Membership> criteria = getCriteria();+ criteria.addOrder(Order.desc("id"));+ return GitPlex.getInstance(MembershipManager.class).findRange(criteria, (int)first,+ (int)count).iterator();+ }++ @Override+ public long size() {+ return GitPlex.getInstance(MembershipManager.class).count(getCriteria());+ }++ @Override+ public IModel<Membership> model(Membership object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Membership>() {++ @Override+ protected Membership load() {+ return GitPlex.getInstance(MembershipManager.class).load(id);+ }++ };+ }+ };++ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,+ WebConstants.PAGE_SIZE));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.htmlsimilarity index 58%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/group/GroupPage.htmlindex f36e296bc0..c33873282c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.html@@ -1,9 +1,9 @@<wicket:extend>- <div id="depot-setting">+ <div id="group" class="sidebar"><table><tr><td class="nav">- <ul wicket:id="depotSettingTabs" class="tabs list-unstyled"></ul>+ <ul wicket:id="groupTabs" class="tabs list-unstyled"></ul></td><td class="content"><wicket:child></wicket:child>diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.javanew file mode 100644index 0000000000..d48cb68a0f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java@@ -0,0 +1,80 @@+package com.gitplex.server.web.page.group;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.component.tabbable.PageTab;+import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.util.model.EntityModel;++@SuppressWarnings("serial")+public abstract class GroupPage extends LayoutPage {++ private static final String PARAM_GROUP = "group";++ protected final IModel<Group> groupModel;++ public GroupPage(PageParameters params) {+ super(params);++ Long groupId = params.get(PARAM_GROUP).toLong();++ Group group = GitPlex.getInstance(GroupManager.class).load(groupId);+ groupModel = new EntityModel<Group>(group);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));+ tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));+ if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())+ tabs.add(new GroupTab("Authorizations", "fa fa-fw fa-lock", GroupAuthorizationsPage.class));++ add(new Tabbable("groupTabs", tabs));+ }++ @Override+ protected void onDetach() {+ groupModel.detach();++ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new GroupResourceReference()));+ }++ public Group getGroup() {+ return groupModel.getObject();+ }++ public static PageParameters paramsOf(Group group) {+ PageParameters params = new PageParameters();+ params.add(PARAM_GROUP, group.getId());+ return params;+ }++ @Override+ protected Component newContextHead(String componentId) {+ return new Label(componentId, "Group - " + getGroup().getName());+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.htmlnew file mode 100644index 0000000000..d7fcd6b547--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.html@@ -0,0 +1,24 @@+<wicket:extend>+ <div wicket:id="content" class="profile"></div>+ <wicket:fragment wicket:id="editFrag">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="checkbox">+ <label>+ <input wicket:id="administrator" type="checkbox"/> Is Administrator+ <div class="help-block">Members of administrator group have administrative rights over the whole system</div>+ </label>+ </div>+ <div class="checkbox">+ <label>+ <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects+ <div class="help-block">Check this to make members of this group able to fork/create projects</div>+ </label>+ </div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>+ <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.javanew file mode 100644index 0000000000..9006cac6b7--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java@@ -0,0 +1,147 @@+package com.gitplex.server.web.page.group;++import java.io.Serializable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanDescriptor;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.home.DashboardPage;+import com.gitplex.server.web.util.ConfirmOnClick;+import com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class GroupProfilePage extends GroupPage {++ private BeanEditor<?> editor;++ private CheckBox administratorInput;++ private CheckBox canCreateProjectsInput;++ private String oldName;++ public GroupProfilePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (SecurityUtils.isAdministrator()) {+ Fragment fragment = new Fragment("content", "editFrag", this);+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {++ @Override+ public void detach() {+ }++ @Override+ public Serializable getObject() {+ return getGroup();+ }++ @Override+ public void setObject(Serializable object) {+ // check contract of GroupManager.save on why we assign oldName here+ oldName = getGroup().getName();+ editor.getBeanDescriptor().copyProperties(object, getGroup());+ }++ }, Sets.newHashSet("administrator", "canCreateProjects"));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Group group = getGroup();+ group.setAdministrator(administratorInput.getModelObject());+ if (group.isAdministrator())+ group.setCanCreateProjects(true);+ else+ group.setCanCreateProjects(canCreateProjectsInput.getModelObject());+ GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ Group groupWithSameName = groupManager.find(group.getName());+ if (groupWithSameName != null && !groupWithSameName.equals(group)) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another group.");+ }+ if (!editor.hasErrors(true)) {+ groupManager.save(group, oldName);+ setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));+ }+ }++ };+ form.add(editor);++ administratorInput = new CheckBox("administrator", Model.of(getGroup().isAdministrator()));+ administratorInput.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ if (administratorInput.getModelObject())+ canCreateProjectsInput.setModelObject(true);+ target.add(canCreateProjectsInput);+ }++ });+ form.add(administratorInput);++ canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getGroup().isCanCreateProjects())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!administratorInput.getModelObject());+ }++ };+ canCreateProjectsInput.setOutputMarkupId(true);+ form.add(canCreateProjectsInput);++ form.add(new Link<Void>("delete") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(SecurityUtils.isAdministrator());+ }++ @Override+ public void onClick() {+ GitPlex.getInstance(GroupManager.class).delete(getGroup());+ setResponsePage(DashboardPage.class);+ }++ }.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));++ fragment.add(form);+ add(fragment);+ } else {+ Group group = new Group();+ new BeanDescriptor(Group.class).copyProperties(getGroup(), group);+ add(BeanContext.viewBean("content", Model.of(group)));+ }++ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupResourceReference.javanew file mode 100644index 0000000000..20778394a0--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.group;++import org.apache.wicket.request.resource.CssResourceReference;++public class GroupResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public GroupResourceReference() {+ super(GroupResourceReference.class, "group.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupTab.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupTab.javanew file mode 100644index 0000000000..cff6a29f1e--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupTab.java@@ -0,0 +1,52 @@+package com.gitplex.server.web.page.group;++import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import com.gitplex.server.web.component.tabbable.PageTab;++@SuppressWarnings("serial")+public class GroupTab extends PageTab {++ private final String iconClass;++ public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass) {+ super(Model.of(title), mainPageClass);++ this.iconClass = iconClass;+ }++ public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,+ Class<? extends GroupPage> additionalPageClass1) {+ super(Model.of(title), mainPageClass, additionalPageClass1);++ this.iconClass = iconClass;+ }++ public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,+ Class<? extends GroupPage> additionalPageClass1,+ Class<? extends GroupPage> additionalPageClass2) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);++ this.iconClass = iconClass;+ }++ public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,+ Class<? extends GroupPage> additionalPageClass1,+ Class<? extends GroupPage> additionalPageClass2,+ Class<? extends GroupPage> additionalPageClass3) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);++ this.iconClass = iconClass;+ }++ public String getIconClass() {+ return iconClass;+ }++ @Override+ public Component render(String componentId) {+ return new GroupTabLink(componentId, this);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupTabLink.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.htmlrename to web/src/main/java/com/gitplex/server/web/page/group/GroupTabLink.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupTabLink.javasimilarity index 68%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.javarename to web/src/main/java/com/gitplex/server/web/page/group/GroupTabLink.javaindex a1907360da..b42dbd22c5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting;+package com.gitplex.server.web.page.group;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -9,11 +9,11 @@ import org.apache.wicket.markup.html.panel.Panel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;@SuppressWarnings("serial")-public class DepotSettingTabLink extends Panel {+public class GroupTabLink extends Panel {- private final DepotSettingTab tab;+ private final GroupTab tab;- public DepotSettingTabLink(String id, DepotSettingTab tab) {+ public GroupTabLink(String id, GroupTab tab) {super(id);this.tab = tab;@@ -23,9 +23,9 @@ public class DepotSettingTabLink extends Panel {protected void onInitialize() {super.onInitialize();- DepotSettingPage page = (DepotSettingPage) getPage();+ GroupPage page = (GroupPage) getPage();Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), DepotSettingPage.paramsOf(page.getDepot()));+ tab.getMainPageClass(), GroupPage.paramsOf(page.getGroup()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/group/group.css b/web/src/main/java/com/gitplex/server/web/page/group/group.cssnew file mode 100644index 0000000000..ee44fe3dbc--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/group/group.css@@ -0,0 +1,6 @@+#group.sidebar>table>tbody>tr>td.nav>.tabs>li>a {+ width: 220px;+}+#group.sidebar>table>tbody>tr>td.content {+ padding: 20px;+}diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.htmlindex fb91d8e2f5..b3a45ec99e 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html@@ -1,14 +1,21 @@<wicket:extend><div id="dashboard">- <div class="search">- <input wicket:id="search" class="form-control autofocus" placeholder="Search..."></input>+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create Project</a>+ </div></div>- <ul wicket:id="depots" class="list-unstyled">- <li wicket:id="depots">- <a wicket:id="link"><i class="fa fa-ext fa-repo"></i> <span wicket:id="name"></span></a>- </li>- </ul>- <div class="center"><ul wicket:id="depotsPageNav"></ul></div>- <div wicket:id="noDepots" class="alert alert-warning">No repositories found</div>+ <div class="body">+ <ul wicket:id="projects" class="list-unstyled">+ <li wicket:id="projects">+ <a wicket:id="link"><i class="fa fa-ext fa-repo"></i> <span wicket:id="name"></span></a>+ </li>+ </ul>+ <div class="center"><ul wicket:id="projectsPageNav"></ul></div>+ <div wicket:id="noProjects" class="alert alert-warning">No projects found</div>+ </div></div></wicket:extend>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 0b2b261b3d..601534a830 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@@ -10,6 +10,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -17,13 +18,15 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.page.layout.NewProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -31,13 +34,13 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.Bootstra@SuppressWarnings("serial")public class DashboardPage extends LayoutPage {- private PageableListView<Depot> depotsView;+ private PageableListView<Project> projectsView;- private BootstrapPagingNavigator depotsPageNav;+ private BootstrapPagingNavigator projectsPageNav;- private WebMarkupContainer depotsContainer;+ private WebMarkupContainer projectsContainer;- private WebMarkupContainer noDepotsContainer;+ private WebMarkupContainer noProjectsContainer;private String searchInput;@@ -46,81 +49,90 @@ public class DashboardPage extends LayoutPage {super.onInitialize();TextField<String> searchField;- add(searchField = new TextField<String>("search", Model.of("")));+ add(searchField = new TextField<String>("filterProjects", Model.of("")));searchField.add(new OnTypingDoneBehavior(100) {@Overrideprotected void onTypingDone(AjaxRequestTarget target) {searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(depotsPageNav);- target.add(noDepotsContainer);+ target.add(projectsContainer);+ target.add(projectsPageNav);+ target.add(noProjectsContainer);}+ });+ add(new BookmarkablePageLink<Void>("createProject", NewProjectPage.class) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canCreateProjects());+ }+});- depotsContainer = new WebMarkupContainer("depots") {+ projectsContainer = new WebMarkupContainer("projects") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());+ setVisible(!projectsView.getModelObject().isEmpty());}};- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);+ projectsContainer.setOutputMarkupPlaceholderTag(true);+ add(projectsContainer);- depotsContainer.add(depotsView = new PageableListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {+ projectsContainer.add(projectsView = new PageableListView<Project>("projects",+ new LoadableDetachableModel<List<Project>>() {@Override- protected List<Depot> load() {- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- List<Depot> depots = new ArrayList<>();- for (Depot depot: depotManager.findAllAccessible(null, getLoginUser())) {- if (depot.matchesFQN(searchInput)) {- depots.add(depot);+ protected List<Project> load() {+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);+ List<Project> projects = new ArrayList<>();+ for (Project project: projectManager.findAllAccessible(getLoginUser())) {+ if (project.matches(searchInput)) {+ projects.add(project);}}- depots.sort(Depot::compareLastVisit);- return depots;+ projects.sort(Project::compareLastVisit);+ return projects;}- }, WebConstants.DEFAULT_PAGE_SIZE) {+ }, WebConstants.PAGE_SIZE) {@Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();+ protected void populateItem(ListItem<Project> item) {+ Project project = item.getModelObject();Link<Void> link = new ViewStateAwarePageLink<Void>("link",- DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- link.add(new Label("name", depot.getFQN()));+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ link.add(new Label("name", project.getName()));item.add(link);}});- add(depotsPageNav = new BootstrapAjaxPagingNavigator("depotsPageNav", depotsView) {+ add(projectsPageNav = new BootstrapAjaxPagingNavigator("projectsPageNav", projectsView) {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(depotsView.getPageCount() > 1);+ setVisible(projectsView.getPageCount() > 1);}});- depotsPageNav.setOutputMarkupPlaceholderTag(true);+ projectsPageNav.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer = new WebMarkupContainer("noDepots") {+ add(noProjectsContainer = new WebMarkupContainer("noProjects") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());+ setVisible(projectsView.getModelObject().isEmpty());}});- noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ noProjectsContainer.setOutputMarkupPlaceholderTag(true);}@Override@@ -131,7 +143,7 @@ public class DashboardPage extends LayoutPage {@Overrideprotected Component newContextHead(String componentId) {- return new Label(componentId, "Accessible Repositories");+ return new Label(componentId, "Projects");}}diff --git a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/home/dashboard.cssindex 6c5c03b627..8b586d6a2f 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css+++ b/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css@@ -1,8 +1,8 @@#dashboard {padding: 20px;}-#dashboard .title {- font-size: 18px;+#dashboard .head>div {+ margin-right: 20px;}#dashboard>div, #dashboard>ul {margin-bottom: 20px;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 1d5cd68c1c..e903eb1df7 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@@ -12,8 +12,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.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.init.InitStage;import com.gitplex.server.util.init.ManualConfig;@@ -96,7 +96,7 @@ public class ServerInitPage extends BasePage {@Overrideprotected void finished() {WebSession.get().logout();- Account root = GitPlex.getInstance(AccountManager.class).getRoot();+ User root = GitPlex.getInstance(UserManager.class).getRoot();SecurityUtils.getSubject().runAs(root.getPrincipals());throw new RestartResponseException(WelcomePage.class);}diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.htmlindex 501de87a39..8b3f2e7c13 100644--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html+++ b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html@@ -1,16 +1,8 @@<wicket:extend><div id="welcome">- <div class="title center">Welcome to GitPlex</div>- <p>- GitPlex uses the organization concept to organize users, teams and repositories- in a central place to facilitate collaboration and permission management.- We suggest to <a wicket:id="addOrganization">create an organization</a>- to host shared repositories.- </p>-- <p>- You can also <a wicket:id="addDepot">add repository</a> into your own account- now, and transfer it into an organization later if necessary.- </p>+ <div class="head">Welcome to GitPlex</div>+ <div class="body well">+ You may <a wicket:id="addProject">add a project</a> or <a wicket:id="addUser">add an user</a> now+ </div></div></wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.javaindex e78138100e..980f2c3e7b 100644--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java@@ -2,11 +2,11 @@ package com.gitplex.server.web.page.init;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.overview.NewDepotPage;-import com.gitplex.server.web.page.account.overview.NewOrganizationPage;+import com.gitplex.server.web.page.admin.user.NewUserPage;import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.page.layout.NewProjectPage;@SuppressWarnings("serial")public class WelcomePage extends LayoutPage {@@ -15,11 +15,8 @@ public class WelcomePage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new ViewStateAwarePageLink<Void>("addOrganization", NewOrganizationPage.class,- NewOrganizationPage.paramsOf(getLoginUser())));-- add(new ViewStateAwarePageLink<Void>("addDepot", NewDepotPage.class,- NewDepotPage.paramsOf(getLoginUser())));+ add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class));+ add(new BookmarkablePageLink<Void>("addUser", NewUserPage.class));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/init/welcome.css b/web/src/main/java/com/gitplex/server/web/page/init/welcome.cssindex 64f6b27bf2..56b5e39538 100644--- a/web/src/main/java/com/gitplex/server/web/page/init/welcome.css+++ b/web/src/main/java/com/gitplex/server/web/page/init/welcome.css@@ -1,11 +1,11 @@#welcome {padding: 20px;}-#welcome .title {+#welcome .head {font-size: 24px;font-weight: bold;margin-bottom: 20px;}-#welcome p {+#welcome .body {font-size: 16px;}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.htmldeleted file mode 100644index 2a6fdbae32..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.html+++ /dev/null@@ -1,17 +0,0 @@-<wicket:extend>- <section class="depot create">- <div class="head">Create New Repository</div>- <div class="body">- <form wicket:id="form" class="leave-confirm">- <div class="form-group">- <label class="control-label">Owner <span class="required">*</span></label>- <input wicket:id="owner" type="hidden" class="form-control"></input>- </div>- <div wicket:id="editor"></div>- <div class="actions">- <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>- </div>- </form>- </div>- </section>-</wicket:extend>\ No newline at end of filediff --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.javadeleted file mode 100644index 2344597f10..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java+++ /dev/null@@ -1,89 +0,0 @@-package com.gitplex.server.web.page.layout;--import org.apache.wicket.Session;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.GitPlex;-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;-import com.gitplex.server.web.editable.BeanEditor;-import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;--@SuppressWarnings("serial")-public class CreateDepotPage extends LayoutPage {-- private Long ownerId;-- public CreateDepotPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Depot depot = new Depot();-- BeanEditor<?> editor = BeanContext.editBean("editor", depot);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Account owner = getOwner();- depot.setAccount(owner);- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- Depot depotWithSameName = depotManager.find(owner, depot.getName());- if (depotWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another repository in account '" + owner.getDisplayName() + "'");- } else {- depotManager.save(depot, null, null);- Session.get().success("New repository created");- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- }- }-- };- form.add(editor);-- IModel<Account> choiceModel = new IModel<Account>() {-- @Override- public void detach() {- }-- @Override- public Account getObject() {- return getOwner();- }-- @Override- public void setObject(Account object) {- ownerId = object.getId();- }-- };- form.add(new AccountSingleChoice("owner", choiceModel, new AdministrativeAccountChoiceProvider()).setRequired(true));-- add(form);- }-- private Account getOwner() {- if (ownerId == null)- return getLoginUser();- else- return GitPlex.getInstance(AccountManager.class).load(ownerId);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.htmlindex bc6ab91c7d..cfcbc7aa6d 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html@@ -5,7 +5,7 @@<a wicket:id="home" title="Dashboard"><i class="fa fa-ext fa-gitplex-logo"></i></a></div><div wicket:id="context" class="context pull-left"></div>- <div class="account pull-right">+ <div class="user pull-right"><wicket:enclosure child="login"><div class="logged-out"><a wicket:id="login">Log in</a>@@ -21,7 +21,7 @@</wicket:enclosure></div><div class="actions pull-right">- <a wicket:id="createNewDropdown" title="Create new repository or organization"><i class="fa fa-plus"></i> <i class="fa fa-caret-down"></i></a>+ <a wicket:id="createProject" title="Create new project"><i class="fa fa-plus"></i></a><a wicket:id="docLink" title="Help"><i class="fa fa-question"></i></a></div><div class="search pull-right">@@ -40,27 +40,8 @@</div></div></div>- <wicket:fragment wicket:id="createNewFrag">- <div class="create-new">- <a wicket:id="createNewDepot">Create new repository</a>- <a wicket:id="createNewOrganization">Create new organization</a>- </div>- </wicket:fragment><wicket:fragment wicket:id="userMenuFrag"><div class="user">- <wicket:enclosure child="organizations">- <div class="organizations">- <div class="title">Organizations</div>- <ul class="list-unstyled">- <li wicket:id="organizations">- <a wicket:id="link">- <img wicket:id="avatar"></img>- <span wicket:id="name"></span>- </a>- </li>- </ul>- </div>- </wicket:enclosure><a wicket:id="administration"><i class="fa fa-fw fa-wrench"></i> Server administration</a><a wicket:id="profile"><i class="fa fa-fw fa-gear"></i> My profile</a><a wicket:id="logout"><i class="fa fa-fw fa-sign-out"></i> Logout</a>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 8e83a6fd44..3b39e265d4 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@@ -2,15 +2,11 @@ package com.gitplex.server.web.page.layout;import java.text.SimpleDateFormat;import java.util.Collection;-import java.util.Collections;-import java.util.List;-import java.util.stream.Collectors;import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -19,32 +15,27 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;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.manager.ConfigManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.avatar.Avatar;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.account.overview.NewOrganizationPage;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;-import com.gitplex.server.web.page.account.tasks.TaskListPage;import com.gitplex.server.web.page.admin.SystemSettingPage;import com.gitplex.server.web.page.base.BasePage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.security.LoginPage;import com.gitplex.server.web.page.security.LogoutPage;import com.gitplex.server.web.page.security.RegisterPage;+import com.gitplex.server.web.page.user.TaskListPage;+import com.gitplex.server.web.page.user.UserProfilePage;import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.TaskChangedRegion;import com.gitplex.server.web.websocket.WebSocketRegion;@@ -72,26 +63,19 @@ public abstract class LayoutPage extends BasePage {head.add(newContextHead("context"));- if (isLoggedIn()) {- head.add(new DropdownLink("createNewDropdown") {+ head.add(new ViewStateAwarePageLink<Void>("createProject", NewProjectPage.class) {- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "createNewFrag", LayoutPage.this);- fragment.add(new ViewStateAwarePageLink<Void>("createNewDepot", CreateDepotPage.class));- fragment.add(new ViewStateAwarePageLink<Void>("createNewOrganization",- NewOrganizationPage.class, NewOrganizationPage.paramsOf(getLoginUser())));- return fragment;- }-- });- } else {- head.add(new WebMarkupContainer("createNewDropdown").setVisible(false));- }+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canCreateProjects());+ }++ });head.add(new ExternalLink("docLink", GitPlex.getInstance().getDocLink()));- Account user = getLoginUser();+ User user = getLoginUser();boolean signedIn = user != null;head.add(new Link<Void>("login") {@@ -136,36 +120,15 @@ public abstract class LayoutPage extends BasePage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {Fragment fragment = new Fragment(id, "userMenuFrag", LayoutPage.this);- List<Account> organizations = SecurityUtils.getAccount().getOrganizations()- .stream()- .map(membership->membership.getOrganization())- .collect(Collectors.toList());- Collections.sort(organizations);- RepeatingView organizationsView = new RepeatingView("organizations");- fragment.add(organizationsView);-- if (!organizations.isEmpty()) {- for (Account organization: organizations) {- WebMarkupContainer item = new WebMarkupContainer(organizationsView.newChildId());- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- AccountOverviewPage.class, AccountOverviewPage.paramsOf(organization));- link.add(new Avatar("avatar", organization));- link.add(new Label("name", organization.getDisplayName()));- item.add(link);- organizationsView.add(item);- }- } else {- organizationsView.setVisible(false);- }-- fragment.add(new ViewStateAwarePageLink<Void>("profile", ProfileEditPage.class, ProfileEditPage.paramsOf(user)));+ fragment.add(new ViewStateAwarePageLink<Void>("profile",+ UserProfilePage.class, UserProfilePage.paramsOf(user)));fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class) {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManageSystem());+ setVisible(SecurityUtils.isAdministrator());}});@@ -221,23 +184,10 @@ public abstract class LayoutPage extends BasePage {}@Nullable- protected Account getAccount() {- return getLoginUser();- }-- @Nullable- protected Depot getDepot() {+ protected Project getProject() {return null;}- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(account));- }-- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));- }-@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.htmlsimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.htmlindex 23ac58de88..fe86bd870f 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.html@@ -1,6 +1,6 @@<wicket:extend>- <section id="user-add">- <div class="head">Add New User Account</div>+ <section id="project-add">+ <div class="head">Create New Project</div><div class="body"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.javanew file mode 100644index 0000000000..00f4062e45--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.java@@ -0,0 +1,54 @@+package com.gitplex.server.web.page.layout;++import org.apache.wicket.Session;+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.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public class NewProjectPage extends LayoutPage {++ public NewProjectPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Project project = new Project();++ BeanEditor<?> editor = BeanContext.editBean("editor", project);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);+ Project projectWithSameName = projectManager.find(project.getName());+ if (projectWithSameName != null) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another project");+ } else {+ projectManager.save(project, null);+ Session.get().success("New project created");+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ }+ }++ };+ form.add(editor);++ add(form);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/layout.css b/web/src/main/java/com/gitplex/server/web/page/layout/layout.cssindex 739c215847..87d353a902 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/layout.css+++ b/web/src/main/java/com/gitplex/server/web/page/layout/layout.css@@ -45,30 +45,30 @@ html, body {#main>.head>.actions a .fa {font-size: 18px;}-#main>.head>.account {+#main>.head>.user {margin-right: 0;}-#main>.head>.account>.logged-in>.tasks {+#main>.head>.user>.logged-in>.tasks {color: #69B7F7;margin-right: 16px;}-#main>.head>.account>.logged-in>a, #main>.head>.account>.logged-in>span {+#main>.head>.user>.logged-in>a, #main>.head>.user>.logged-in>span {margin-right: 8px;font-size: 20px;}-#main>.head>.account>.logged-in>.menu {+#main>.head>.user>.logged-in>.menu {margin-right: 8px;}-#main>.head>.account>.logged-out {+#main>.head>.user>.logged-out {padding-top: 4px;}-#main>.head>.account>.logged-out a {+#main>.head>.user>.logged-out a {font-size: 16px;}-#main>.head>.account>.logged-out>a:FIRST-CHILD {+#main>.head>.user>.logged-out>a:FIRST-CHILD {margin-right: 16px;}-#main>.head>.account .avatar {+#main>.head>.user .avatar {width: 32px;height: 32px;}@@ -130,20 +130,7 @@ section>.head {margin-bottom: 20px;}-.floating>.content>.create-new {- padding: 12px;-}-.floating>.content>.create-new>a {- display: block;- text-decoration: none;- color: #444;- padding: 4px 8px;-}-.floating>.content>.create-new>a:hover {- background: #F0F0F0;-}--.create.depot {+#project-add {padding: 20px;}@@ -159,15 +146,3 @@ section>.head {.floating>.content>.user a:hover {background: #F2F2F2;}-.floating>.content>.user .organizations .title {- color: #999;- font-size: 16px;- padding: 0 12px 4px 12px;-}-.floating>.content>.user .organizations {- border-bottom: 1px solid #DDD;- margin-bottom: 8px;-}-.floating>.content>.user .organizations .avatar {- margin-right: 4px;-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.htmlsimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.htmlindex f8827e9dc2..6aa413ae7d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.html@@ -1,8 +1,8 @@<wicket:extend><section id="no-branches">- <div class="head">Repository does not have any branches yet</div>+ <div class="head">Project does not have any branches yet</div><div class="body">- <div><i class="fa fa-hand-o-right"></i> You may initialize the repository from command line:</div>+ <div><i class="fa fa-hand-o-right"></i> You may initialize code of the project from command line:</div><ul class="list-unstyled"><li>touch README.md</li><li>git init</li>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.javanew file mode 100644index 0000000000..1c4c104598--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java@@ -0,0 +1,36 @@+package com.gitplex.server.web.page.project;++import org.apache.wicket.RestartResponseException;+import org.apache.wicket.markup.head.CssHeaderItem;+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.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public class NoBranchesPage extends ProjectPage {++ public NoBranchesPage(PageParameters params) {+ super(params);++ if (getProject().getDefaultBranch() != null)+ throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("url1", getProject().getUrl()));+ add(new Label("url2", getProject().getUrl()));+ add(new Label("url3", getProject().getUrl()));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new NoBranchesResourceReference()));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.javasimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.javaindex a4abe1ee22..bcf4f83fa3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot;+package com.gitplex.server.web.page.project;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.htmlnew file mode 100644index 0000000000..4842c12dc1--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html@@ -0,0 +1,24 @@+<wicket:extend>+ <div id="project">+ <div class="sidebar">+ <table>+ <tr>+ <td wicket:id="sidebar" class="nav">+ <a class="mini-toggle"><span></span></a>+ <ul wicket:id="projectTabs" class="tabs list-unstyled"></ul>+ </td>+ <td class="content">+ <wicket:child></wicket:child>+ </td>+ </tr>+ </table>+ </div>+ </div>+ <wicket:fragment wicket:id="contextHeadFrag">+ <div id="project-head" class="clearfix">+ <span class="pull-left">Project - </span>+ <span wicket:id="projectName" class="pull-left"></span>+ <a wicket:id="projectMoreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a>+ </div>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.javanew file mode 100644index 0000000000..8d42dae07b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java@@ -0,0 +1,204 @@+package com.gitplex.server.web.page.project;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.persistence.EntityNotFoundException;+import javax.servlet.http.Cookie;++import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.ObjectId;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.tabbable.PageTab;+import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.commit.ProjectCommitsPage;+import com.gitplex.server.web.page.project.compare.RevisionComparePage;+import com.gitplex.server.web.page.project.moreinfo.MoreInfoPanel;+import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;+import com.gitplex.server.web.page.project.setting.general.GeneralSettingPage;+import com.gitplex.server.web.page.project.tags.ProjectTagsPage;+import com.google.common.base.Preconditions;++@SuppressWarnings("serial")+public abstract class ProjectPage extends LayoutPage {++ private static final String PARAM_DEPOT = "project";++ protected final IModel<Project> projectModel;++ public static PageParameters paramsOf(Project project) {+ PageParameters params = new PageParameters();+ params.set(PARAM_DEPOT, project.getName());+ return params;+ }++ public ProjectPage(PageParameters params) {+ super(params);++ String projectName = params.get(PARAM_DEPOT).toString();+ Preconditions.checkNotNull(projectName);++ if (projectName.endsWith(Constants.DOT_GIT_EXT))+ projectName = projectName.substring(0, projectName.length() - Constants.DOT_GIT_EXT.length());++ Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);++ if (project == null)+ throw new EntityNotFoundException("Unable to find project " + projectName);++ Long projectId = project.getId();++ projectModel = new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ Project project = GitPlex.getInstance(ProjectManager.class).load(projectId);++ /*+ * Give child page a chance to cache object id of known revisions upon+ * loading the project object+ */+ for (Map.Entry<String, ObjectId> entry: getObjectIdCache().entrySet()) {+ project.cacheObjectId(entry.getKey(), entry.getValue());+ }+ return project;+ }++ };++ // we do not need to reload the project this time as we already have that object on hand+ projectModel.setObject(project);++ if (!(this instanceof NoBranchesPage)+ && !(this instanceof ProjectSettingPage)+ && getProject().getDefaultBranch() == null) {+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));+ }+ }++ protected Map<String, ObjectId> getObjectIdCache() {+ return new HashMap<>();+ }++ @Override+ protected void onAfterRender() {+ super.onAfterRender();+ if (getLoginUser() != null)+ GitPlex.getInstance(VisitInfoManager.class).visit(getLoginUser(), getProject());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));+ tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,+ ProjectCommitsPage.class, CommitDetailPage.class));+ tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",+ 0, ProjectBranchesPage.class));+ tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",+ 0, ProjectTagsPage.class));++ tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",+ 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class));++ tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));++ if (SecurityUtils.canManage(getProject()))+ tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));++ WebMarkupContainer sidebar = new WebMarkupContainer("sidebar");+ add(sidebar);++ /*+ * Add mini class here instead of project.js as we want the sidebar to+ * be minimized initially even if the page takes some time to load+ */+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie("project.miniSidebar");+ if (cookie != null && "yes".equals(cookie.getValue()))+ sidebar.add(AttributeAppender.append("class", " mini"));++ sidebar.add(new Tabbable("projectTabs", tabs));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new ProjectResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.project();"));+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canRead(getProject());+ }++ @Override+ public Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }++ @Override+ protected Component newContextHead(String componentId) {+ Fragment fragment = new Fragment(componentId, "contextHeadFrag", this);+ fragment.add(new Label("projectName", getProject().getName()));+ fragment.add(new DropdownLink("projectMoreInfo") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new MoreInfoPanel(id, projectModel) {++ @Override+ protected void onPromptForkOption(AjaxRequestTarget target) {+ dropdown.close();+ }++ };+ }++ });+ return fragment;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectResourceReference.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/ProjectResourceReference.javaindex 26c51e722f..1815ebcfb4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot;+package com.gitplex.server.web.page.project;import java.util.List;@@ -10,19 +10,19 @@ import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class DepotResourceReference extends BaseDependentResourceReference {+public class ProjectResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public DepotResourceReference() {- super(DepotResourceReference.class, "depot.js");+ public ProjectResourceReference() {+ super(ProjectResourceReference.class, "project.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(DepotResourceReference.class, "depot.css")));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ProjectResourceReference.class, "project.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectTab.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectTab.javanew file mode 100644index 0000000000..b991a7e639--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectTab.java@@ -0,0 +1,91 @@+package com.gitplex.server.web.page.project;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import com.gitplex.server.web.component.tabbable.PageTab;++@SuppressWarnings("serial")+public class ProjectTab extends PageTab {++ private final String iconClass;++ private final int count;++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass) {+ super(titleModel, mainPageClass);+ this.iconClass = iconClass;+ this.count = count;+ }++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass,+ Class<? extends ProjectPage> additionalPageClass1) {+ super(titleModel, mainPageClass, additionalPageClass1);+ this.iconClass = iconClass;+ this.count = count;+ }++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass,+ Class<? extends ProjectPage> additionalPageClass1,+ Class<? extends ProjectPage> additionalPageClass2) {+ super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2);+ this.iconClass = iconClass;+ this.count = count;+ }++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass,+ Class<? extends ProjectPage> additionalPageClass1,+ Class<? extends ProjectPage> additionalPageClass2,+ Class<? extends ProjectPage> additionalPageClass3) {+ super(titleModel, mainPageClass, additionalPageClass1,+ additionalPageClass2, additionalPageClass3);+ this.iconClass = iconClass;+ this.count = count;+ }++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass,+ Class<? extends ProjectPage> additionalPageClass1,+ Class<? extends ProjectPage> additionalPageClass2,+ Class<? extends ProjectPage> additionalPageClass3,+ Class<? extends ProjectPage> additionalPageClass4) {+ super(titleModel, mainPageClass, additionalPageClass1,+ additionalPageClass2, additionalPageClass3, additionalPageClass4);+ this.iconClass = iconClass;+ this.count = count;+ }++ public ProjectTab(IModel<String> titleModel, String iconClass, int count,+ Class<? extends ProjectPage> mainPageClass,+ Class<? extends ProjectPage> additionalPageClass1,+ Class<? extends ProjectPage> additionalPageClass2,+ Class<? extends ProjectPage> additionalPageClass3,+ Class<? extends ProjectPage> additionalPageClass4,+ Class<? extends ProjectPage> additionalPageClass5) {+ super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2,+ additionalPageClass3, additionalPageClass4, additionalPageClass5);+ this.iconClass = iconClass;+ this.count = count;+ }++ public String getIconClass() {+ return iconClass;+ }++ /**+ * @return the count+ */+ public int getCount() {+ return count;+ }++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.html b/web/src/main/java/com/gitplex/server/web/page/project/ProjectTabLink.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/ProjectTabLink.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectTabLink.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.javarename to web/src/main/java/com/gitplex/server/web/page/project/ProjectTabLink.javaindex 608dbb47e9..f7dd1e1b2b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot;+package com.gitplex.server.web.page.project;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -9,11 +9,11 @@ import org.apache.wicket.markup.html.panel.Panel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;@SuppressWarnings("serial")-public class DepotTabLink extends Panel {+public class ProjectTabLink extends Panel {- private final DepotTab tab;+ private final ProjectTab tab;- public DepotTabLink(String id, DepotTab tab) {+ public ProjectTabLink(String id, ProjectTab tab) {super(id);this.tab = tab;@@ -23,9 +23,9 @@ public class DepotTabLink extends Panel {protected void onInitialize() {super.onInitialize();- DepotPage page = (DepotPage) getPage();+ ProjectPage page = (ProjectPage) getPage();Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), DepotPage.paramsOf(page.getDepot()));+ tab.getMainPageClass(), ProjectPage.paramsOf(page.getProject()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("text", tab.getTitleModel()));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.javasimilarity index 89%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.javaindex df17fcb260..e5f5592208 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob;+package com.gitplex.server.web.page.project.blob;import java.util.ArrayList;import java.util.Collection;@@ -26,12 +26,12 @@ import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.exception.NotTreeException;import com.gitplex.server.git.exception.ObjectAlreadyExistsException;import com.gitplex.server.git.exception.ObsoleteCommitException;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.dropzonefield.DropzoneField;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;@@ -92,7 +92,7 @@ abstract class BlobUploadPanel extends Panel {if (context.getBlobIdent().path != null)blobPath = context.getBlobIdent().path + "/" + blobPath;- if (!reviewManager.canModify(SecurityUtils.getAccount(), context.getDepot(),+ if (!reviewManager.canModify(SecurityUtils.getUser(), context.getProject(),context.getBlobIdent().revision, blobPath)) {form.error("Adding of file '" + blobPath + "' need to be reviewed. "+ "Please submit pull request instead");@@ -112,14 +112,14 @@ abstract class BlobUploadPanel extends Panel {if (StringUtils.isNotBlank(detailCommitMessage))commitMessage += "\n\n" + detailCommitMessage;- Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());+ User user = Preconditions.checkNotNull(GitPlex.getInstance(UserManager.class).getCurrent());- ObjectId prevCommitId = context.getDepot().getObjectId(context.getBlobIdent().revision);+ ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision);ObjectId newCommitId = null;while (newCommitId == null) {try {- newCommitId = blobEdits.commit(context.getDepot().getRepository(), refName, prevCommitId,+ newCommitId = blobEdits.commit(context.getProject().getRepository(), refName, prevCommitId,prevCommitId, user.asPerson(), commitMessage);} catch (ObjectAlreadyExistsException e) {form.error(e.getMessage());diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.htmlsimilarity index 87%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.htmlindex bf947b71ef..bc500b6df6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.html@@ -1,12 +1,12 @@<wicket:extend>- <div id="depot-blob">+ <div id="project-blob"><div class="head clearfix"><a wicket:id="revisionPicker" class="revision-picker pull-left"></a><div wicket:id="blobNavigator" class="blob-navigator pull-left"></div><div wicket:id="blobOperations" class="operations"><a wicket:id="history" title="Commit history of current path">History</a><a wicket:id="add" title="Add files to current directory">Add <i class="fa fa-caret-down"></i></a>- <a wicket:id="download" title="Download archive of whole repository at this revision">Download <i class="fa fa-caret-down"></i></a>+ <a wicket:id="download" title="Download code archive of whole project at this revision">Download <i class="fa fa-caret-down"></i></a><a wicket:id="search" title="Search files, symbols and texts">Search <i class="fa fa-caret-down"></i></a></div></div>diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.javaindex 216810117f..0b8a83258b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob;+package com.gitplex.server.web.page.project.blob;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -51,10 +51,10 @@ import com.gitplex.server.event.RefUpdated;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.CodeCommentManager;-import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.persistence.UnitOfWork;@@ -75,17 +75,17 @@ import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.component.revisionpicker.RevisionPicker;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.blob.navigator.BlobNavigator;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.view.Markable;-import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;-import com.gitplex.server.web.page.depot.blob.search.advanced.AdvancedSearchPanel;-import com.gitplex.server.web.page.depot.blob.search.quick.QuickSearchPanel;-import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.navigator.BlobNavigator;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.view.Markable;+import com.gitplex.server.web.page.project.blob.search.SearchMenuContributor;+import com.gitplex.server.web.page.project.blob.search.advanced.AdvancedSearchPanel;+import com.gitplex.server.web.page.project.blob.search.quick.QuickSearchPanel;+import com.gitplex.server.web.page.project.blob.search.result.SearchResultPanel;+import com.gitplex.server.web.page.project.commit.ProjectCommitsPage;import com.gitplex.server.web.util.resource.RawBlobResourceReference;import com.gitplex.server.web.websocket.CodeCommentChangedRegion;import com.gitplex.server.web.websocket.CommitIndexedRegion;@@ -97,7 +97,7 @@ import com.google.common.base.Objects;import com.google.common.base.Preconditions;@SuppressWarnings("serial")-public class DepotBlobPage extends DepotPage implements BlobRenderContext {+public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {private static final String PARAM_REVISION = "revision";@@ -129,11 +129,11 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {private AbstractPostAjaxBehavior ajaxBehavior;- public DepotBlobPage(PageParameters params) {+ public ProjectBlobPage(PageParameters params) {super(params);- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));List<String> revisionAndPathSegments = new ArrayList<>();String segment = params.get(PARAM_REVISION).toString();@@ -149,14 +149,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {revisionAndPathSegments.add(segment);}- BlobIdent blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);+ BlobIdent blobIdent = new BlobIdent(getProject(), revisionAndPathSegments);state = new State(blobIdent);String modeStr = params.get(PARAM_MODE).toString();if (modeStr != null)state.mode = Mode.valueOf(modeStr.toUpperCase());- resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);+ resolvedRevision = getProject().getObjectId(state.blobIdent.revision);state.mark = TextRange.of(params.get(PARAM_MARK).toString());@@ -173,7 +173,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {String path = state.blobIdent.path;if (path != null && state.blobIdent.isTree())path += "/";- if (!SecurityUtils.canModify(getDepot(), state.blobIdent.revision, path))+ if (!SecurityUtils.canModify(getProject(), state.blobIdent.revision, path))unauthorized();}@@ -198,7 +198,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overrideprotected void onInitialize() {super.onInitialize();- add(new NoAntiCacheImage("icon", new PackageResourceReference(DepotBlobPage.class, "indexing.gif")));+ add(new NoAntiCacheImage("icon", new PackageResourceReference(ProjectBlobPage.class, "indexing.gif")));setOutputMarkupPlaceholderTag(true);}@@ -206,10 +206,10 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {protected void onConfigure() {super.onConfigure();- RevCommit commit = getDepot().getRevCommit(resolvedRevision);+ RevCommit commit = getProject().getRevCommit(resolvedRevision);IndexManager indexManager = GitPlex.getInstance(IndexManager.class);- if (!indexManager.isIndexed(getDepot(), commit)) {- GitPlex.getInstance(IndexManager.class).indexAsync(getDepot(), commit);+ if (!indexManager.isIndexed(getProject(), commit)) {+ GitPlex.getInstance(IndexManager.class).indexAsync(getProject(), commit);setVisible(true);} else {setVisible(false);@@ -232,7 +232,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {.build();try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- queryHits = searchManager.search(depotModel.getObject(), getDepot().getRevCommit(resolvedRevision),+ queryHits = searchManager.search(projectModel.getObject(), getProject().getRevCommit(resolvedRevision),query);} catch (InterruptedException e) {throw new RuntimeException(e);@@ -369,7 +369,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new BlobUploadPanel(id, DepotBlobPage.this) {+ return new BlobUploadPanel(id, ProjectBlobPage.this) {@Overridevoid onCancel(AjaxRequestTarget target) {@@ -378,7 +378,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overridevoid onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- DepotBlobPage.this.onCommitted(target, oldCommit, newCommit);+ ProjectBlobPage.this.onCommitted(target, oldCommit, newCommit);modal.close();}@@ -396,7 +396,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {protected void onConfigure() {super.onConfigure();setVisible((state.mode == Mode.VIEW || state.mode == Mode.BLAME)- && isOnBranch() && state.blobIdent.isTree() && SecurityUtils.canWrite(getDepot()));+ && isOnBranch() && state.blobIdent.isTree() && SecurityUtils.canWrite(getProject()));}});@@ -487,14 +487,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {});- DepotCommitsPage.State commitsState = new DepotCommitsPage.State();+ ProjectCommitsPage.State commitsState = new ProjectCommitsPage.State();commitsState.compareWith = resolvedRevision.name();if (state.blobIdent.path != null)- commitsState.query = String.format("path(%s)", DepotBlobPage.this.state.blobIdent.path);- blobOperations.add(new ViewStateAwarePageLink<Void>("history", DepotCommitsPage.class,- DepotCommitsPage.paramsOf(getDepot(), commitsState)));+ commitsState.query = String.format("path(%s)", ProjectBlobPage.this.state.blobIdent.path);+ blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,+ ProjectCommitsPage.paramsOf(getProject(), commitsState)));- blobOperations.add(new ArchiveMenuLink("download", depotModel) {+ blobOperations.add(new ArchiveMenuLink("download", projectModel) {@Overrideprotected String getRevision() {@@ -518,7 +518,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}private QuickSearchPanel newQuickSearchPanel(String id, ModalPanel modal) {- return new QuickSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {+ return new QuickSearchPanel(id, projectModel, new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -531,7 +531,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {protected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.this.onSelect(target, selected, hit.getTokenPos());+ ProjectBlobPage.this.onSelect(target, selected, hit.getTokenPos());modal.close();}@@ -551,7 +551,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}private AdvancedSearchPanel newAdvancedSearchPanel(String id, ModalPanel modal) {- return new AdvancedSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {+ return new AdvancedSearchPanel(id, projectModel, new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -599,20 +599,20 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);+ PageParameters params = paramsOf(getProject(), state);+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);pushState(target, url.toString(), state);}private void newRevisionPicker(@Nullable AjaxRequestTarget target) {- Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, depotModel, state.blobIdent.revision, true) {+ Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, projectModel, state.blobIdent.revision, true) {@Overrideprotected String getRevisionUrl(String revision) {BlobIdent blobIdent = new BlobIdent(revision, null, FileMode.TREE.getBits());State state = new State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);- return urlFor(DepotBlobPage.class, params).toString();+ PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);+ return urlFor(ProjectBlobPage.class, params).toString();}@Override@@ -620,9 +620,9 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {BlobIdent newBlobIdent = new BlobIdent(state.blobIdent);newBlobIdent.revision = revision;if (newBlobIdent.path != null) {- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = getDepot().getRevCommit(revision, true).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), newBlobIdent.path, revTree);+ try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {+ RevTree revTree = getProject().getRevCommit(revision, true).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getProject().getRepository(), newBlobIdent.path, revTree);if (treeWalk != null) {newBlobIdent.mode = treeWalk.getRawMode(0);} else {@@ -634,7 +634,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}}- DepotBlobPage.this.onSelect(target, newBlobIdent, null);+ ProjectBlobPage.this.onSelect(target, newBlobIdent, null);}};@@ -662,7 +662,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {* resolved to existing value of resolvedRevision*/resolvedRevision = null;- resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);+ resolvedRevision = getProject().getObjectId(state.blobIdent.revision);GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);newRevisionPicker(target);@@ -677,32 +677,32 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new DepotBlobResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ProjectBlobResourceReference()));String callback = ajaxBehavior.getCallbackFunction(explicit("action")).toString();- String script = String.format("gitplex.server.depotBlob.onDomReady(%s);", callback);+ String script = String.format("gitplex.server.projectBlob.onDomReady(%s);", callback);response.render(OnDomReadyHeaderItem.forScript(script));- response.render(OnLoadHeaderItem.forScript("gitplex.server.depotBlob.onWindowLoad();"));+ response.render(OnLoadHeaderItem.forScript("gitplex.server.projectBlob.onWindowLoad();"));}public static PageParameters paramsOf(CodeComment comment) {BlobIdent blobIdent = new BlobIdent(comment.getCommentPos().getCommit(), comment.getCommentPos().getPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.requestId = comment.getRequest().getId();state.commentId = comment.getId();state.mark = comment.getCommentPos().getRange();- return paramsOf(comment.getRequest().getTargetDepot(), state);+ return paramsOf(comment.getRequest().getTargetProject(), state);}- public static PageParameters paramsOf(Depot depot, BlobIdent blobIdent) {- return paramsOf(depot, new State(blobIdent));+ public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {+ return paramsOf(project, new State(blobIdent));}- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, State state) {+ PageParameters params = paramsOf(project);if (state.blobIdent.revision != null)params.set(PARAM_REVISION, state.blobIdent.revision);@@ -735,13 +735,13 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {};if (target != null) {target.appendJavaScript(""- + "$('#depot-blob>.search-result').show(); "- + "$('#depot-blob .search-result>.body').focus();");+ + "$('#project-blob>.search-result').show(); "+ + "$('#project-blob .search-result>.body').focus();");}} else {content = new WebMarkupContainer("content").setOutputMarkupId(true);if (target != null)- target.appendJavaScript("$('#depot-blob>.search-result').hide();");+ target.appendJavaScript("$('#project-blob>.search-result').hide();");elsesearchResult.add(AttributeAppender.replace("style", "display: none;"));}@@ -775,11 +775,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {partialPageRequestHandler.appendJavaScript("$(window).resize();");}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotBlobPage.class, paramsOf(depot));- }-@Overridepublic BlobIdent getBlobIdent() {return state.blobIdent;@@ -802,8 +797,8 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {markState.blobIdent.revision = resolvedRevision.name();markState.commentId = null;markState.mark = mark;- PageParameters params = paramsOf(getDepot(), markState);- return RequestCycle.get().urlFor(DepotBlobPage.class, params).toString();+ PageParameters params = paramsOf(getProject(), markState);+ return RequestCycle.get().urlFor(ProjectBlobPage.class, params).toString();}@Override@@ -871,12 +866,12 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overridepublic boolean isOnBranch() {- return getDepot().getBranchRef(state.blobIdent.revision) != null;+ return getProject().getBranchRef(state.blobIdent.revision) != null;}@Overridepublic RevCommit getCommit() {- return getDepot().getRevCommit(resolvedRevision);+ return getProject().getRevCommit(resolvedRevision);}@Override@@ -887,7 +882,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(getDepot().getRevCommit(resolvedRevision)));+ regions.add(new CommitIndexedRegion(getProject().getRevCommit(resolvedRevision)));if (state.requestId != null)regions.add(new PullRequestChangedRegion(state.requestId));if (state.commentId != null)@@ -943,21 +938,21 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overridepublic void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {String refName = GitUtils.branch2ref(state.blobIdent.revision);- Depot depot = getDepot();+ Project project = getProject();String branch = state.blobIdent.revision;BlobIdent newBlobIdent;- getDepot().cacheObjectId(branch, newCommit);+ getProject().cacheObjectId(branch, newCommit);Subject subject = SecurityUtils.getSubject();- Long depotId = depot.getId();+ Long projectId = project.getId();ObjectId oldCommitId = oldCommit.copy();ObjectId newCommitId = newCommit.copy();if (state.mode == Mode.DELETE) {- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = getDepot().getRevCommit(newCommit).getTree();+ try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {+ RevTree revTree = getProject().getRevCommit(newCommit).getTree();String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");- while (TreeWalk.forPath(getDepot().getRepository(), parentPath, revTree) == null) {+ while (TreeWalk.forPath(getProject().getRepository(), parentPath, revTree) == null) {if (parentPath.contains("/")) {parentPath = StringUtils.substringBeforeLast(parentPath, "/");} else {@@ -982,9 +977,9 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {public void run() {ThreadContext.bind(subject);try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);- depot.cacheObjectId(branch, newCommitId);- RefUpdated event = new RefUpdated(depot, refName, oldCommitId, newCommitId);+ Project project = GitPlex.getInstance(ProjectManager.class).load(projectId);+ project.cacheObjectId(branch, newCommitId);+ RefUpdated event = new RefUpdated(project, refName, oldCommitId, newCommitId);GitPlex.getInstance(ListenerRegistry.class).post(event);} finally {ThreadContext.unbindSubject();@@ -1032,11 +1027,11 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {public String getAutosaveKey() {if (state.mode == Mode.ADD) {return String.format("autosave:addBlob:%d:%s:%s",- getDepot().getId(), state.blobIdent.revision, getNewPath());+ getProject().getId(), state.blobIdent.revision, getNewPath());} else if (state.mode == Mode.EDIT) {return String.format("autosave:editBlob:%d:%s:%s:%s",- getDepot().getId(), state.blobIdent.revision,- state.blobIdent.path, getDepot().getBlob(state.blobIdent).getBlobId());+ getProject().getId(), state.blobIdent.revision,+ state.blobIdent.path, getProject().getBlob(state.blobIdent).getBlobId());} else {throw new IllegalStateException();}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobResourceReference.javasimilarity index 72%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobResourceReference.javaindex ec74c75c8f..418d224ae3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob;+package com.gitplex.server.web.page.project.blob;import java.util.List;@@ -11,12 +11,12 @@ import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class DepotBlobResourceReference extends BaseDependentResourceReference {+public class ProjectBlobResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public DepotBlobResourceReference() {- super(DepotBlobResourceReference.class, "depot-blob.js");+ public ProjectBlobResourceReference() {+ super(ProjectBlobResourceReference.class, "project-blob.js");}@Override@@ -25,7 +25,7 @@ public class DepotBlobResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(CssHeaderItem.forReference(- new BaseDependentCssResourceReference(DepotBlobResourceReference.class, "depot-blob.css")));+ new BaseDependentCssResourceReference(ProjectBlobResourceReference.class, "project-blob.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/RevisionResolved.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/RevisionResolved.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/RevisionResolved.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/RevisionResolved.javaindex 3e3627e847..6ec6c8c44a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/RevisionResolved.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/RevisionResolved.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob;+package com.gitplex.server.web.page.project.blob;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.eclipse.jgit.lib.ObjectId;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/hgrabber.png b/web/src/main/java/com/gitplex/server/web/page/project/blob/hgrabber.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/hgrabber.pngrename to web/src/main/java/com/gitplex/server/web/page/project/blob/hgrabber.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/indexing.gif b/web/src/main/java/com/gitplex/server/web/page/project/blob/indexing.gifsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/indexing.gifrename to web/src/main/java/com/gitplex/server/web/page/project/blob/indexing.gifdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNameChanging.javasimilarity index 83%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNameChanging.javaindex 7d1de88874..24f9705525 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNameChanging.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.navigator;+package com.gitplex.server.web.page.project.blob.navigator;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.javaindex 762cc78405..1b16e840e4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.navigator;+package com.gitplex.server.web.page.project.blob.navigator;import java.util.ArrayList;import java.util.Iterator;@@ -45,9 +45,9 @@ import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.google.common.base.Splitter;@@ -117,9 +117,9 @@ public class BlobNavigator extends Panel {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotBlobPage.class, params));+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));}};@@ -131,7 +131,7 @@ public class BlobNavigator extends Panel {elselink.add(new Label("label", blobIdent.path));} else {- link.add(new Label("label", context.getDepot().getName()));+ link.add(new Label("label", context.getProject().getName()));}item.add(link);@@ -154,7 +154,7 @@ public class BlobNavigator extends Panel {@Overridepublic Iterator<? extends BlobIdent> getRoots() {- return context.getDepot().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();+ return context.getProject().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();}@Override@@ -164,7 +164,7 @@ public class BlobNavigator extends Panel {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent blobIdent) {- return context.getDepot().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();+ return context.getProject().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();}@Override@@ -184,7 +184,7 @@ public class BlobNavigator extends Panel {public void expand(BlobIdent blobIdent) {super.expand(blobIdent);- List<BlobIdent> children = context.getDepot().getChildren(blobIdent, BlobIdentFilter.ALL);+ List<BlobIdent> children = context.getProject().getChildren(blobIdent, BlobIdentFilter.ALL);if (children.size() == 1 && children.get(0).isTree())expand(children.get(0));}@@ -214,9 +214,9 @@ public class BlobNavigator extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State(model.getObject());- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotBlobPage.class, params));+ ProjectBlobPage.State state = new ProjectBlobPage.State(model.getObject());+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));}};diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.javaindex a68a2a5628..01335c438c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.navigator;+package com.gitplex.server.web.page.project.blob.navigator;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-down.png b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/arrow-down.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-down.pngrename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/arrow-down.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-right.png b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/arrow-right.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-right.pngrename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/arrow-right.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/blob-navigator.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/blob-navigator.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/blob-navigator.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/blob-navigator.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.csssimilarity index 65%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.cssindex 360eda7b60..5a1e3cf3ca 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.css@@ -1,33 +1,33 @@-#depot-blob>.head {+#project-blob>.head {border-bottom: 1px solid #BBB;height: 31px;}-#depot-blob>.head>.revision-picker {+#project-blob>.head>.revision-picker {padding: 0;}-#depot-blob>.head>.comment-context {+#project-blob>.head>.comment-context {border-right: 1px solid #BBB;padding: 5px 8px 0 8px;height: 31px;cursor: pointer;}-#depot-blob>.head>a.revision-picker {+#project-blob>.head>a.revision-picker {display: block;border-right: 1px solid #BBB;color: #333;text-decoration: none;}-#depot-blob>.head>a.revision-picker:hover {+#project-blob>.head>a.revision-picker:hover {background: #EEE;clear: both;}-#depot-blob>.head>a.revision-picker, #depot-blob>.head>.blob-navigator, #depot-blob>.blob-navigator>div {+#project-blob>.head>a.revision-picker, #project-blob>.head>.blob-navigator, #project-blob>.blob-navigator>div {padding: 5px 8px;}-#depot-blob>.head>.blob-navigator, #depot-blob>.blob-navigator>div {+#project-blob>.head>.blob-navigator, #project-blob>.blob-navigator>div {padding: 5px 8px 0px 8px;}-#depot-blob>.head>.blob-navigator form.name input {+#project-blob>.head>.blob-navigator form.name input {height: 30px;border: 1px solid #BBB;border-top: none;@@ -37,10 +37,10 @@padding-left: 0px 8px;width: 160px;}-#depot-blob>.blob-navigator {+#project-blob>.blob-navigator {border-bottom: 1px solid #BBB;}-#depot-blob>.blob-navigator form.name input {+#project-blob>.blob-navigator form.name input {border-top: 1px solid #BBB;border-bottom: 1px solid #BBB;height: 26px;@@ -49,34 +49,34 @@width: 160px;}-#depot-blob>.head>.operations {+#project-blob>.head>.operations {margin-top: 4px;position: absolute;right: 0;}-#depot-blob>.head>.operations>a {+#project-blob>.head>.operations>a {padding: 4px 8px;color: #333;}-#depot-blob>.blob-navigator {+#project-blob>.blob-navigator {display: none;padding: 2px 0 3px 0;}-#depot-blob>.revision-indexing {+#project-blob>.revision-indexing {padding: 8px 8px 9px 8px;background: #fcf8e3;border-bottom: 1px solid #DDD;color: #8a6d3b;font-size: 13px;}-#depot-blob>.search-result {+#project-blob>.search-result {height: 150px;border-top: 1px solid #CCC;top: 0 !important;}-#depot-blob>.search-result>.ui-resizable-handle {+#project-blob>.search-result>.ui-resizable-handle {background: #EEE url(hgrabber.png) no-repeat scroll center top;cursor: n-resize;height: 4px;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.jssimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.jsindex 521159042a..927631dfd5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.js@@ -1,11 +1,11 @@-gitplex.server.depotBlob = {+gitplex.server.projectBlob = {onDomReady: function(callback) {// hide browser scrollbar as we will manage it in blob content container$("body").css("overflow", "hidden");- var cookieKey = "depotBlob.searchResult.height";+ var cookieKey = "projectBlob.searchResult.height";- var $searchResult = $("#depot-blob>.search-result");+ var $searchResult = $("#project-blob>.search-result");var height = Cookies.get(cookieKey);if (height)$searchResult.outerHeight(height);@@ -15,7 +15,7 @@ gitplex.server.depotBlob = {handles: {"n": "#search-result-resize-handle"},minHeight: 100,resize: function(e, ui) {- var blobContentHeight = $("#depot-blob>.blob-content").outerHeight();+ var blobContentHeight = $("#project-blob>.blob-content").outerHeight();if(blobContentHeight < 150)$(this).resizable({maxHeight: ui.size.height});},@@ -28,13 +28,13 @@ gitplex.server.depotBlob = {$(window).resize(function(e) {e.stopPropagation();- var $head = $("#depot-blob>.head");+ var $head = $("#project-blob>.head");var $revisionPicker = $head.find(">.revision-picker");// we should simply call $head.width() here, but the value is incorrect after maximize and restore// window in IE and Chrome (maybe due to use of table in sidebar?), so we go with the complicate// approach of calculating the head width- var headWidth = $("#depot").width() - $("#depot>.sidebar>table>tbody>tr>td.nav").outerWidth();+ var headWidth = $("#project").width() - $("#project>.sidebar>table>tbody>tr>td.nav").outerWidth();// below code moves file navigator to bottom if it is too widevar maxWidth = headWidth - $revisionPicker.outerWidth() - 130;@@ -43,19 +43,19 @@ gitplex.server.depotBlob = {var $blobNavigator = $head.find(">.blob-navigator");if ($blobNavigator.length != 0) {if ($blobNavigator.outerWidth() > maxWidth || $blobNavigator.outerHeight() > maxHeight)- $("#depot-blob>.blob-navigator").show().append($blobNavigator);+ $("#project-blob>.blob-navigator").show().append($blobNavigator);} else {- $blobNavigator = $("#depot-blob>.blob-navigator>div");+ $blobNavigator = $("#project-blob>.blob-navigator>div");if ($blobNavigator.outerWidth() <= maxWidth && $blobNavigator.outerHeight() <= maxHeight) {$blobNavigator.insertAfter($revisionPicker);- $("#depot-blob>.blob-navigator").hide();+ $("#project-blob>.blob-navigator").hide();}}- var $blobContent = $("#depot-blob>.blob-content");+ var $blobContent = $("#project-blob>.blob-content");var width = $(window).width()-$blobContent.offset().left;- var height = gitplex.server.depotBlob.getClientHeight();- var $searchResult = $("#depot-blob>.search-result");+ var height = gitplex.server.projectBlob.getClientHeight();+ var $searchResult = $("#project-blob>.search-result");if ($searchResult.is(":visible")) {var $searchResultHead = $searchResult.find(".search-result>.head");var $searchResultBody = $searchResult.find(".search-result>.body");@@ -88,7 +88,7 @@ gitplex.server.depotBlob = {});},getClientHeight: function() {- var height = $(window).height()-$("#depot-blob>.blob-content").offset().top;+ var height = $(window).height()-$("#project-blob>.blob-content").offset().top;if ($("#main>.foot").length != 0)height -= $("#main>.foot").outerHeight();return height;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.javaindex 9cf6d1cbb1..d9000deca2 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render;+package com.gitplex.server.web.page.project.blob.render;import java.io.Serializable;import java.util.List;@@ -12,7 +12,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.jsymbol.TokenPosition;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.QueryHit;@@ -21,7 +21,7 @@ public interface BlobRenderContext extends Serializable {public enum Mode {VIEW, BLAME, ADD, EDIT, DELETE}- Depot getDepot();+ Project getProject();@NullablePullRequest getPullRequest();diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRendererContribution.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRendererContribution.javaindex 01ffa3be0b..031b5c7755 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRendererContribution.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render;+package com.gitplex.server.web.page.project.blob.render;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex bf51e31277..1804d69863 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.commitoption;+package com.gitplex.server.web.page.project.blob.render.commitoption;import java.io.IOException;import java.util.Arrays;@@ -48,10 +48,10 @@ import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.exception.NotTreeException;import com.gitplex.server.git.exception.ObjectAlreadyExistsException;import com.gitplex.server.git.exception.ObsoleteCommitException;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.Provider;@@ -59,10 +59,10 @@ 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;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.RevisionResolved;-import com.gitplex.server.web.page.depot.blob.navigator.BlobNameChanging;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.RevisionResolved;+import com.gitplex.server.web.page.project.blob.navigator.BlobNameChanging;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;import com.google.common.base.Preconditions;@@ -149,11 +149,11 @@ public class CommitOptionPanel extends Panel {changedContainer.setVisible(change != null);changedContainer.setOutputMarkupPlaceholderTag(true);if (change != null) {- changedContainer.add(new BlobDiffPanel("changes", new AbstractReadOnlyModel<Depot>() {+ changedContainer.add(new BlobDiffPanel("changes", new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return context.getDepot();+ public Project getObject() {+ return context.getProject();}}, new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));@@ -307,18 +307,18 @@ public class CommitOptionPanel extends Panel {commitMessage = getDefaultCommitMessage();if (StringUtils.isNotBlank(detailCommitMessage))commitMessage += "\n\n" + detailCommitMessage;- Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());+ User user = Preconditions.checkNotNull(GitPlex.getInstance(UserManager.class).getCurrent());String refName = GitUtils.branch2ref(context.getBlobIdent().revision);- ObjectId prevCommitId = context.getDepot().getObjectId(context.getBlobIdent().revision);+ ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision);- Repository repository = context.getDepot().getRepository();+ Repository repository = context.getProject().getRepository();ObjectId newCommitId = null;Map<String, BlobContent> newBlobs = new HashMap<>();if (newContentProvider != null) {- if (!GitPlex.getInstance(ReviewManager.class).canModify(SecurityUtils.getAccount(), context.getDepot(),+ if (!GitPlex.getInstance(ReviewManager.class).canModify(SecurityUtils.getUser(), context.getProject(),context.getBlobIdent().revision, context.getNewPath())) {CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed. "+ "Please submit pull request instead");@@ -426,7 +426,7 @@ public class CommitOptionPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return context.getDepot().getBlob(blobIdent);+ return context.getProject().getBlob(blobIdent);}};@@ -444,7 +444,7 @@ public class CommitOptionPanel extends Panel {if (context.getMode() == Mode.EDIT) {contentModified = !Arrays.equals(newContentProvider.get(),- context.getDepot().getBlob(context.getBlobIdent()).getBytes());+ context.getProject().getBlob(context.getBlobIdent()).getBytes());} else {contentModified = newContentProvider.get().length != 0;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.javaindex 3140d746bb..ab7cc0aba3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.commitoption;+package com.gitplex.server.web.page.project.blob.render.commitoption;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/commit-option.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/commit-option.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/commit-option.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/commit-option.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex a8391b326a..54dd12fa4e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.edit;+package com.gitplex.server.web.page.project.blob.render.edit;import org.apache.wicket.Component;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;@@ -17,10 +17,10 @@ import org.apache.wicket.request.cycle.RequestCycle;import com.gitplex.server.util.Provider;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.navigator.BlobNameChanging;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.commitoption.CommitOptionPanel;+import com.gitplex.server.web.page.project.blob.navigator.BlobNameChanging;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.commitoption.CommitOptionPanel;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.google.common.base.Preconditions;@@ -72,7 +72,7 @@ public abstract class BlobEditPanel extends Panel {byte[] content;if (context.getMode() == Mode.EDIT)- content = context.getDepot().getBlob(context.getBlobIdent()).getBytes();+ content = context.getProject().getBlob(context.getBlobIdent()).getBytes();elsecontent = new byte[0];add(contentEditor = newContentEditor("editor", content));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditResourceReference.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditResourceReference.javaindex ed8ce44193..3284c1e24e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.edit;+package com.gitplex.server.web.page.project.blob.render.edit;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/BlobDeletionProvider.javasimilarity index 64%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/BlobDeletionProvider.javaindex b7ad386cfe..88cf998488 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java@@ -1,12 +1,12 @@-package com.gitplex.server.web.page.depot.blob.render.renderers;+package com.gitplex.server.web.page.project.blob.render.renderers;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.commitoption.CommitOptionPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.commitoption.CommitOptionPanel;public class BlobDeletionProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.javaindex 60d3e0b081..a39154e467 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java@@ -1,10 +1,10 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;+package com.gitplex.server.web.page.project.blob.render.renderers.failsafe;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;public class FailsafeRendererProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.javaindex d290e841fc..7c21fa625b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;+package com.gitplex.server.web.page.project.blob.render.renderers.failsafe;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.javasimilarity index 72%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.javaindex 2a870bad48..23b24a0358 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java@@ -1,10 +1,10 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;+package com.gitplex.server.web.page.project.blob.render.renderers.failsafe;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class FailsafeViewPanel extends BlobViewPanel {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/failsafe.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/failsafe.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/failsafe.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/failsafe/failsafe.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javasimilarity index 88%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javaindex 72d261e3fa..e9f77b0866 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.folder;+package com.gitplex.server.web.page.project.blob.render.renderers.folder;import java.io.IOException;import java.util.ArrayList;@@ -33,8 +33,8 @@ import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.google.common.base.Preconditions;@SuppressWarnings("serial")@@ -46,7 +46,7 @@ public class FolderViewPanel extends Panel {@Overrideprotected List<BlobIdent> load() {- Repository repository = context.getDepot().getRepository();+ Repository repository = context.getProject().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {RevTree revTree = revWalk.parseCommit(getCommitId()).getTree();TreeWalk treeWalk;@@ -146,9 +146,9 @@ public class FolderViewPanel extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State(parentIdent);- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotBlobPage.class, params));+ ProjectBlobPage.State state = new ProjectBlobPage.State(parentIdent);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));}});@@ -180,9 +180,9 @@ public class FolderViewPanel extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotBlobPage.class, params));+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));}@Override@@ -229,7 +229,7 @@ public class FolderViewPanel extends Panel {@Overrideprotected String load() {- Blob blob = context.getDepot().getBlob(readmeModel.getObject());+ Blob blob = context.getProject().getBlob(readmeModel.getObject());Blob.Text text = blob.getText();if (text != null)return text.getContent();@@ -241,8 +241,8 @@ public class FolderViewPanel extends Panel {@Overrideprotected String getBaseUrl() {- DepotBlobPage.State state = new DepotBlobPage.State(readmeModel.getObject());- return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ ProjectBlobPage.State state = new ProjectBlobPage.State(readmeModel.getObject());+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();}});@@ -258,7 +258,7 @@ public class FolderViewPanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new FolderViewResourceReference()));- PageParameters params = LastCommitsResource.paramsOf(context.getDepot(),+ PageParameters params = LastCommitsResource.paramsOf(context.getProject(),context.getBlobIdent().revision, context.getBlobIdent().path);String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();response.render(OnDomReadyHeaderItem.forScript(diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.javasimilarity index 70%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.javaindex 32d1cb2ba2..e05ed79ab5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.folder;+package com.gitplex.server.web.page.project.blob.render.renderers.folder;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class FolderViewRendererProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.javaindex c6a64e2803..a056e8db92 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.folder;+package com.gitplex.server.web.page.project.blob.render.renderers.folder;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex 747ab49099..a2a6489542 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.folder;+package com.gitplex.server.web.page.project.blob.render.renderers.folder;import java.io.IOException;import java.util.HashMap;@@ -18,13 +18,13 @@ 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.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.user.UserProfilePage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.avatar.AvatarManager;@@ -58,14 +58,14 @@ class LastCommitsResource extends AbstractResource {@Overridepublic void writeData(Attributes attributes) throws IOException {- Depot repo = GitPlex.getInstance(Dao.class).load(Depot.class, repoId);+ Project repo = GitPlex.getInstance(Dao.class).load(Project.class, repoId);if (!SecurityUtils.canRead(repo))throw new UnauthorizedException();LastCommitsOfChildren lastCommits = repo.getLastCommitsOfChildren(revision, path);- AccountManager userManager = GitPlex.getInstance(AccountManager.class);+ UserManager userManager = GitPlex.getInstance(UserManager.class);AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);Map<String, LastCommitInfo> map = new HashMap<>();@@ -79,12 +79,12 @@ class LastCommitsResource extends AbstractResource {info.when = DateUtils.formatAge(value.getCommitDate());PersonIdent author = value.getAuthor();- Account user = userManager.find(author);+ User user = userManager.find(author);if (user != null) {info.authorName = HtmlEscape.escapeHtml5(user.getDisplayName());info.authorAvatarUrl = avatarManager.getAvatarUrl(user);- params = AccountOverviewPage.paramsOf(user);- info.authorUrl = RequestCycle.get().urlFor(AccountOverviewPage.class, params).toString();+ params = UserProfilePage.paramsOf(user);+ info.authorUrl = RequestCycle.get().urlFor(UserProfilePage.class, params).toString();} else {info.authorName = HtmlEscape.escapeHtml5(author.getName());info.authorAvatarUrl = avatarManager.getAvatarUrl(author);@@ -106,9 +106,9 @@ class LastCommitsResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Depot depot, String revision, @Nullable String path) {+ public static PageParameters paramsOf(Project project, String revision, @Nullable String path) {PageParameters params = new PageParameters();- params.set(PARAM_REPO, depot.getId());+ params.set(PARAM_REPO, project.getId());params.set(PARAM_REVISION, revision);if (path != null)params.set(PARAM_PATH, path);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.javaindex 561a4ea446..75b328cec9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.folder;+package com.gitplex.server.web.page.project.blob.render.renderers.folder;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex 1bce7453f9..69955424f2 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;+package com.gitplex.server.web.page.project.blob.render.renderers.gitlink;import org.apache.wicket.AttributeModifier;import org.apache.wicket.markup.head.CssHeaderItem;@@ -11,8 +11,8 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blob;import com.gitplex.server.git.Submodule;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class GitLinkPanel extends BlobViewPanel {@@ -25,7 +25,7 @@ public class GitLinkPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent());Submodule submodule = Submodule.fromString(blob.getText().getContent());WebMarkupContainer link;ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.javasimilarity index 70%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.javaindex 6a0430a693..fe89c448cf 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;+package com.gitplex.server.web.page.project.blob.render.renderers.gitlink;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class GitLinkRendererProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.javaindex 495f764882..1d140d942e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;+package com.gitplex.server.web.page.project.blob.render.renderers.gitlink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/git-link.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/git-link.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/git-link.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/gitlink/git-link.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.javasimilarity index 63%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.javaindex 57977fe411..541123f44d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.image;+package com.gitplex.server.web.page.project.blob.render.renderers.image;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class ImageRendererProvider implements BlobRendererContribution {@@ -14,7 +14,7 @@ public class ImageRendererProvider implements BlobRendererContribution {@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {- if (context.getDepot().getBlob(context.getBlobIdent()).getMediaType().getType().equalsIgnoreCase("image")) {+ if (context.getProject().getBlob(context.getBlobIdent()).getMediaType().getType().equalsIgnoreCase("image")) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewPanel.javasimilarity index 74%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewPanel.javaindex 4af727a9c1..607227b95b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.image;+package com.gitplex.server.web.page.project.blob.render.renderers.image;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.image.Image;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;import com.gitplex.server.web.util.resource.RawBlobResource;import com.gitplex.server.web.util.resource.RawBlobResourceReference;@@ -21,7 +21,7 @@ public class ImageViewPanel extends BlobViewPanel {super.onInitialize();add(new Image("img", new RawBlobResourceReference(),- RawBlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));+ RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent())));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.javasimilarity index 80%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.javaindex 7a46b88a16..f208f60128 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.image;+package com.gitplex.server.web.page.project.blob.render.renderers.image;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/image-view.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/image-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/image-view.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/image/image-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.javasimilarity index 68%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.javaindex 45e969eba4..7fb2a2ebb9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;+package com.gitplex.server.web.page.project.blob.render.renderers.markdown;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -6,12 +6,12 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.web.component.markdown.BlobReferenceSupport;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.edit.BlobEditPanel;@SuppressWarnings("serial")public class MarkdownBlobEditPanel extends BlobEditPanel {@@ -35,8 +35,8 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {return new BlobReferenceSupport() {@Override- public Depot getDepot() {- return context.getDepot();+ public Project getProject() {+ return context.getProject();}@Override@@ -56,8 +56,8 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {protected String getBaseUrl() {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, context.getNewPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();}};diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javasimilarity index 96%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 496d7712a5..407a6a9cd3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;+package com.gitplex.server.web.page.project.blob.render.renderers.markdown;import java.nio.charset.Charset;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.javaindex a5d5c627b0..068e720253 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;+package com.gitplex.server.web.page.project.blob.render.renderers.markdown;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.javasimilarity index 63%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.javaindex ac80753b4c..7a3dfd018d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;+package com.gitplex.server.web.page.project.blob.render.renderers.markdown;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -6,9 +6,9 @@ import org.apache.wicket.model.Model;import com.gitplex.server.git.Blob;import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class MarkdownBlobViewPanel extends BlobViewPanel {@@ -21,13 +21,13 @@ public class MarkdownBlobViewPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent());add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null) {@Overrideprotected String getBaseUrl() {- DepotBlobPage.State state = new DepotBlobPage.State(context.getBlobIdent());- return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ ProjectBlobPage.State state = new ProjectBlobPage.State(context.getBlobIdent());+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();}});diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.javaindex ebe5eaeab0..ffd61d5953 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java@@ -1,14 +1,14 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;+package com.gitplex.server.web.page.project.blob.render.renderers.markdown;import javax.annotation.Nullable;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.renderers.source.SourceViewPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.renderers.source.SourceViewPanel;@SuppressWarnings("serial")public class MarkdownRendererProvider implements BlobRendererContribution {@@ -22,7 +22,7 @@ public class MarkdownRendererProvider implements BlobRendererContribution {if (context.getMode() == Mode.ADD && isMarkdown(context.getNewPath())|| context.getMode() == Mode.EDIT&& isMarkdown(context.getBlobIdent().path)- && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;@@ -40,7 +40,7 @@ public class MarkdownRendererProvider implements BlobRendererContribution {} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()&& isMarkdown(context.getBlobIdent().path)- && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/markdown-blob.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/markdown-blob.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.javaindex f09c735ce8..91fa94379a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.noname;+package com.gitplex.server.web.page.project.blob.render.renderers.noname;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.javasimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.javaindex dc2f6dbfb1..ee9a27cb86 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.noname;+package com.gitplex.server.web.page.project.blob.render.renderers.noname;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.FormComponentPanel;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.edit.BlobEditPanel;@SuppressWarnings("serial")public class NoNameEditPanel extends BlobEditPanel {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.javasimilarity index 74%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.javaindex ef948458c4..5dadd0938f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.noname;+package com.gitplex.server.web.page.project.blob.render.renderers.noname;import org.apache.wicket.markup.html.form.FormComponentPanel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.javasimilarity index 70%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.javaindex 28ccdb59f3..65707783ac 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.noname;+package com.gitplex.server.web.page.project.blob.render.renderers.noname;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class NoNameRendererProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/no-name.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/no-name.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/no-name.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/noname/no-name.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.javaindex a774df32ce..b89e69a8d1 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -19,10 +19,10 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;-import com.gitplex.server.web.page.depot.blob.render.view.Markable;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.edit.BlobEditPanel;+import com.gitplex.server.web.page.project.blob.render.view.Markable;@SuppressWarnings("serial")public class SourceEditPanel extends BlobEditPanel implements Markable {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.javaindex 867292a28b..ab32103d72 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceFormComponent.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceFormComponent.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceFormComponent.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceFormComponent.javaindex a475f9b068..e0a1647daa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import java.nio.charset.Charset;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.javasimilarity index 72%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.javaindex 04ad10fcbe..46e875715a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class SourceRendererProvider implements BlobRendererContribution {@@ -15,7 +15,7 @@ public class SourceRendererProvider implements BlobRendererContribution {public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.ADD|| context.getMode() == Mode.EDIT- && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;@@ -32,7 +32,7 @@ public class SourceRendererProvider implements BlobRendererContribution {};} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()- && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex f210672b99..f0a3203035 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -70,7 +70,7 @@ 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.Project;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.SearchManager;@@ -80,7 +80,7 @@ import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;import com.gitplex.server.web.component.comment.CodeCommentPanel;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;import com.gitplex.server.web.component.menu.MenuItem;@@ -89,12 +89,12 @@ import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;-import com.gitplex.server.web.page.depot.blob.render.view.Markable;-import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.render.view.Markable;+import com.gitplex.server.web.page.project.blob.search.SearchMenuContributor;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.websocket.PageDataChanged;@@ -149,14 +149,14 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMepublic SourceViewPanel(String id, BlobRenderContext context) {super(id, context);- Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent());String blobName = context.getBlobIdent().getName();SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);if (extractor != null) {try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- List<Symbol> cachedSymbols = searchManager.getSymbols(context.getDepot(), blob.getBlobId(),+ List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),blob.getIdent().path);if (cachedSymbols != null)symbols.addAll(cachedSymbols);@@ -342,7 +342,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe@Overridepublic void onClick(AjaxRequestTarget target) {- if (SecurityUtils.getAccount() != null) {+ if (SecurityUtils.getUser() != null) {((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);target.appendJavaScript("gitplex.server.sourceView.scrollToCommentBottom();");} else {@@ -387,11 +387,11 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeTextRange mark = getMark(params, "param1", "param2", "param3", "param4");String script = String.format("gitplex.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",getJson(mark), context.getMarkUrl(mark), context.getPullRequest()!=null,- SecurityUtils.getAccount()!=null);+ SecurityUtils.getUser()!=null);target.appendJavaScript(script);break;case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());+ Preconditions.checkNotNull(SecurityUtils.getUser());mark = getMark(params, "param1", "param2", "param3", "param4");commentContainer.setDefaultModelObject(mark);@@ -403,14 +403,14 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeString uuid = UUID.randomUUID().toString();- String autosaveKey = "autosave:addCodeCommentOnSource:" + context.getDepot().getId()+ String autosaveKey = "autosave:addCodeCommentOnSource:" + context.getProject().getId()+ ":" + context.getBlobIdent().path;CommentInput contentInput;form.add(contentInput = new CommentInput("content", Model.of(""), true) {@Override- protected DepotAttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(context.getDepot(), uuid);+ protected ProjectAttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(context.getProject(), uuid);}@Override@@ -419,8 +419,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe}@Override- protected Depot getDepot() {- return context.getDepot();+ protected Project getProject() {+ return context.getProject();}});@@ -467,7 +467,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMecomment.getCommentPos().setPath(context.getBlobIdent().path);comment.setContent(contentInput.getModelObject());comment.setRequest(context.getPullRequest());- comment.setUser(SecurityUtils.getAccount());+ comment.setUser(SecurityUtils.getUser());comment.getCommentPos().setRange(mark);GitPlex.getInstance(CodeCommentManager.class).save(comment);@@ -579,8 +579,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeadd(blameMessageBehavior = new BlameMessageBehavior() {@Override- protected Depot getDepot() {- return context.getDepot();+ protected Project getProject() {+ return context.getProject();}});@@ -644,11 +644,11 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeoutline.setVisible(isOutlineVisibleInitially());- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {+ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return context.getDepot();+ public Project getObject() {+ return context.getProject();}}) {@@ -749,7 +749,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeString commitHash = context.getCommit().name();- BlameCommand cmd = new BlameCommand(context.getDepot().getGitDir());+ BlameCommand cmd = new BlameCommand(context.getProject().getGitDir());cmd.commitHash(commitHash).file(context.getBlobIdent().path);for (Blame blame: cmd.call().values()) {BlameInfo blameInfo = new BlameInfo();@@ -760,7 +760,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeCommitDetailPage.State state = new CommitDetailPage.State();state.revision = blame.getCommit().getHash();state.pathFilter = context.getBlobIdent().path;- PageParameters params = CommitDetailPage.paramsOf(context.getDepot(), state);+ PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();blameInfo.ranges = blame.getRanges();blameInfos.add(blameInfo);@@ -782,7 +782,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeresponse.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));- Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent());String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.javasimilarity index 96%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.javaindex 427e50bb53..8483b37ae2 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.source;+package com.gitplex.server.web.page.project.blob.render.renderers.source;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-edit.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-edit.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-edit.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-edit.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/vgrabber.png b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/vgrabber.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/vgrabber.pngrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/vgrabber.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.javasimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.javaindex 85db179bc4..201f3548f0 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;+package com.gitplex.server.web.page.project.blob.render.renderers.symbollink;import java.io.File;import java.io.IOException;@@ -19,9 +19,9 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class SymbolLinkPanel extends BlobViewPanel {@@ -34,7 +34,7 @@ public class SymbolLinkPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent());String targetPath = FilenameUtils.normalize(Paths.get(context.getBlobIdent().path).resolveSibling(blob.getText().getContent()).toString(), true);@@ -43,9 +43,9 @@ public class SymbolLinkPanel extends BlobViewPanel {BlobIdent targetBlobIdent;if (targetPath != null) {- Repository repository = context.getDepot().getRepository();+ Repository repository = context.getProject().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {- ObjectId commitId = context.getDepot().getObjectId(context.getBlobIdent().revision);+ ObjectId commitId = context.getProject().getObjectId(context.getBlobIdent().revision);RevTree revTree = revWalk.parseCommit(commitId).getTree();TreeWalk treeWalk = TreeWalk.forPath(repository, targetPath, revTree);if (treeWalk != null) {@@ -71,9 +71,9 @@ public class SymbolLinkPanel extends BlobViewPanel {};link.setEnabled(false);} else {- DepotBlobPage.State state = new DepotBlobPage.State(targetBlobIdent);- link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,- DepotBlobPage.paramsOf(context.getDepot(), state));+ ProjectBlobPage.State state = new ProjectBlobPage.State(targetBlobIdent);+ link = new ViewStateAwarePageLink<Void>("link", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(context.getProject(), state));}link.add(new Label("label", blob.getText().getContent()));add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.javasimilarity index 70%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.javaindex 12688aa0c6..1984f9b9fa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;+package com.gitplex.server.web.page.project.blob.render.renderers.symbollink;import org.apache.wicket.Component;import com.gitplex.server.web.PrioritizedComponentRenderer;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;public class SymbolLinkRendererProvider implements BlobRendererContribution {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.javaindex 350c2d4ad0..6180219d5e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;+package com.gitplex.server.web.page.project.blob.render.renderers.symbollink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/symbol-link.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/symbol-link.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/symbol-link.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/symbol-link.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewPanel.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewPanel.javaindex ab967eff9d..a5e787e17f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.view;+package com.gitplex.server.web.page.project.blob.render.view;import javax.annotation.Nullable;@@ -24,8 +24,8 @@ import com.gitplex.server.git.BlobIdent;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.FileUtils;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;import com.gitplex.server.web.util.resource.RawBlobResource;@@ -63,7 +63,7 @@ public abstract class BlobViewPanel extends Panel {private void newChangeActions(@Nullable IPartialPageRequestHandler target) {WebMarkupContainer changeActions = new WebMarkupContainer("changeActions");- changeActions.setVisible(SecurityUtils.canModify(context.getDepot(), context.getBlobIdent().revision, context.getBlobIdent().path)+ changeActions.setVisible(SecurityUtils.canModify(context.getProject(), context.getBlobIdent().revision, context.getBlobIdent().path)&& (context.isOnBranch()));changeActions.setOutputMarkupId(true);@@ -121,7 +121,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic String getObject() {- return context.getDepot().getBlob(context.getBlobIdent()).getText().getLines().size() + " lines";+ return context.getProject().getBlob(context.getBlobIdent()).getText().getLines().size() + " lines";}}) {@@ -130,7 +130,7 @@ public abstract class BlobViewPanel extends Panel {protected void onConfigure() {super.onConfigure();- setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);}});@@ -139,7 +139,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic String getObject() {- return context.getDepot().getBlob(context.getBlobIdent()).getText().getCharset().displayName();+ return context.getProject().getBlob(context.getBlobIdent()).getText().getCharset().displayName();}}) {@@ -148,23 +148,23 @@ public abstract class BlobViewPanel extends Panel {protected void onConfigure() {super.onConfigure();- setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);}});- add(new Label("size", FileUtils.byteCountToDisplaySize(context.getDepot().getBlob(context.getBlobIdent()).getSize())));+ add(new Label("size", FileUtils.byteCountToDisplaySize(context.getProject().getBlob(context.getBlobIdent()).getSize())));add(newOptions("options"));add(new ResourceLink<Void>("raw", new RawBlobResourceReference(),- RawBlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));+ RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent())));add(new CheckBox("blame", Model.of(context.getMode() == Mode.BLAME)) {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);}}.add(new OnChangeAjaxBehavior() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewResourceReference.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewResourceReference.javaindex ce979aba6f..d058aaac8d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/BlobViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.view;+package com.gitplex.server.web.page.project.blob.render.view;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/Markable.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/Markable.javasimilarity index 78%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/Markable.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/Markable.javaindex 69e2a1d72e..bc4a2ab6f8 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/Markable.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/Markable.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.render.view;+package com.gitplex.server.web.page.project.blob.render.view;import javax.annotation.Nullable;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/SearchMenuContributor.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/SearchMenuContributor.javaindex f7db9f7da3..e3d4c96f29 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/SearchMenuContributor.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search;+package com.gitplex.server.web.page.project.blob.search;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 586c665769..c88d93284f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.advanced;+package com.gitplex.server.web.page.project.blob.search.advanced;import java.io.Serializable;import java.util.ArrayList;@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;@@ -52,7 +52,7 @@ import com.gitplex.server.web.behavior.RunTaskBehavior;import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;+import com.gitplex.server.web.page.project.blob.search.result.SearchResultPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -63,7 +63,7 @@ public abstract class AdvancedSearchPanel extends Panel {private static final Logger logger = LoggerFactory.getLogger(AdvancedSearchPanel.class);- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<String> revisionModel;@@ -71,10 +71,10 @@ public abstract class AdvancedSearchPanel extends Panel {private SearchOption option = new TextSearchOption();- public AdvancedSearchPanel(String id, IModel<Depot> depotModel, IModel<String> revisionModel) {+ public AdvancedSearchPanel(String id, IModel<Project> projectModel, IModel<String> revisionModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revisionModel = revisionModel;WebRequest request = (WebRequest) RequestCycle.get().getRequest();@@ -460,7 +460,7 @@ public abstract class AdvancedSearchPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();revisionModel.detach();super.onDetach();@@ -539,8 +539,8 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(fileNames).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());- hits = searchManager.search(context.depotModel.getObject(), commit, query);+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ hits = searchManager.search(context.projectModel.getObject(), commit, query);if (hits.size() < SearchResultPanel.MAX_QUERY_ENTRIES) {query = new SymbolQuery.Builder()@@ -551,7 +551,7 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(fileNames).count(SearchResultPanel.MAX_QUERY_ENTRIES - hits.size()).build();- hits.addAll(searchManager.search(context.depotModel.getObject(), commit, query));+ hits.addAll(searchManager.search(context.projectModel.getObject(), commit, query));}return hits;@@ -576,8 +576,8 @@ public abstract class AdvancedSearchPanel extends Panel {.directory(context.getDirectory(insideCurrentDir)).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());- return searchManager.search(context.depotModel.getObject(), commit, query);+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ return searchManager.search(context.projectModel.getObject(), commit, query);}}@@ -607,8 +607,8 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(fileNames).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());- return searchManager.search(context.depotModel.getObject(), commit, query);+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ return searchManager.search(context.projectModel.getObject(), commit, query);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.javaindex ae7077ceaf..9baa540141 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.advanced;+package com.gitplex.server.web.page.project.blob.search.advanced;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/advanced-search.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/advanced-search.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/advanced-search.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/advanced/advanced-search.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.javasimilarity index 89%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 270a8058cb..3b0f232144 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.quick;+package com.gitplex.server.web.page.project.blob.search.quick;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -44,7 +44,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.FileHit;@@ -57,8 +57,8 @@ import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.RunTaskBehavior;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.search.result.SearchResultPanel;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.google.common.base.Joiner;import com.google.common.base.Splitter;@@ -72,7 +72,7 @@ public abstract class QuickSearchPanel extends Panel {private static final String COOKIE_RECENT_OPENED = "quickSearch.recentOpened";- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private final IModel<String> revisionModel;@@ -82,17 +82,17 @@ public abstract class QuickSearchPanel extends Panel {private RunTaskBehavior moreSymbolHitsBehavior;- public QuickSearchPanel(String id, IModel<Depot> depotModel, IModel<String> revisionModel) {+ public QuickSearchPanel(String id, IModel<Project> projectModel, IModel<String> revisionModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;this.revisionModel = revisionModel;- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();for (String blobPath: getRecentOpened()) {try {- RevTree revTree = depot.getRevCommit(revisionModel.getObject()).getTree();- TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), blobPath, revTree);+ RevTree revTree = project.getRevCommit(revisionModel.getObject()).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(project.getRepository(), blobPath, revTree);if (treeWalk != null && treeWalk.getRawMode(0) != FileMode.TREE.getBits()) {symbolHits.add(new FileHit(blobPath, null));}@@ -119,7 +119,7 @@ public abstract class QuickSearchPanel extends Panel {private List<QueryHit> querySymbols(String searchInput, int count) {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- ObjectId commit = depotModel.getObject().getRevCommit(revisionModel.getObject());+ ObjectId commit = projectModel.getObject().getRevCommit(revisionModel.getObject());List<QueryHit> symbolHits = new ArrayList<>();try {// first try an exact search against primary symbol to make sure the result@@ -129,7 +129,7 @@ public abstract class QuickSearchPanel extends Panel {.primary(true).count(count).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));// now do wildcard search but exclude the exact match returned aboveif (symbolHits.size() < count) {@@ -138,7 +138,7 @@ public abstract class QuickSearchPanel extends Panel {.primary(true).count(count-symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}// do the same for file names@@ -147,7 +147,7 @@ public abstract class QuickSearchPanel extends Panel {.fileNames(searchInput).count(count-symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (symbolHits.size() < count) {@@ -155,7 +155,7 @@ public abstract class QuickSearchPanel extends Panel {.excludeFileName(searchInput).count(count-symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}// do the same for secondary symbols@@ -165,7 +165,7 @@ public abstract class QuickSearchPanel extends Panel {.primary(false).count(count-symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (symbolHits.size() < count) {@@ -174,7 +174,7 @@ public abstract class QuickSearchPanel extends Panel {.primary(false).count(count-symbolHits.size()).build();- symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}} catch (TooGeneralQueryException e) {@@ -317,10 +317,10 @@ public abstract class QuickSearchPanel extends Panel {BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());- PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);+ PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);link.add(AttributeAppender.replace("href", url.toString()));if (item.getIndex() == 0)@@ -409,7 +409,7 @@ public abstract class QuickSearchPanel extends Panel {@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();revisionModel.detach();super.onDetach();diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchResourceReference.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchResourceReference.javaindex c1e7a56941..370961067c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.quick;+package com.gitplex.server.web.page.project.blob.search.quick;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/point.png b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/point.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/point.pngrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/point.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.javaindex 8ab6f6878e..493b285b29 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.result;+package com.gitplex.server.web.page.project.blob.search.result;import org.apache.commons.lang3.StringEscapeUtils;import org.apache.wicket.Component;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/MatchedBlob.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/MatchedBlob.javaindex 2e6a6277f7..4fc9419a89 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/MatchedBlob.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.result;+package com.gitplex.server.web.page.project.blob.search.result;import java.io.Serializable;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultPanel.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultPanel.javaindex e82b1f93c6..3659b0fb8f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.result;+package com.gitplex.server.web.page.project.blob.search.result;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -31,8 +31,8 @@ import com.gitplex.server.search.hit.FileHit;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.TextHit;import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.gitplex.jsymbol.Range;import com.gitplex.jsymbol.util.HighlightableLabel;@@ -407,9 +407,9 @@ public abstract class SearchResultPanel extends Panel {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, blobPath,FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));setMarkupId(SearchResultPanel.this.getMarkupId() + "-" + blobItem.getIndex());@@ -458,10 +458,10 @@ public abstract class SearchResultPanel extends Panel {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));setMarkupId(SearchResultPanel.this.getMarkupId()diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultResourceReference.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultResourceReference.javaindex 97b4d4741c..5fbed73e6c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/SearchResultResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.blob.search.result;+package com.gitplex.server.web.page.project.blob.search.result;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/search-result.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.cssrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/search-result.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/search-result.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.jsrename to web/src/main/java/com/gitplex/server/web/page/project/blob/search/result/search-result.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/AheadBehind.javasimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.javarename to web/src/main/java/com/gitplex/server/web/page/project/branches/AheadBehind.javaindex 52289b29b0..2a6d8574a7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/AheadBehind.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.branches;+package com.gitplex.server.web.page.project.branches;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.htmldiff --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/project/branches/ProjectBranchesPage.javasimilarity index 83%rename from web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.javaindex 3d3b685fc6..ec23c73908 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/project/branches/ProjectBranchesPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.branches;+package com.gitplex.server.web.page.project.branches;import java.io.IOException;import java.io.Serializable;@@ -54,9 +54,9 @@ 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.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;@@ -68,23 +68,23 @@ import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.component.revisionpicker.RevisionPicker;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption.Status;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SortOption;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.compare.RevisionComparePage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption;+import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Status;+import com.gitplex.server.web.page.project.pullrequest.requestlist.SortOption;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@SuppressWarnings("serial")-public class DepotBranchesPage extends DepotPage {+public class ProjectBranchesPage extends ProjectPage {private static final String PARAM_BASE = "base";@@ -97,7 +97,7 @@ public class DepotBranchesPage extends DepotPage {@Overrideprotected List<RefInfo> load() {- List<RefInfo> refs = getDepot().getBranches();+ List<RefInfo> refs = getProject().getBranches();String searchFor = searchField.getModelObject();if (StringUtils.isNotBlank(searchFor)) {searchFor = searchFor.trim().toLowerCase();@@ -139,10 +139,10 @@ public class DepotBranchesPage extends DepotPage {compareIds.add(ref.getRef().getObjectId());}- Ref baseRef = getDepot().getRefs(Constants.R_HEADS).get(baseBranch);+ Ref baseRef = getProject().getRefs(Constants.R_HEADS).get(baseBranch);Preconditions.checkNotNull(baseRef);Map<ObjectId, AheadBehind> aheadBehinds = new HashMap<>();- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {RevCommit baseCommit = revWalk.lookupCommit(baseRef.getObjectId());for (ObjectId compareId: compareIds) {RevCommit compareCommit = revWalk.lookupCommit(compareId);@@ -204,29 +204,29 @@ public class DepotBranchesPage extends DepotPage {protected Map<String, BranchWatch> load() {Map<String, BranchWatch> watches = new HashMap<>();for (BranchWatch watch: GitPlex.getInstance(BranchWatchManager.class).find(- Preconditions.checkNotNull(getLoginUser()), getDepot()))+ Preconditions.checkNotNull(getLoginUser()), getProject()))watches.put(watch.getBranch(), watch);return watches;}};- public static PageParameters paramsOf(Depot depot, @Nullable String baseBranch) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, @Nullable String baseBranch) {+ PageParameters params = paramsOf(project);if (baseBranch != null)params.add(PARAM_BASE, baseBranch);return params;}- public DepotBranchesPage(PageParameters params) {+ public ProjectBranchesPage(PageParameters params) {super(params);baseBranch = params.get(PARAM_BASE).toString();if (baseBranch == null)- baseBranch = Preconditions.checkNotNull(getDepot().getDefaultBranch());+ baseBranch = Preconditions.checkNotNull(getProject().getDefaultBranch());- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));}@Override@@ -249,7 +249,7 @@ public class DepotBranchesPage extends DepotPage {baseBranch = object;}- }, new BranchChoiceProvider(depotModel)));+ }, new BranchChoiceProvider(projectModel)));baseChoice.setRequired(true);@@ -275,17 +275,17 @@ public class DepotBranchesPage extends DepotPage {private String branchName;- private String branchRevision = getDepot().getDefaultBranch();+ private String branchRevision = getProject().getDefaultBranch();@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWrite(getDepot()));+ setVisible(SecurityUtils.canWrite(getProject()));}private RevisionPicker newRevisionPicker() {- return new RevisionPicker("revision", depotModel, branchRevision) {+ return new RevisionPicker("revision", projectModel, branchRevision) {@Overrideprotected void onSelect(AjaxRequestTarget target, String revision) {@@ -300,7 +300,7 @@ public class DepotBranchesPage extends DepotPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "createBranchFrag", DepotBranchesPage.this);+ Fragment fragment = new Fragment(id, "createBranchFrag", ProjectBranchesPage.this);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));@@ -341,12 +341,12 @@ public class DepotBranchesPage extends DepotPage {form.error("Invalid branch name.");target.focusComponent(nameInput);target.add(form);- } else if (getDepot().getObjectId(GitUtils.branch2ref(branchName), false) != null) {+ } else if (getProject().getObjectId(GitUtils.branch2ref(branchName), false) != null) {form.error("Branch '" + branchName + "' already exists, please choose a different name.");target.focusComponent(nameInput);target.add(form);} else {- depotModel.getObject().createBranch(branchName, branchRevision);+ projectModel.getObject().createBranch(branchName, branchRevision);modal.close();target.add(branchesContainer);target.add(pagingNavigator);@@ -390,9 +390,9 @@ public class DepotBranchesPage extends DepotPage {String branch = GitUtils.ref2branch(ref.getRef().getName());BlobIdent blobIdent = new BlobIdent(branch, null, FileMode.TREE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);AbstractLink link = new ViewStateAwarePageLink<Void>("branchLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));link.add(new Label("name", branch));item.add(link);@@ -400,15 +400,15 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getDepot().setDefaultBranch(branch);+ getProject().setDefaultBranch(branch);target.add(branchesContainer);}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getDepot())- && !branch.equals(getDepot().getDefaultBranch()));+ setVisible(SecurityUtils.canManage(getProject())+ && !branch.equals(getProject().getDefaultBranch()));}});@@ -418,13 +418,13 @@ public class DepotBranchesPage extends DepotPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getDepot().getDefaultBranch().equals(branch));+ setVisible(getProject().getDefaultBranch().equals(branch));}});- RevCommit lastCommit = getDepot().getRevCommit(ref.getRef().getObjectId());- PageParameters params = CommitDetailPage.paramsOf(getDepot(), lastCommit.name());+ RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());+ PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());link = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);link.add(new Label("hash", GitUtils.abbreviateSHA(lastCommit.name())));@@ -464,9 +464,9 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void onClick() {RevisionComparePage.State state = new RevisionComparePage.State();- state.leftSide = new DepotAndBranch(getDepot(), branch);- state.rightSide = new DepotAndBranch(getDepot(), baseBranch);- PageParameters params = RevisionComparePage.paramsOf(getDepot(), state);+ state.leftSide = new ProjectAndBranch(getProject(), branch);+ state.rightSide = new ProjectAndBranch(getProject(), baseBranch);+ PageParameters params = RevisionComparePage.paramsOf(getProject(), state);setResponsePage(RevisionComparePage.class, params);}@@ -508,9 +508,9 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void onClick() {RevisionComparePage.State state = new RevisionComparePage.State();- state.leftSide = new DepotAndBranch(getDepot(), baseBranch);- state.rightSide = new DepotAndBranch(getDepot(), branch);- PageParameters params = RevisionComparePage.paramsOf(getDepot(), state);+ state.leftSide = new ProjectAndBranch(getProject(), baseBranch);+ state.rightSide = new ProjectAndBranch(getProject(), branch);+ PageParameters params = RevisionComparePage.paramsOf(getProject(), state);setResponsePage(RevisionComparePage.class, params);}@@ -531,8 +531,8 @@ public class DepotBranchesPage extends DepotPage {PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);PullRequest effectiveRequest = pullRequestManager.findEffective(- new DepotAndBranch(getDepot(), baseBranch),- new DepotAndBranch(getDepot(), branch));+ new ProjectAndBranch(getProject(), baseBranch),+ new ProjectAndBranch(getProject(), branch));WebMarkupContainer requestLink;if (effectiveRequest != null && ab.getAhead() != 0) {requestLink = new BookmarkablePageLink<Void>("effectiveRequest",@@ -578,7 +578,7 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {BranchWatch watch = new BranchWatch();- watch.setDepot(getDepot());+ watch.setProject(getProject());watch.setBranch(branch);watch.setUser(getLoginUser());GitPlex.getInstance(BranchWatchManager.class).save(watch);@@ -597,14 +597,14 @@ public class DepotBranchesPage extends DepotPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "confirmDeleteBranchFrag", DepotBranchesPage.this);+ Fragment fragment = new Fragment(id, "confirmDeleteBranchFrag", ProjectBranchesPage.this);PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);- if (!pullRequestManager.findAllOpen(new DepotAndBranch(getDepot(), branch)).isEmpty()) {- Fragment bodyFrag = new Fragment("body", "openRequestsFrag", DepotBranchesPage.this);+ if (!pullRequestManager.findAllOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {+ Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);SearchOption searchOption = new SearchOption();searchOption.setStatus(Status.OPEN);searchOption.setBranch(branch);- PageParameters params = RequestListPage.paramsOf(getDepot(), searchOption, new SortOption());+ PageParameters params = RequestListPage.paramsOf(getProject(), searchOption, new SortOption());bodyFrag.add(new ViewStateAwarePageLink<Void>("openRequests", RequestListPage.class, params));bodyFrag.add(new Label("branch", branch));fragment.add(bodyFrag);@@ -615,9 +615,9 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getDepot().deleteBranch(branch);+ getProject().deleteBranch(branch);if (branch.equals(baseBranch)) {- baseBranch = getDepot().getDefaultBranch();+ baseBranch = getProject().getDefaultBranch();target.add(baseChoice);}target.add(pagingNavigator);@@ -642,8 +642,8 @@ public class DepotBranchesPage extends DepotPage {protected void onConfigure() {super.onConfigure();- if (!getDepot().getDefaultBranch().equals(branch)- && SecurityUtils.canDeleteBranch(getDepot(), branch)) {+ if (!getProject().getDefaultBranch().equals(branch)+ && SecurityUtils.canDeleteBranch(getProject(), branch)) {setVisible(true);} else {setVisible(false);@@ -682,7 +682,7 @@ public class DepotBranchesPage extends DepotPage {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new DepotBranchesResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectBranchesResourceReference()));}@Override@@ -716,8 +716,8 @@ public class DepotBranchesPage extends DepotPage {}private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), baseBranch);- CharSequence url = RequestCycle.get().urlFor(DepotBranchesPage.class, params);+ PageParameters params = paramsOf(getProject(), baseBranch);+ CharSequence url = RequestCycle.get().urlFor(ProjectBranchesPage.class, params);pushState(target, url.toString(), baseBranch);}@@ -731,8 +731,4 @@ public class DepotBranchesPage extends DepotPage {target.add(pagingNavigator);}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotBranchesPage.class, paramsOf(depot));- }}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesResourceReference.javanew file mode 100644index 0000000000..659a21401d--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.project.branches;++import org.apache.wicket.request.resource.CssResourceReference;++public class ProjectBranchesResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectBranchesResourceReference() {+ super(ProjectBranchesResourceReference.class, "project-branches.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/ajax-indicator.gif b/web/src/main/java/com/gitplex/server/web/page/project/branches/ajax-indicator.gifsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/branches/ajax-indicator.gifrename to web/src/main/java/com/gitplex/server/web/page/project/branches/ajax-indicator.gifdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/depot-branches.css b/web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/branches/depot-branches.cssrename to web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.htmldiff --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/project/commit/CommitDetailPage.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.javaindex de4d665f36..738e7e282e 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/project/commit/CommitDetailPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.commit;+package com.gitplex.server.web.page.project.commit;import java.io.Serializable;import java.util.ArrayList;@@ -41,7 +41,7 @@ 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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.util.diff.WhitespaceOption;@@ -54,17 +54,17 @@ import com.gitplex.server.web.component.createtag.CreateTagLink;import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.server.web.page.depot.tags.DepotTagsPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;+import com.gitplex.server.web.page.project.tags.ProjectTagsPage;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.WebSocketRegion;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;@SuppressWarnings("serial")-public class CommitDetailPage extends DepotPage implements CommentSupport {+public class CommitDetailPage extends ProjectPage implements CommentSupport {private static final String PARAM_REVISION = "revision";@@ -94,13 +94,13 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {super(params);state = new State(params);- resolvedRevision = getDepot().getRevCommit(state.revision).copy();+ resolvedRevision = getProject().getRevCommit(state.revision).copy();if (state.compareWith != null)- resolvedCompareWith = getDepot().getRevCommit(state.compareWith).copy();+ resolvedCompareWith = getProject().getRevCommit(state.compareWith).copy();}private RevCommit getCommit() {- return getDepot().getRevCommit(state.revision);+ return getProject().getRevCommit(state.revision);}private List<RevCommit> getParents() {@@ -114,34 +114,34 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {protected void onInitialize() {super.onInitialize();- add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));+ add(new CommitMessageLabel("text", projectModel, Model.of(getCommit().getShortMessage())));BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);- DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);- add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), browseState);+ add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));- add(new CreateBranchLink("createBranch", depotModel, state.revision) {+ add(new CreateBranchLink("createBranch", projectModel, state.revision) {@Overrideprotected void onCreate(AjaxRequestTarget target, String branch) {- setResponsePage(DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot()));+ setResponsePage(ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject()));}});- add(new CreateTagLink("createTag", depotModel, state.revision) {+ add(new CreateTagLink("createTag", projectModel, state.revision) {@Overrideprotected void onCreate(AjaxRequestTarget target, String tag) {- setResponsePage(DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot()));+ setResponsePage(ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject()));}});String message = GitUtils.getDetailMessage(getCommit());if (message != null) {- add(new CommitMessageLabel("detail", depotModel, Model.of(message)));+ add(new CommitMessageLabel("detail", projectModel, Model.of(message)));} else {add(new WebMarkupContainer("detail").setVisible(false));}@@ -165,12 +165,12 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {@Overrideprotected List<RefInfo> load() {Set<ObjectId> descendants = GitPlex.getInstance(CommitInfoManager.class)- .getDescendants(getDepot(), getCommit().getId());+ .getDescendants(getProject(), getCommit().getId());descendants.add(getCommit().getId());List<RefInfo> refs = new ArrayList<>();- refs.addAll(getDepot().getBranches());- refs.addAll(getDepot().getTags());+ refs.addAll(getProject().getBranches());+ refs.addAll(getProject().getTags());return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());}@@ -182,18 +182,18 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {String branch = GitUtils.ref2branch(ref);if (branch != null) {BlobIdent blobIdent = new BlobIdent(branch, null, FileMode.TREE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,- DepotBlobPage.paramsOf(depotModel.getObject(), state));+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(projectModel.getObject(), state));link.add(new Label("label", branch));item.add(link);item.add(AttributeAppender.append("class", "branch"));} else {String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));BlobIdent blobIdent = new BlobIdent(tag, null, FileMode.TREE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);- Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,- DepotBlobPage.paramsOf(depotModel.getObject(), state));+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(projectModel.getObject(), state));link.add(new Label("label", tag));item.add(link);item.add(AttributeAppender.append("class", "tag"));@@ -231,7 +231,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {newState.whitespaceOption = state.whitespaceOption;newState.pathFilter = state.pathFilter;Link<Void> link = new ViewStateAwarePageLink<Void>("parent", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));+ paramsOf(projectModel.getObject(), newState));link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));parentsContainer.add(link);parentsContainer.add(new WebMarkupContainer("parents").setVisible(false));@@ -257,7 +257,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {newState.pathFilter = state.pathFilter;Link<Void> link = new ViewStateAwarePageLink<Void>("link", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));+ paramsOf(projectModel.getObject(), newState));link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));item.add(link);@@ -362,7 +362,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {}};- revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,+ revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,Model.of((PullRequest)null), getCompareWith().name(), state.revision,pathFilterModel, whitespaceOptionModel, blameModel, this);revisionDiff.setOutputMarkupId(true);@@ -380,8 +380,8 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));}- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, State state) {+ PageParameters params = paramsOf(project);params.set(PARAM_REVISION, state.revision);if (state.compareWith != null)params.set(PARAM_COMPARE_WITH, state.compareWith);@@ -398,19 +398,14 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {return params;}- public static PageParameters paramsOf(Depot depot, String revision) {+ public static PageParameters paramsOf(Project project, String revision) {State state = new State();state.revision = revision;- return paramsOf(depot, state);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotCommitsPage.class, paramsOf(depot));+ return paramsOf(project, state);}private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);+ PageParameters params = paramsOf(getProject(), state);CharSequence url = RequestCycle.get().urlFor(CommitDetailPage.class, params);pushState(target, url.toString(), state);}@@ -484,7 +479,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {markState.compareWith = state.compareWith;markState.pathFilter = state.pathFilter;markState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), markState)).toString();+ return urlFor(CommitDetailPage.class, paramsOf(getProject(), markState)).toString();}@Override@@ -497,7 +492,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {commentState.compareWith = compareWith;commentState.pathFilter = state.pathFilter;commentState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), commentState)).toString();+ return urlFor(CommitDetailPage.class, paramsOf(getProject(), commentState)).toString();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailResourceReference.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailResourceReference.javaindex ba6866dab6..c1a5b4d4c7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.commit;+package com.gitplex.server.web.page.project.commit;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQuery.g4 b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitQuery.g4similarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQuery.g4rename to web/src/main/java/com/gitplex/server/web/page/project/commit/CommitQuery.g4diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQueryBehavior.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitQueryBehavior.javasimilarity index 89%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQueryBehavior.javarename to web/src/main/java/com/gitplex/server/web/page/project/commit/CommitQueryBehavior.javaindex c4a2e82bbc..720a00a990 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQueryBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitQueryBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.commit;+package com.gitplex.server.web.page.project.commit;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -17,18 +17,19 @@ import com.gitplex.jsymbol.Range;import com.gitplex.server.GitPlex;import com.gitplex.server.git.NameAndEmail;import com.gitplex.server.manager.CommitInfoManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.stringmatch.PatternApplied;import com.gitplex.server.util.stringmatch.WildcardUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;+import com.gitplex.server.web.page.project.commit.CommitQueryParser;import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class CommitQueryBehavior extends ANTLRAssistBehavior {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;private static final String VALUE_OPEN = "(";@@ -39,15 +40,15 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {"yesterday midnight", "3 days ago", "last week", "last Monday","4 weeks ago", "1 month 2 days ago", "1 year ago"};- public CommitQueryBehavior(IModel<Depot> depotModel) {+ public CommitQueryBehavior(IModel<Project> projectModel) {super(CommitQueryParser.class, "query");- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Overridepublic void detach(Component component) {super.detach(component);- depotModel.detach();+ projectModel.detach();}@Override@@ -62,13 +63,13 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {int tokenType = expectedElement.getRoot().getLastMatchedToken().getType();String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();switch (tokenType) {case CommitQueryParser.BRANCH:- suggestions.addAll(SuggestionUtils.suggestBranch(depot, unfencedMatchWith));+ suggestions.addAll(SuggestionUtils.suggestBranch(project, unfencedMatchWith));break;case CommitQueryParser.TAG:- suggestions.addAll(SuggestionUtils.suggestTag(depot, unfencedMatchWith));+ suggestions.addAll(SuggestionUtils.suggestTag(project, unfencedMatchWith));break;case CommitQueryParser.AUTHOR:case CommitQueryParser.COMMITTER:@@ -76,9 +77,9 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);List<NameAndEmail> contributors;if (tokenType == CommitQueryParser.AUTHOR)- contributors = commitInfoManager.getAuthors(depot);+ contributors = commitInfoManager.getAuthors(project);else- contributors = commitInfoManager.getCommitters(depot);+ contributors = commitInfoManager.getCommitters(project);for (NameAndEmail contributor: contributors) {String content;if (StringUtils.isNotBlank(contributor.getEmailAddress()))@@ -114,7 +115,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {}break;case CommitQueryParser.PATH:- suggestions.addAll(SuggestionUtils.suggestPath(depotModel.getObject(), unfencedMatchWith));+ suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedMatchWith));break;}return suggestions;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.htmldiff --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/project/commit/ProjectCommitsPage.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.javaindex c7aa556369..25dc9f2205 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/project/commit/ProjectCommitsPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.commit;+package com.gitplex.server.web.page.project.commit;import java.io.IOException;import java.io.Serializable;@@ -50,8 +50,8 @@ 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.model.Project;+import com.gitplex.server.model.support.ProjectAndRevision;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.concurrent.PrioritizedCallable;import com.gitplex.server.web.WebConstants;@@ -62,12 +62,12 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser.CriteriaContext;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser.FuzzyCriteriaContext;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser.QueryContext;-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitQueryParser.CriteriaContext;+import com.gitplex.server.web.page.project.commit.CommitQueryParser.FuzzyCriteriaContext;+import com.gitplex.server.web.page.project.commit.CommitQueryParser.QueryContext;+import com.gitplex.server.web.page.project.compare.RevisionComparePage;import com.gitplex.server.web.util.ajaxlistener.IndicateLoadingListener;import com.gitplex.server.web.util.model.CommitRefsModel;import com.google.common.base.Optional;@@ -78,9 +78,9 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport jersey.repackaged.com.google.common.base.Joiner;@SuppressWarnings("serial")-public class DepotCommitsPage extends DepotPage {+public class ProjectCommitsPage extends ProjectPage {- private static final Logger logger = LoggerFactory.getLogger(DepotCommitsPage.class);+ private static final Logger logger = LoggerFactory.getLogger(ProjectCommitsPage.class);private static final int LOG_PRIORITY = 1;@@ -120,7 +120,7 @@ public class DepotCommitsPage extends DepotPage {List<String> commitHashes;try {- RevListCommand command = new RevListCommand(getDepot().getGitDir());+ RevListCommand command = new RevListCommand(getProject().getGitDir());command.ignoreCase(true);if (state.page > MAX_PAGES)@@ -157,7 +157,7 @@ public class DepotCommitsPage extends DepotPage {} else if (revision.until) {command.revisions().add(revision.value);ranged = true;- } else if (getDepot().getBranchRef(revision.value) != null) {+ } else if (getProject().getBranchRef(revision.value) != null) {ranged = true;command.revisions().add(revision.value);} else {@@ -192,7 +192,7 @@ public class DepotCommitsPage extends DepotPage {hasMore = commitHashes.size() == state.page*COUNT;- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {int lastMaxCount = Math.min((state.page-1)*COUNT, commitHashes.size());commits.last = new ArrayList<>();@@ -220,9 +220,9 @@ public class DepotCommitsPage extends DepotPage {};- private CommitRefsModel labelsModel = new CommitRefsModel(depotModel);+ private CommitRefsModel labelsModel = new CommitRefsModel(projectModel);- public DepotCommitsPage(PageParameters params) {+ public ProjectCommitsPage(PageParameters params) {super(params);state.compareWith = params.get(PARAM_COMPARE_WITH).toString();@@ -278,7 +278,7 @@ public class DepotCommitsPage extends DepotPage {};- queryForm.add(queryInput.add(new CommitQueryBehavior(depotModel)));+ queryForm.add(queryInput.add(new CommitQueryBehavior(projectModel)));queryForm.add(new AjaxButton("submit") {});queryForm.setOutputMarkupId(true);@@ -391,8 +391,8 @@ public class DepotCommitsPage extends DepotPage {}private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotCommitsPage.class, params);+ PageParameters params = paramsOf(getProject(), state);+ CharSequence url = RequestCycle.get().urlFor(ProjectCommitsPage.class, params);pushState(target, url.toString(), state);}@@ -425,7 +425,7 @@ public class DepotCommitsPage extends DepotPage {item = new Fragment(itemId, "commitFrag", this);item.add(new ContributorAvatars("avatar", commit.getAuthorIdent(), commit.getCommitterIdent()));- item.add(new ExpandableCommitMessagePanel("message", depotModel, new LoadableDetachableModel<RevCommit>() {+ item.add(new ExpandableCommitMessagePanel("message", projectModel, new LoadableDetachableModel<RevCommit>() {@Overrideprotected RevCommit load() {@@ -489,18 +489,18 @@ public class DepotCommitsPage extends DepotPage {} else {blobIdent = new BlobIdent(commit.name(), null, FileMode.TREE.getBits());}- DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);- PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);- item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), browseState);+ item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));if (state.compareWith != null) {RevisionComparePage.State compareState = new RevisionComparePage.State();- compareState.leftSide = new DepotAndRevision(getDepot(), commit.name());- compareState.rightSide = new DepotAndRevision(getDepot(), state.compareWith);+ compareState.leftSide = new ProjectAndRevision(getProject(), commit.name());+ compareState.rightSide = new ProjectAndRevision(getProject(), state.compareWith);compareState.pathFilter = path;compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;- params = RevisionComparePage.paramsOf(getDepot(), compareState);+ params = RevisionComparePage.paramsOf(getProject(), compareState);item.add(new ViewStateAwarePageLink<Void>("compare", RevisionComparePage.class, params));} else {item.add(new WebMarkupContainer("compare").setVisible(false));@@ -508,7 +508,7 @@ public class DepotCommitsPage extends DepotPage {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();- params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);item.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));@@ -526,8 +526,8 @@ public class DepotCommitsPage extends DepotPage {return item;}- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, State state) {+ PageParameters params = paramsOf(project);if (state.compareWith != null)params.set(PARAM_COMPARE_WITH, state.compareWith);if (state.query != null)@@ -537,11 +537,6 @@ public class DepotCommitsPage extends DepotPage {return params;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotCommitsPage.class, paramsOf(depot));- }-@Overrideprotected void onPopState(AjaxRequestTarget target, Serializable data) {super.onPopState(target, data);@@ -590,7 +585,7 @@ public class DepotCommitsPage extends DepotPage {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));- response.render(CssHeaderItem.forReference(new DepotCommitsResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectCommitsResourceReference()));response.render(OnDomReadyHeaderItem.forScript(renderCommitGraph()));}@@ -633,7 +628,7 @@ public class DepotCommitsPage extends DepotPage {FuzzyCriteriaContext fuzzyCriteria = criteria.fuzzyCriteria();if (fuzzyCriteria != null && fuzzyCriteria.UNTIL() == null&& fuzzyCriteria.SINCE() == null- && getDepot().getObjectId(fuzzyCriteria.getText(), false) == null) {+ && getProject().getObjectId(fuzzyCriteria.getText(), false) == null) {fuzzyMessages.add(fuzzyCriteria.getText());}}@@ -656,7 +651,7 @@ public class DepotCommitsPage extends DepotPage {revisions.add(revision);} else {FuzzyCriteriaContext fuzzyCriteria = criteria.fuzzyCriteria();- if (fuzzyCriteria != null && getDepot().getObjectId(fuzzyCriteria.FuzzyValue().getText(), false) != null) {+ if (fuzzyCriteria != null && getProject().getObjectId(fuzzyCriteria.FuzzyValue().getText(), false) != null) {Revision revision = new Revision();revision.value = fuzzyCriteria.FuzzyValue().getText();if (fuzzyCriteria.SINCE() != null)diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsResourceReference.javanew file mode 100644index 0000000000..5d153e2d8c--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.project.commit;++import org.apache.wicket.request.resource.CssResourceReference;++public class ProjectCommitsResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectCommitsResourceReference() {+ super(ProjectCommitsResourceReference.class, "project-commits.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.css b/web/src/main/java/com/gitplex/server/web/page/project/commit/commit-detail.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.cssrename to web/src/main/java/com/gitplex/server/web/page/project/commit/commit-detail.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.js b/web/src/main/java/com/gitplex/server/web/page/project/commit/commit-detail.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.jsrename to web/src/main/java/com/gitplex/server/web/page/project/commit/commit-detail.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.css b/web/src/main/java/com/gitplex/server/web/page/project/commit/project-commits.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.cssrename to web/src/main/java/com/gitplex/server/web/page/project/commit/project-commits.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.html b/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.htmldiff --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/project/compare/RevisionComparePage.javasimilarity index 80%rename from web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javarename to web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.javaindex 7bb4ae1cc0..19bd4618f2 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/project/compare/RevisionComparePage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.compare;+package com.gitplex.server.web.page.project.compare;import java.io.IOException;import java.io.Serializable;@@ -33,11 +33,11 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MarkPos;-import com.gitplex.server.model.support.DepotAndBranch;-import com.gitplex.server.model.support.DepotAndRevision;+import com.gitplex.server.model.support.ProjectAndBranch;+import com.gitplex.server.model.support.ProjectAndRevision;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.component.commitlist.CommitListPanel;@@ -48,18 +48,18 @@ import com.gitplex.server.web.component.revisionpicker.AffinalRevisionPicker;import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;import com.gitplex.server.web.component.tabbable.Tabbable;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")-public class RevisionComparePage extends DepotPage implements MarkSupport {+public class RevisionComparePage extends ProjectPage implements MarkSupport {public enum TabPanel {COMMITS,@@ -109,8 +109,8 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {private Tabbable tabbable;- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, State state) {+ PageParameters params = paramsOf(project);params.set(PARAM_LEFT, state.leftSide.toString());params.set(PARAM_RIGHT, state.rightSide.toString());params.set(PARAM_COMPARE_WITH_MERGE_BASE, state.compareWithMergeBase);@@ -130,36 +130,36 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {public RevisionComparePage(PageParameters params) {super(params);- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));String str = params.get(PARAM_LEFT).toString();if (str != null) {- state.leftSide = new DepotAndRevision(str);+ state.leftSide = new ProjectAndRevision(str);} else {- state.leftSide = new DepotAndRevision(getDepot(), getDepot().getDefaultBranch());+ state.leftSide = new ProjectAndRevision(getProject(), getProject().getDefaultBranch());}leftCommitId = state.leftSide.getCommit().copy();str = params.get(PARAM_RIGHT).toString();if (str != null) {- state.rightSide = new DepotAndRevision(str);+ state.rightSide = new ProjectAndRevision(str);} else {- state.rightSide = new DepotAndRevision(getDepot(), getDepot().getDefaultBranch());+ state.rightSide = new ProjectAndRevision(getProject(), getProject().getDefaultBranch());}rightCommitId = state.rightSide.getCommit().copy();state.compareWithMergeBase = params.get(PARAM_COMPARE_WITH_MERGE_BASE).toBoolean(true);/*- * When compare across different repositories, left revision and right revision might not- * exist in same repository and this cause many difficulties such as calculating changes,+ * When compare across different projects, left revision and right revision might not+ * exist in same project and this cause many difficulties such as calculating changes,* recording comment revisions, or get permanent mark urls. So we add below constraint as* merge base commit and right side revision are guaranteed to be both in right side- * repository+ * project*/- if (!state.compareWithMergeBase && !state.leftSide.getDepot().equals(state.rightSide.getDepot())) {- throw new IllegalArgumentException("Can only compare with common ancestor when different repositories are involved");+ if (!state.compareWithMergeBase && !state.leftSide.getProject().equals(state.rightSide.getProject())) {+ throw new IllegalArgumentException("Can only compare with common ancestor when different projects are involved");}state.pathFilter = params.get(PARAM_PATH_FILTER).toString();@@ -175,8 +175,8 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {@Overrideprotected PullRequest load() {if (state.leftSide.getBranch() != null && state.rightSide.getBranch() != null) {- DepotAndBranch left = new DepotAndBranch(state.leftSide.toString());- DepotAndBranch right = new DepotAndBranch(state.rightSide.toString());+ ProjectAndBranch left = new ProjectAndBranch(state.leftSide.toString());+ ProjectAndBranch right = new ProjectAndBranch(state.rightSide.toString());return GitPlex.getInstance(PullRequestManager.class).findEffective(left, right);} else {return null;@@ -186,11 +186,11 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {};try {- Ref ref = state.rightSide.getDepot().getRepository().findRef(state.rightSide.getRevision());+ Ref ref = state.rightSide.getProject().getRepository().findRef(state.rightSide.getRevision());String refName = ref!=null?ref.getName():null;mergeBase = GitUtils.getMergeBase(- state.leftSide.getDepot().getRepository(), leftCommitId,- state.rightSide.getDepot().getRepository(), rightCommitId,+ state.leftSide.getProject().getRepository(), leftCommitId,+ state.rightSide.getProject().getRepository(), rightCommitId,refName);} catch (IOException e) {throw new RuntimeException(e);@@ -201,10 +201,10 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {@Overrideprotected List<RevCommit> load() {List<RevCommit> commits = new ArrayList<>();- Depot rightDepot = state.rightSide.getDepot();+ Project rightProject = state.rightSide.getProject();- try (RevWalk revWalk = new RevWalk(state.rightSide.getDepot().getRepository())) {- if (rightDepot.equals(state.leftSide.getDepot())+ try (RevWalk revWalk = new RevWalk(state.rightSide.getProject().getRepository())) {+ if (rightProject.equals(state.leftSide.getProject())&& !state.compareWithMergeBase&& !mergeBase.equals(leftCommitId)) {revWalk.markStart(revWalk.parseCommit(rightCommitId));@@ -216,7 +216,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {* note that we can not get merge commit object in current revWalk as* it has been marked and this will make the commit object incomplete*/- commits.add(getDepot().getRevCommit(mergeBase));+ commits.add(getProject().getRevCommit(mergeBase));} else {revWalk.markStart(revWalk.parseCommit(rightCommitId));revWalk.markUninteresting(revWalk.parseCommit(mergeBase));@@ -239,12 +239,12 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {setOutputMarkupId(true);- add(new AffinalRevisionPicker("leftRevSelector", state.leftSide.getDepotId(), state.leftSide.getRevision()) {+ add(new AffinalRevisionPicker("leftRevSelector", state.leftSide.getProjectId(), state.leftSide.getRevision()) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot, String revision) {+ protected void onSelect(AjaxRequestTarget target, Project project, String revision) {State newState = new State();- newState.leftSide = new DepotAndRevision(depot, revision);+ newState.leftSide = new ProjectAndRevision(project, revision);newState.rightSide = state.rightSide;newState.pathFilter = state.pathFilter;newState.tabPanel = state.tabPanel;@@ -253,7 +253,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {newState.mark = state.mark;newState.tabPanel = state.tabPanel;- PageParameters params = paramsOf(depot, newState);+ PageParameters params = paramsOf(project, newState);/** Use below code instead of calling setResponsePage() to make sure the dropdown is@@ -288,7 +288,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {newState.mark = state.mark;newState.tabPanel = state.tabPanel;- PageParameters params = RevisionComparePage.paramsOf(depotModel.getObject(), newState);+ PageParameters params = RevisionComparePage.paramsOf(projectModel.getObject(), newState);// Refer to comments in left revision picker for not using setResponsePageString url = RequestCycle.get().urlFor(RevisionComparePage.class, params).toString();@@ -299,33 +299,33 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {add(checkBox);String tooltip;- if (!state.leftSide.getDepot().equals(state.rightSide.getDepot())) {+ if (!state.leftSide.getProject().equals(state.rightSide.getProject())) {checkBox.add(AttributeAppender.append("disabled", "disabled"));- tooltip = "Can only compare with common ancestor when different repositories are involved";+ tooltip = "Can only compare with common ancestor when different projects are involved";} else {tooltip = "Check this to compare \"right side\" with common ancestor of left and right";}add(new WebMarkupContainer("mergeBaseTooltip").add(new TooltipBehavior(Model.of(tooltip))));- PageParameters params = CommitDetailPage.paramsOf(state.leftSide.getDepot(), state.leftSide.getCommit().name());+ PageParameters params = CommitDetailPage.paramsOf(state.leftSide.getProject(), state.leftSide.getCommit().name());Link<Void> leftCommitLink = new ViewStateAwarePageLink<Void>("leftCommitLink", CommitDetailPage.class, params);leftCommitLink.add(new Label("message", state.leftSide.getCommit().getShortMessage()));add(leftCommitLink);- params = CommitDetailPage.paramsOf(state.rightSide.getDepot(), state.rightSide.getCommit().name());+ params = CommitDetailPage.paramsOf(state.rightSide.getProject(), state.rightSide.getCommit().name());Link<Void> rightCommitLink = new ViewStateAwarePageLink<Void>("rightCommitLink", CommitDetailPage.class, params);rightCommitLink.add(new Label("message", state.rightSide.getCommit().getShortMessage()));add(rightCommitLink);add(new AffinalRevisionPicker("rightRevSelector",- state.rightSide.getDepotId(), state.rightSide.getRevision()) {+ state.rightSide.getProjectId(), state.rightSide.getRevision()) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot, String revision) {+ protected void onSelect(AjaxRequestTarget target, Project project, String revision) {State newState = new State();newState.leftSide = state.leftSide;- newState.rightSide = new DepotAndRevision(depot, revision);+ newState.rightSide = new ProjectAndRevision(project, revision);newState.pathFilter = state.pathFilter;newState.tabPanel = state.tabPanel;newState.whitespaceOption = state.whitespaceOption;@@ -333,7 +333,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {newState.mark = state.mark;newState.tabPanel = state.tabPanel;- PageParameters params = paramsOf(getDepot(), newState);+ PageParameters params = paramsOf(getProject(), newState);setResponsePage(RevisionComparePage.class, params);}@@ -352,7 +352,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {newState.compareWithMergeBase = state.compareWithMergeBase;newState.mark = state.mark;- setResponsePage(RevisionComparePage.class,paramsOf(getDepot(), newState));+ setResponsePage(RevisionComparePage.class,paramsOf(getProject(), newState));}});@@ -361,9 +361,9 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {@Overridepublic void onClick() {- DepotAndBranch left = new DepotAndBranch(state.leftSide.toString());- DepotAndBranch right = new DepotAndBranch(state.rightSide.toString());- setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(left.getDepot(), left, right));+ ProjectAndBranch left = new ProjectAndBranch(state.leftSide.toString());+ ProjectAndBranch right = new ProjectAndBranch(state.rightSide.toString());+ setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(left.getProject(), left, right));}@Override@@ -494,15 +494,15 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {}private void newTabPanel(@Nullable AjaxRequestTarget target) {- IModel<Depot> depotModel = new LoadableDetachableModel<Depot>() {+ IModel<Project> projectModel = new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- Depot depot = state.rightSide.getDepot();- if (state.leftSide.getDepot().equals(state.rightSide.getDepot()))- depot.cacheObjectId(state.leftSide.getRevision(), leftCommitId);- depot.cacheObjectId(state.rightSide.getRevision(), rightCommitId);- return depot;+ protected Project load() {+ Project project = state.rightSide.getProject();+ if (state.leftSide.getProject().equals(state.rightSide.getProject()))+ project.cacheObjectId(state.leftSide.getRevision(), leftCommitId);+ project.cacheObjectId(state.rightSide.getRevision(), rightCommitId);+ return project;}};@@ -565,13 +565,13 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {};- tabPanel = new RevisionDiffPanel(TAB_PANEL_ID, depotModel,+ tabPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,new Model<PullRequest>(null),state.compareWithMergeBase?mergeBase.name():state.leftSide.getRevision(),state.rightSide.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this);break;default:- tabPanel = new CommitListPanel(TAB_PANEL_ID, depotModel, commitsModel);+ tabPanel = new CommitListPanel(TAB_PANEL_ID, projectModel, commitsModel);if (!mergeBase.equals(leftCommitId) && !state.compareWithMergeBase) {tabPanel.add(AttributeAppender.append("class", "with-merge-base"));@@ -588,7 +588,7 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {}private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);+ PageParameters params = paramsOf(getProject(), state);CharSequence url = RequestCycle.get().urlFor(RevisionComparePage.class, params);pushState(target, url.toString(), state);}@@ -612,18 +612,13 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {super.onDetach();}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RevisionComparePage.class, paramsOf(depot));- }-public static class State implements Serializable {private static final long serialVersionUID = 1L;- public DepotAndRevision leftSide;+ public ProjectAndRevision leftSide;- public DepotAndRevision rightSide;+ public ProjectAndRevision rightSide;public boolean compareWithMergeBase = true;@@ -665,15 +660,15 @@ public class RevisionComparePage extends DepotPage implements MarkSupport {@Overridepublic String getMarkUrl(MarkPos mark) {State markState = new State();- markState.leftSide = new DepotAndRevision(state.rightSide.getDepot(),+ markState.leftSide = new ProjectAndRevision(state.rightSide.getProject(),state.compareWithMergeBase?mergeBase.name():leftCommitId.name());- markState.rightSide = new DepotAndRevision(state.rightSide.getDepot(), rightCommitId.name());+ markState.rightSide = new ProjectAndRevision(state.rightSide.getProject(), rightCommitId.name());markState.mark = mark;markState.pathFilter = state.pathFilter;markState.tabPanel = TabPanel.CHANGES;markState.whitespaceOption = state.whitespaceOption;markState.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, paramsOf(markState.rightSide.getDepot(), markState)).toString();+ return urlFor(RevisionComparePage.class, paramsOf(markState.rightSide.getProject(), markState)).toString();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionCompareResourceReference.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionCompareResourceReference.javaindex 550f01a12f..df43fbe6af 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionCompareResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.compare;+package com.gitplex.server.web.page.project.compare;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/revision-compare.css b/web/src/main/java/com/gitplex/server/web/page/project/compare/revision-compare.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/compare/revision-compare.cssrename to web/src/main/java/com/gitplex/server/web/page/project/compare/revision-compare.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.htmlsimilarity index 59%rename from web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.htmlindex 8316689bbf..bbaa1c7a61 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.html@@ -1,10 +1,6 @@<wicket:panel><div class="fork-options"><form wicket:id="form" class="leave-confirm">- <div class="form-group">- <label class="control-label">Fork To Account<span class="required">*</span></label>- <input wicket:id="owner" type="hidden" class="form-control"></input>- </div><div wicket:id="editor"></div><div class="actions"><button wicket:id="save" class="btn btn-primary">Ok</button>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.javanew file mode 100644index 0000000000..ffe9363655--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java@@ -0,0 +1,92 @@+package com.gitplex.server.web.page.project.moreinfo;++import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+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 org.apache.wicket.model.IModel;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+abstract class ForkOptionPanel extends Panel {++ private final IModel<Project> projectModel;++ public ForkOptionPanel(String id, IModel<Project> projectModel) {+ super(id);+ this.projectModel = projectModel;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Project project = new Project();+ project.setForkedFrom(getProject());+ project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());++ BeanEditor<?> editor = BeanContext.editBean("editor", project);++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ form.add(editor);++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);+ Project projectWithSameName = projectManager.find(project.getName());+ if (projectWithSameName != null) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another project");+ target.add(form);+ } else {+ projectManager.fork(getProject(), project);+ Session.get().success("Repository forked");+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });+ add(form);+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }++ protected abstract void onClose(AjaxRequestTarget target);++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.htmlsimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.htmlindex b3b5561be4..d7e5afd327 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="depot more-info">+ <div class="project more-info"><div class="general"><wicket:enclosure child="forkedFromLink"><span>forked from: <a wicket:id="forkedFromLink"><span wicket:id="name"></span></a></span>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/project/moreinfo/MoreInfoPanel.javasimilarity index 63%rename from web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.javaindex 5b4f31c897..b849c7c689 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/project/moreinfo/MoreInfoPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.moreinfo;+package com.gitplex.server.web.page.project.moreinfo;import java.util.Collection;@@ -20,39 +20,39 @@ import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.UrlManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;-import com.gitplex.server.web.component.depotselector.DepotSelector;+import com.gitplex.server.web.component.projectselector.ProjectSelector;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.server.web.page.depot.tags.DepotTagsPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;+import com.gitplex.server.web.page.project.commit.ProjectCommitsPage;+import com.gitplex.server.web.page.project.tags.ProjectTagsPage;@SuppressWarnings("serial")public abstract class MoreInfoPanel extends Panel {- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public MoreInfoPanel(String id, IModel<Depot> depotModel) {+ public MoreInfoPanel(String id, IModel<Project> projectModel) {super(id);- this.depotModel = depotModel;+ this.projectModel = projectModel;}@Overrideprotected void onInitialize() {super.onInitialize();- if (getDepot().getForkedFrom() != null) {+ if (getProject().getForkedFrom() != null) {Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot().getForkedFrom()));- link.add(new Label("name", getDepot().getForkedFrom().getFQN()));+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom()));+ link.add(new Label("name", getProject().getForkedFrom().getName()));add(link);} else {WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");@@ -60,60 +60,60 @@ public abstract class MoreInfoPanel extends Panel {link.setVisible(false);add(link);}- add(new Label("id", getDepot().getId()));+ add(new Label("id", getProject().getId()));UrlManager urlManager = GitPlex.getInstance(UrlManager.class);- Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getDepot()));+ Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));add(new TextField<String>("cloneUrl", cloneUrlModel));add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));- if (getDepot().getDescription() != null) {- add(new MarkdownViewer("description", Model.of(getDepot().getDescription()), null));+ if (getProject().getDescription() != null) {+ add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));} else {add(new WebMarkupContainer("description").setVisible(false));}add(new ViewStateAwarePageLink<Void>("commitsLink",- DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot())) {+ ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(GitPlex.getInstance(CommitInfoManager.class).getCommitCount(getDepot()) != 0);+ setVisible(GitPlex.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);}@Overrideprotected void onInitialize() {super.onInitialize();CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);- add(new Label("count", commitInfoManager.getCommitCount(getDepot()) + " commits"));+ add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));}});add(new ViewStateAwarePageLink<Void>("branchesLink",- DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot())) {+ ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("count", getDepot().getRefs(Constants.R_HEADS).size() + " branches"));+ add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));}});add(new ViewStateAwarePageLink<Void>("tagsLink",- DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot())) {+ ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("count", getDepot().getRefs(Constants.R_TAGS).size() + " tags"));+ add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));}});- if (getDepot().getForks().isEmpty()) {+ if (getProject().getForks().isEmpty()) {add(new WebMarkupContainer("forks") {@Override@@ -135,23 +135,23 @@ public abstract class MoreInfoPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", getDepot().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));+ add(new Label("label", getProject().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));}@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new DepotSelector(id, new LoadableDetachableModel<Collection<Depot>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {@Override- protected Collection<Depot> load() {- return getDepot().getForks();+ protected Collection<Project> load() {+ return getProject().getForks();}- }, Depot.idOf(getDepot())) {+ }, Project.idOf(getProject())) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));+ protected void onSelect(AjaxRequestTarget target, Project project) {+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));}};@@ -170,7 +170,7 @@ public abstract class MoreInfoPanel extends Panel {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new ForkOptionPanel(id, depotModel) {+ return new ForkOptionPanel(id, projectModel) {@Overrideprotected void onClose(AjaxRequestTarget target) {@@ -180,16 +180,16 @@ public abstract class MoreInfoPanel extends Panel {};}- }.setVisible(SecurityUtils.getAccount() != null));+ }.setVisible(SecurityUtils.getUser() != null));}- private Depot getDepot() {- return depotModel.getObject();+ private Project getProject() {+ return projectModel.getObject();}@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoResourceReference.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoResourceReference.javaindex 0461565451..5ee9bc5f46 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.moreinfo;+package com.gitplex.server.web.page.project.moreinfo;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/more-info.css b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.csssimilarity index 57%rename from web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/more-info.cssrename to web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.cssindex 8e633e004d..65507831e1 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/more-info.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.css@@ -1,36 +1,36 @@-.depot.more-info {+.project.more-info {padding: 20px;width: 600px;}-.depot.more-info>div {+.project.more-info>div {margin-bottom: 20px;}-.depot.more-info>.general {+.project.more-info>.general {border-bottom: 1px solid #ddd;padding-bottom: 20px;font-size: 20px;}-.depot.more-info>.general>a {+.project.more-info>.general>a {color: #777;}-.depot.more-info>.general>span {+.project.more-info>.general>span {margin-right: 16px;}-.depot.more-info>.description {+.project.more-info>.description {border: 1px solid #DDD;padding: 20px 20px 10px 20px;border-radius: 4px;background: #F5F5F5;}-.depot.more-info>.metrics>a, .depot.more-info>.metrics>span {+.project.more-info>.metrics>a, .project.more-info>.metrics>span {font-size: 16px;color: #444;margin-right: 20px;}-.depot.more-info>.clone {+.project.more-info>.clone {margin-bottom: 20px;}-.depot.more-info>.clone input {+.project.more-info>.clone input {background: white;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/no-branches.css b/web/src/main/java/com/gitplex/server/web/page/project/no-branches.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/no-branches.cssrename to web/src/main/java/com/gitplex/server/web/page/project/no-branches.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/project/project.css b/web/src/main/java/com/gitplex/server/web/page/project/project.cssnew file mode 100644index 0000000000..8a0d442068--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/project.css@@ -0,0 +1,52 @@+#project-head .pull-left {+ margin-right: 4px;+}+#project-head .more-info {+ background: #444;+ padding: 0 8px;+ border-radius: 4px;+ font-size: 14px;+ margin-top: 6px;+ margin-left: 8px;+}+#project-head .more-info:hover, #project-head .more-info.dropdown-open {+ background: #777;+}++#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle {+ display: block;+ margin-top: -20px;+ text-align: right;+ font-size: 20px;+ padding-right: 20px;+ border-bottom: 1px solid #BBB;+ text-decoration: none;+ color: #666;+ height: 31px;+}+#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {+ color: #333;+}+#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle>span:before {+ font-family: "FontAwesome";+ content: "\f100";+}+#project>.sidebar>table>tbody>tr>td.mini.nav>.mini-toggle>span:before {+ content: "\f101";+}+#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {+ background: #EEE;+}+#project>.sidebar>table>tbody>tr>td.nav>.tabs>li>a {+ width: 220px;+}+#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a {+ width: auto;+}+#project>.sidebar>table>tbody>tr>td.mini.nav {+ width: 40px;+}+#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.text,+#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.badge {+ display: none;+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/depot.js b/web/src/main/java/com/gitplex/server/web/page/project/project.jssimilarity index 78%rename from web/src/main/java/com/gitplex/server/web/page/depot/depot.jsrename to web/src/main/java/com/gitplex/server/web/page/project/project.jsindex 010841e57d..3533cf82a5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/depot.js+++ b/web/src/main/java/com/gitplex/server/web/page/project/project.js@@ -1,5 +1,5 @@-gitplex.server.depot = function() {- var $nav = $("#depot>.sidebar>table>tbody>tr>td.nav");+gitplex.server.project = function() {+ var $nav = $("#project>.sidebar>table>tbody>tr>td.nav");function enableTooltip() {$nav.find("li a").each(function() {@@ -7,7 +7,7 @@ gitplex.server.depot = function() {});}- var cookieKey = "repository.miniSidebar";+ var cookieKey = "project.miniSidebar";if (Cookies.get(cookieKey) === "yes")enableTooltip();diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.htmlsimilarity index 89%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.htmlindex 12eb2f8250..5f6267978d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html@@ -63,17 +63,6 @@</div></div></wicket:fragment>- <wicket:fragment wicket:id="rejectedFrag">- <div class="alert alert-danger">- <div class="summary">- <span class="fa fa-lg fa-warning"></span>- <span class="message">Gatekeeper of target repository rejects the pull request for below reasons:</span>- </div>- <ul class="detail">- <li wicket:id="reasons"><span wicket:id="reason"></span></li>- </ul>- </div>- </wicket:fragment><wicket:fragment wicket:id="canSendFrag"><div class="can-send"><form wicket:id="form" class="leave-confirm">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/project/pullrequest/newrequest/NewRequestPage.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.javaindex 950e22af0b..4518db3674 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/project/pullrequest/newrequest/NewRequestPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.newrequest;+package com.gitplex.server.web.page.project.pullrequest.newrequest;import java.io.IOException;import java.util.ArrayList;@@ -39,21 +39,21 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.ReviewInvitation;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.CloseInfo;import com.gitplex.server.model.support.MarkPos;-import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.model.support.MergeStrategy;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.branchpicker.AffinalBranchPicker;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;import com.gitplex.server.web.component.commitlist.CommitListPanel;import com.gitplex.server.web.component.diff.revision.MarkSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;@@ -65,13 +65,12 @@ import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.base.BasePage;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.compare.RevisionComparePage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.page.security.LoginPage;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.PageDataChanged;@@ -81,15 +80,15 @@ import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")-public class NewRequestPage extends DepotPage implements MarkSupport {+public class NewRequestPage extends ProjectPage implements MarkSupport {private static final String TABS_ID = "tabs";private static final String TAB_PANEL_ID = "tabPanel";- private DepotAndBranch target;+ private ProjectAndBranch target;- private DepotAndBranch source;+ private ProjectAndBranch source;private IModel<List<RevCommit>> commitsModel;@@ -103,8 +102,8 @@ public class NewRequestPage extends DepotPage implements MarkSupport {private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;- public static PageParameters paramsOf(Depot depot, DepotAndBranch target, DepotAndBranch source) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {+ PageParameters params = paramsOf(project);params.set("target", target.toString());params.set("source", source.toString());return params;@@ -113,10 +112,10 @@ public class NewRequestPage extends DepotPage implements MarkSupport {public NewRequestPage(PageParameters params) {super(params);- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));- Account currentUser = getLoginUser();+ User currentUser = getLoginUser();if (currentUser == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);@@ -124,30 +123,30 @@ public class NewRequestPage extends DepotPage implements MarkSupport {String targetParam = params.get("target").toString();String sourceParam = params.get("source").toString();if (targetParam != null) {- target = new DepotAndBranch(targetParam);+ target = new ProjectAndBranch(targetParam);} else {- prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());+ prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());if (prevRequest != null && prevRequest.getTarget().getObjectId(false) != null) {target = prevRequest.getTarget();- } else if (getDepot().getForkedFrom() != null) {- target = new DepotAndBranch(getDepot().getForkedFrom(),- getDepot().getForkedFrom().getDefaultBranch());+ } else if (getProject().getForkedFrom() != null) {+ target = new ProjectAndBranch(getProject().getForkedFrom(),+ getProject().getForkedFrom().getDefaultBranch());} else {- target = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());}}if (sourceParam != null) {- source = new DepotAndBranch(sourceParam);+ source = new ProjectAndBranch(sourceParam);} else {if (prevRequest == null)- prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());+ prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());if (prevRequest != null && prevRequest.getSource().getObjectId(false) != null) {source = prevRequest.getSource();- } else if (getDepot().getForkedFrom() != null) {- source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());+ } else if (getProject().getForkedFrom() != null) {+ source = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());} else {- source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());+ source = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());}}@@ -159,8 +158,8 @@ public class NewRequestPage extends DepotPage implements MarkSupport {if (pullRequestRef.get() == null) {ObjectId baseCommitId = GitUtils.getMergeBase(- target.getDepot().getRepository(), target.getObjectId(),- source.getDepot().getRepository(), source.getObjectId(),+ target.getProject().getRepository(), target.getObjectId(),+ source.getProject().getRepository(), source.getObjectId(),GitUtils.branch2ref(source.getBranch()));if (baseCommitId != null) {pullRequestRef.set(new PullRequest());@@ -191,7 +190,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {if (pullRequestRef.get() != null) {pullRequestRef.get().setTarget(target);pullRequestRef.get().setSource(source);- pullRequestRef.get().setSubmitter(SecurityUtils.getAccount());+ pullRequestRef.get().setSubmitter(SecurityUtils.getUser());}return pullRequestRef.get();}@@ -216,7 +215,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {protected List<RevCommit> load() {PullRequest request = getPullRequest();List<RevCommit> commits = new ArrayList<>();- try (RevWalk revWalk = new RevWalk(source.getDepot().getRepository())) {+ try (RevWalk revWalk = new RevWalk(source.getProject().getRepository())) {ObjectId headId = ObjectId.fromString(request.getHeadCommitHash());revWalk.markStart(revWalk.parseCommit(headId));ObjectId baseId = ObjectId.fromString(request.getBaseCommitHash());@@ -242,11 +241,11 @@ public class NewRequestPage extends DepotPage implements MarkSupport {setOutputMarkupId(true);- add(new AffinalBranchPicker("target", target.getDepotId(), target.getBranch()) {+ add(new AffinalBranchPicker("target", target.getProjectId(), target.getBranch()) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {- PageParameters params = paramsOf(depot, new DepotAndBranch(depot, branch), source);+ protected void onSelect(AjaxRequestTarget target, Project project, String branch) {+ PageParameters params = paramsOf(project, new ProjectAndBranch(project, branch), source);/** Use below code instead of calling setResponsePage() to make sure the dropdown is@@ -259,17 +258,17 @@ public class NewRequestPage extends DepotPage implements MarkSupport {}});- PageParameters params = CommitDetailPage.paramsOf(target.getDepot(), target.getObjectName());+ PageParameters params = CommitDetailPage.paramsOf(target.getProject(), target.getObjectName());Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));add(targetCommitLink);- add(new AffinalBranchPicker("source", source.getDepotId(), source.getBranch()) {+ add(new AffinalBranchPicker("source", source.getProjectId(), source.getBranch()) {@Override- protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {- PageParameters params = paramsOf(getDepot(), NewRequestPage.this.target,- new DepotAndBranch(depot, branch));+ protected void onSelect(AjaxRequestTarget target, Project project, String branch) {+ PageParameters params = paramsOf(getProject(), NewRequestPage.this.target,+ new ProjectAndBranch(project, branch));// Refer to comments in target branch picker for not using setResponsePageString url = RequestCycle.get().urlFor(NewRequestPage.class, params).toString();@@ -277,7 +276,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {}});- params = CommitDetailPage.paramsOf(source.getDepot(), source.getObjectName());+ params = CommitDetailPage.paramsOf(source.getProject(), source.getObjectName());Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));add(sourceCommitLink);@@ -286,7 +285,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {@Overridepublic void onClick() {- PageParameters params = paramsOf(source.getDepot(), source, target);+ PageParameters params = paramsOf(source.getProject(), source, target);setResponsePage(NewRequestPage.class, params);}@@ -350,7 +349,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {}private Component newCommitsPanel() {- return new CommitListPanel(TAB_PANEL_ID, depotModel, commitsModel) {+ return new CommitListPanel(TAB_PANEL_ID, projectModel, commitsModel) {@Overrideprotected void onConfigure() {@@ -364,14 +363,14 @@ public class NewRequestPage extends DepotPage implements MarkSupport {private RevisionDiffPanel newRevDiffPanel() {PullRequest request = getPullRequest();- IModel<Depot> depotModel = new LoadableDetachableModel<Depot>() {+ IModel<Project> projectModel = new LoadableDetachableModel<Project>() {@Override- protected Depot load() {- Depot depot = source.getDepot();- depot.cacheObjectId(source.getRevision(),+ protected Project load() {+ Project project = source.getProject();+ project.cacheObjectId(source.getRevision(),ObjectId.fromString(getPullRequest().getHeadCommitHash()));- return depot;+ return project;}};@@ -432,9 +431,9 @@ public class NewRequestPage extends DepotPage implements MarkSupport {* we are passing source revision here instead of head commit hash of latest update* as we want to preserve the branch name in case they are useful at some point* later. Also it is guaranteed to be resolved to the same commit has as we've cached- * it above when loading the depot+ * it above when loading the project*/- RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, depotModel,+ RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,new Model<PullRequest>(null), request.getBaseCommitHash(),source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {@@ -509,7 +508,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {public void onClick() {setResponsePage(NewRequestPage.class,- paramsOf(getDepot(), getPullRequest().getSource(), getPullRequest().getTarget()));+ paramsOf(getProject(), getPullRequest().getSource(), getPullRequest().getTarget()));}});@@ -521,7 +520,7 @@ public class NewRequestPage extends DepotPage implements MarkSupport {Form<?> form = new Form<Void>("form");fragment.add(form);- String autosaveKey = "autosave:newPullRequest:" + getDepot().getId();+ String autosaveKey = "autosave:newPullRequest:" + getProject().getId();form.add(new Button("send") {@@ -530,17 +529,17 @@ public class NewRequestPage extends DepotPage implements MarkSupport {super.onSubmit();Dao dao = GitPlex.getInstance(Dao.class);- DepotAndBranch target = getPullRequest().getTarget();- DepotAndBranch source = getPullRequest().getSource();+ ProjectAndBranch target = getPullRequest().getTarget();+ ProjectAndBranch source = getPullRequest().getSource();if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())|| !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {getSession().warn("Either target branch or source branch has new commits just now, please re-check.");- setResponsePage(NewRequestPage.class, paramsOf(getDepot(), target, source));+ setResponsePage(NewRequestPage.class, paramsOf(getProject(), target, source));} else {getPullRequest().setSource(source);getPullRequest().setTarget(target);for (ReviewInvitation invitation: getPullRequest().getReviewInvitations())- invitation.setUser(dao.load(Account.class, invitation.getUser().getId()));+ invitation.setUser(dao.load(User.class, invitation.getUser().getId()));GitPlex.getInstance(PullRequestManager.class).open(getPullRequest());@@ -640,12 +639,12 @@ public class NewRequestPage extends DepotPage implements MarkSupport {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());}@Override- protected Depot getDepot() {- return NewRequestPage.this.getDepot();+ protected Project getProject() {+ return NewRequestPage.this.getProject();}@Override@@ -728,11 +727,6 @@ public class NewRequestPage extends DepotPage implements MarkSupport {super.onDetach();}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-@Overridepublic MarkPos getMark() {return mark;@@ -742,13 +736,13 @@ public class NewRequestPage extends DepotPage implements MarkSupport {public String getMarkUrl(MarkPos mark) {RevisionComparePage.State state = new RevisionComparePage.State();state.mark = mark;- state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());- state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());+ state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());+ state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());state.pathFilter = pathFilter;state.tabPanel = RevisionComparePage.TabPanel.CHANGES;state.whitespaceOption = whitespaceOption;state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.javaindex f5968cec83..05ec17c6a8 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.newrequest;+package com.gitplex.server.web.page.project.pullrequest.newrequest;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.cssdiff --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/project/pullrequest/requestdetail/PullRequestOperation.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.javaindex 84e1faa842..1bca065fb6 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/project/pullrequest/requestdetail/PullRequestOperation.java@@ -1,13 +1,13 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import javax.annotation.Nullable;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.Review;import com.gitplex.server.model.support.MergePreview;@@ -43,7 +43,7 @@ public enum PullRequestOperation {review.setCommit(request.getHeadCommitHash());review.setNote(comment);review.setRequest(request);- review.setUser(SecurityUtils.getAccount());+ review.setUser(SecurityUtils.getUser());GitPlex.getInstance(ReviewManager.class).save(review);}@@ -64,7 +64,7 @@ public enum PullRequestOperation {review.setCommit(request.getHeadCommitHash());review.setNote(comment);review.setRequest(request);- review.setUser(SecurityUtils.getAccount());+ review.setUser(SecurityUtils.getUser());GitPlex.getInstance(ReviewManager.class).save(review);}@@ -77,10 +77,10 @@ public enum PullRequestOperation {return !request.isOpen()&& SecurityUtils.canModify(request)&& request.getTarget().getObjectName(false) != null- && request.getSourceDepot() != null+ && request.getSourceProject() != null&& request.getSource().getObjectName(false) != null&& pullRequestManager.findEffective(request.getTarget(), request.getSource()) == null- && !GitUtils.isMergedInto(request.getTargetDepot().getRepository(),+ && !GitUtils.isMergedInto(request.getTargetProject().getRepository(),request.getSource().getObjectId(), request.getTarget().getObjectId());}@@ -102,14 +102,14 @@ public enum PullRequestOperation {MergePreview preview = request.getLastMergePreview();PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);return request.isMerged()- && request.getSourceDepot() != null+ && request.getSourceProject() != null&& request.getSource().getObjectName(false) != null&& !request.getSource().isDefault()&& preview != null&& (request.getSource().getObjectName().equals(preview.getRequestHead())|| request.getSource().getObjectName().equals(preview.getMerged()))&& SecurityUtils.canModify(request)- && SecurityUtils.canDeleteBranch(request.getSourceDepot(), request.getSourceBranch())+ && SecurityUtils.canDeleteBranch(request.getSourceProject(), request.getSourceBranch())&& pullRequestManager.findAllOpenTo(request.getSource()).isEmpty();}@@ -123,16 +123,16 @@ public enum PullRequestOperation {@Overridepublic boolean canOperate(PullRequest request) {- return request.getSourceDepot() != null+ return request.getSourceProject() != null&& request.getSource().getObjectName(false) == null&& SecurityUtils.canModify(request)- && SecurityUtils.canWrite(request.getSourceDepot());+ && SecurityUtils.canWrite(request.getSourceProject());}};private static boolean canReview(PullRequest request) {- Account user = GitPlex.getInstance(AccountManager.class).getCurrent();+ User user = GitPlex.getInstance(UserManager.class).getCurrent();return request.getReviewStatus().getAwaitingReviewers().contains(user);}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.htmldiff --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/project/pullrequest/requestdetail/RequestDetailPage.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.javaindex f48668f51f..5bd0b79e7d 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/project/pullrequest/requestdetail/RequestDetailPage.java@@ -1,15 +1,15 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import static com.gitplex.server.model.support.MergeStrategy.ALWAYS_MERGE;import static com.gitplex.server.model.support.MergeStrategy.MERGE_IF_NECESSARY;import static com.gitplex.server.model.support.MergeStrategy.REBASE_MERGE;import static com.gitplex.server.model.support.MergeStrategy.SQUASH_MERGE;-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;-import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISCARD;-import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.REOPEN;-import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.APPROVE;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISCARD;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.REOPEN;+import static com.gitplex.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;import java.util.ArrayList;import java.util.Collection;@@ -56,19 +56,19 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.BranchLink;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;@@ -78,12 +78,12 @@ import com.gitplex.server.web.component.tabbable.PageTabLink;import com.gitplex.server.web.component.tabbable.Tab;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.base.BasePage;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview.MergePreviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.WicketUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -97,7 +97,7 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")-public abstract class RequestDetailPage extends DepotPage {+public abstract class RequestDetailPage extends ProjectPage {public static final String PARAM_REQUEST = "request";@@ -112,17 +112,17 @@ public abstract class RequestDetailPage extends DepotPage {public RequestDetailPage(PageParameters params) {super(params);- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));requestModel = new LoadableDetachableModel<PullRequest>() {@Overrideprotected PullRequest load() {Long requestNumber = params.get(PARAM_REQUEST).toLong();- PullRequest request = GitPlex.getInstance(PullRequestManager.class).find(getDepot(), requestNumber);+ PullRequest request = GitPlex.getInstance(PullRequestManager.class).find(getProject(), requestNumber);if (request == null)- throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in repository " + getDepot());+ throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in project " + getProject());return request;}@@ -351,8 +351,8 @@ public abstract class RequestDetailPage extends DepotPage {@Overridepublic void onEndRequest(RequestCycle cycle) {- if (SecurityUtils.getAccount() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(),+ if (SecurityUtils.getUser() != null) {+ GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getUser(),getPullRequest());}}@@ -422,12 +422,12 @@ public abstract class RequestDetailPage extends DepotPage {});- statusAndBranchesContainer.add(new AccountLink("user",- Account.getForDisplay(request.getSubmitter(), request.getSubmitterName())));+ statusAndBranchesContainer.add(new UserLink("user",+ User.getForDisplay(request.getSubmitter(), request.getSubmitterName())));statusAndBranchesContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));statusAndBranchesContainer.add(new BranchLink("target", request.getTarget(), null));- if (request.getSourceDepot() != null) {+ if (request.getSourceProject() != null) {statusAndBranchesContainer.add(new BranchLink("source", request.getSource(), getPullRequest()));} else {statusAndBranchesContainer.add(new Label("source", "unknown") {@@ -667,7 +667,7 @@ public abstract class RequestDetailPage extends DepotPage {Form<?> form = new Form<Void>("form");fragment.add(form);- DepotAndBranch source = request.getSource();+ ProjectAndBranch source = request.getSource();Preconditions.checkNotNull(source);String autosaveKey = "autosave:pullRequestOperation:" + getPullRequest().getId();@@ -676,13 +676,13 @@ public abstract class RequestDetailPage extends DepotPage {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(requestModel.getObject().getTargetDepot(),+ return new ProjectAttachmentSupport(requestModel.getObject().getTargetProject(),requestModel.getObject().getUUID());}@Override- protected Depot getDepot() {- return requestModel.getObject().getTargetDepot();+ protected Project getProject() {+ return requestModel.getObject().getTargetProject();}@Override@@ -891,7 +891,7 @@ public abstract class RequestDetailPage extends DepotPage {}public static PageParameters paramsOf(PullRequest request) {- PageParameters params = DepotPage.paramsOf(request.getTarget().getDepot());+ PageParameters params = ProjectPage.paramsOf(request.getTarget().getProject());params.set("request", request.getNumber());return params;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.javaindex 196b2d0d31..f9409f847e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlsimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlindex 606e1f2910..18385592a7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html@@ -3,7 +3,7 @@<wicket:fragment wicket:id="mergeInTargetFrag"><div class="conflict-resolve-instruction">- <p>Step 1: From working directory of repository <em wicket:id="destRepoName"></em>,+ <p>Step 1: From working directory of project <em wicket:id="destRepoName"></em>,check out target branch and merge with source branch.</p><div class="terminal"><div>git checkout <span wicket:id="destBranchNameForCheckout"></span></div>@@ -25,7 +25,7 @@<wicket:fragment wicket:id="mergeInSourceFrag"><div class="conflict-resolve-instruction">- <p>Step 1: From working directory of repository <em wicket:id="srcRepoName"></em>,+ <p>Step 1: From working directory of project <em wicket:id="srcRepoName"></em>,check out source branch and merge with target branch.</p><div class="terminal"><div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>@@ -47,7 +47,7 @@<wicket:fragment wicket:id="rebaseInTargetFrag"><div class="conflict-resolve-instruction">- <p>Step 1: From working directory of repository <em wicket:id="destRepoName"></em>,+ <p>Step 1: From working directory of project <em wicket:id="destRepoName"></em>,check out target branch and rebase to source branch.</p><div class="terminal"><div>git checkout <span wicket:id="destBranchNameForCheckout"></span></div>@@ -69,7 +69,7 @@<wicket:fragment wicket:id="rebaseInSourceFrag"><div class="conflict-resolve-instruction">- <p>Step 1: From working directory of repository <em wicket:id="srcRepoName"></em>,+ <p>Step 1: From working directory of project <em wicket:id="srcRepoName"></em>,check out source branch and rebase to destination branch.</p><div class="terminal"><div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>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/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.javaindex a64b933c1f..c70547994a 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/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import static com.gitplex.server.model.support.MergeStrategy.ALWAYS_MERGE;import static com.gitplex.server.model.support.MergeStrategy.SQUASH_MERGE;@@ -12,9 +12,9 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;@@ -33,14 +33,14 @@ class ResolveConflictInstructionPanel extends Panel {PullRequest request = (PullRequest) getDefaultModelObject();Fragment fragment;- Depot targetDepot = request.getTarget().getDepot();- Account user = GitPlex.getInstance(AccountManager.class).getCurrent();+ Project targetProject = request.getTarget().getProject();+ User user = GitPlex.getInstance(UserManager.class).getCurrent();MergePreview preview = request.getMergePreview();MergeStrategy strategy = request.getMergeStrategy();- boolean sameRepo = request.getTarget().getDepot().equals(request.getSource().getDepot());+ boolean sameRepo = request.getTarget().getProject().equals(request.getSource().getProject());if (strategy == SQUASH_MERGE || strategy == REBASE_MERGE) {fragment = new Fragment("content", "rebaseInSourceFrag", this);- fragment.add(new Label("srcRepoName", request.getSource().getDepot()));+ fragment.add(new Label("srcRepoName", request.getSource().getProject()));fragment.add(new Label("srcBranchNameForCheckout", request.getSourceBranch()));fragment.add(new Label("srcBranchNameForPush", request.getSourceBranch()));WebMarkupContainer sameRepoContainer = new WebMarkupContainer("sameRepo");@@ -48,14 +48,14 @@ class ResolveConflictInstructionPanel extends Panel {sameRepoContainer.setVisible(sameRepo);fragment.add(sameRepoContainer);WebMarkupContainer differentRepoContainer = new WebMarkupContainer("differentRepo");- differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getDepot().getUrl()));+ differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getProject().getUrl()));differentRepoContainer.add(new Label("destBranchName", request.getTargetBranch()));differentRepoContainer.setVisible(!sameRepo);fragment.add(differentRepoContainer);} else if (user != null- && SecurityUtils.canPush(targetDepot, request.getTargetBranch(), request.getTarget().getObjectId(), ObjectId.fromString(preview.getRequestHead()))) {+ && SecurityUtils.canPush(targetProject, request.getTargetBranch(), request.getTarget().getObjectId(), ObjectId.fromString(preview.getRequestHead()))) {fragment = new Fragment("content", "mergeInTargetFrag", this);- fragment.add(new Label("destRepoName", request.getTarget().getDepot()));+ fragment.add(new Label("destRepoName", request.getTarget().getProject()));fragment.add(new Label("destBranchNameForCheckout", request.getTargetBranch()));fragment.add(new Label("destBranchNameForPush", request.getTargetBranch()));WebMarkupContainer sameRepoContainer = new WebMarkupContainer("sameRepo");@@ -65,13 +65,13 @@ class ResolveConflictInstructionPanel extends Panel {fragment.add(sameRepoContainer);WebMarkupContainer differentRepoContainer = new WebMarkupContainer("differentRepo");differentRepoContainer.add(new Label("ffOption", strategy==ALWAYS_MERGE?"--no-ff":""));- differentRepoContainer.add(new Label("srcRepoUrl", request.getSource().getDepot().getUrl()));+ differentRepoContainer.add(new Label("srcRepoUrl", request.getSource().getProject().getUrl()));differentRepoContainer.add(new Label("srcBranchName", request.getSourceBranch()));differentRepoContainer.setVisible(!sameRepo);fragment.add(differentRepoContainer);} else {fragment = new Fragment("content", "mergeInSourceFrag", this);- fragment.add(new Label("srcRepoName", request.getSource().getDepot()));+ fragment.add(new Label("srcRepoName", request.getSource().getProject()));fragment.add(new Label("srcBranchNameForCheckout", request.getSourceBranch()));fragment.add(new Label("srcBranchNameForPush", request.getSourceBranch()));WebMarkupContainer sameRepoContainer = new WebMarkupContainer("sameRepo");@@ -81,7 +81,7 @@ class ResolveConflictInstructionPanel extends Panel {fragment.add(sameRepoContainer);WebMarkupContainer differentRepoContainer = new WebMarkupContainer("differentRepo");differentRepoContainer.add(new Label("ffOption", strategy==ALWAYS_MERGE?"--no-ff":""));- differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getDepot().getUrl()));+ differentRepoContainer.add(new Label("destRepoUrl", request.getTarget().getProject().getUrl()));differentRepoContainer.add(new Label("destBranchName", request.getTargetBranch()));differentRepoContainer.setVisible(!sameRepo);fragment.add(differentRepoContainer);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javasimilarity index 80%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javaindex 3db0410e82..8877298af9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import java.util.Collection;@@ -7,11 +7,11 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {@@ -33,7 +33,7 @@ class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {private RequestCodeCommentsPage.State getState() {RequestCodeCommentsPage.State state = new RequestCodeCommentsPage.State();state.setUnresolved(true);- state.setUserName(GitPlex.getInstance(AccountManager.class).getCurrent().getName());+ state.setUserName(GitPlex.getInstance(UserManager.class).getCurrent().getName());return state;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.javasimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.javaindex 5190ca41f5..74ab39f1c6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java@@ -1,11 +1,11 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {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/project/pullrequest/requestdetail/UpdateChangesLink.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.javaindex cf7b733972..1064044349 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/project/pullrequest/requestdetail/UpdateChangesLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.project.pullrequest.requestdetail;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gifsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ajax-indicator.gifrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gifdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.htmldiff --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/project/pullrequest/requestdetail/changes/RequestChangesPage.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.javaindex 195e7109cc..d190be55d2 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/project/pullrequest/requestdetail/changes/RequestChangesPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.changes;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -37,7 +37,6 @@ import com.gitplex.server.GitPlex;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.MarkPos;@@ -47,8 +46,7 @@ import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;import com.gitplex.server.web.websocket.CodeCommentChangedRegion;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.PageDataChanged;@@ -404,11 +402,6 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupponRegionChange();}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {PageParameters params = paramsOf(getPullRequest(), state);CharSequence url = RequestCycle.get().urlFor(RequestChangesPage.class, params);@@ -471,7 +464,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp};- Component revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,+ Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,requestModel, state.oldCommit, state.newCommit, pathFilterModel,whitespaceOptionModel, blameModel, this);revisionDiff.setOutputMarkupId(true);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.javaindex c7d01b6d9a..35125cbdf3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.changes;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/request-changes.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/request-changes.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.js b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/request-changes.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.jsrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/changes/request-changes.jsdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.javaindex b70f4327ce..22e0f229ed 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmldiff --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/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javaindex 52192a5aaa..876a8161cc 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/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments;import java.io.Serializable;import java.nio.file.Paths;@@ -35,21 +35,21 @@ import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CodeCommentManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;-import com.gitplex.server.util.editable.annotation.AccountChoice;+import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.FileChoice;import com.gitplex.server.util.stringmatch.WildcardUtils;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;@@ -116,13 +116,13 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.getAccount() != null);+ setVisible(SecurityUtils.getUser() != null);}@Overridepublic void onClick() {State state = new State();- state.userName = SecurityUtils.getAccount().getName();+ state.userName = SecurityUtils.getUser().getName();setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));}@@ -132,13 +132,13 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.getAccount() != null);+ setVisible(SecurityUtils.getUser() != null);}@Overridepublic void onClick() {State state = new State();- state.userName = SecurityUtils.getAccount().getName();+ state.userName = SecurityUtils.getUser().getName();state.unresolved = true;setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));}@@ -197,7 +197,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {titleLink.add(new Label("label", StringUtils.abbreviate(comment.getContent(), TITLE_LEN)));fragment.add(titleLink);fragment.add(new WebMarkupContainer("resolved").setVisible(comment.isResolved()));- fragment.add(new AccountLink("user", Account.getForDisplay(comment.getUser(), comment.getUserName())));+ fragment.add(new UserLink("user", User.getForDisplay(comment.getUser(), comment.getUserName())));Link<Void> fileLink = new Link<Void>("file") {@@ -217,9 +217,9 @@ public class RequestCodeCommentsPage extends RequestDetailPage {String description = comment.getLastEvent().getType();lastEventContainer.add(new Label("description", description));- Account userForDisplay = Account.getForDisplay(comment.getLastEvent().getUser(),+ User userForDisplay = User.getForDisplay(comment.getLastEvent().getUser(),comment.getLastEvent().getUserName());- lastEventContainer.add(new AccountLink("user", userForDisplay));+ lastEventContainer.add(new UserLink("user", userForDisplay));lastEventContainer.add(new Label("date", DateUtils.formatAge(comment.getLastEvent().getDate())));} else {lastEventContainer.add(new WebMarkupContainer("description"));@@ -275,7 +275,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {};DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,- dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:WebConstants.DEFAULT_PAGE_SIZE);+ dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:WebConstants.PAGE_SIZE);dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {@@ -332,7 +332,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {private Date after;@Editable(order=100, name="Created by", description="Choose the user who created the comment")- @AccountChoice+ @UserChoicepublic String getUserName() {return userName;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/request-code-comments.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/request-code-comments.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/request-code-comments.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/request-code-comments.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.javaindex e361055181..c9a03bed4e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview;import java.io.Serializable;import java.util.Collection;@@ -18,13 +18,11 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MergePreview;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;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.WebSocketRegion;@@ -167,7 +165,7 @@ public class MergePreviewPage extends RequestDetailPage {};- Component revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,+ Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,requestModel, preview.getTargetHead(), preview.getMerged(), pathFilterModel,whitespaceOptionModel, blameModel, null);revisionDiff.setOutputMarkupId(true);@@ -201,11 +199,6 @@ public class MergePreviewPage extends RequestDetailPage {return state;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.javasimilarity index 78%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.javaindex 0bb04b51e5..4fd8d42746 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/merge-preview.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/merge-preview.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.javasimilarity index 78%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.javaindex 3681d6627b..0d023bd6ae 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview;import java.io.Serializable;import java.util.Date;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.htmldiff --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/project/pullrequest/requestdetail/overview/RequestOverviewPage.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.javaindex 8a193a3ce9..053e92e27f 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/project/pullrequest/requestdetail/overview/RequestOverviewPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview;import java.util.ArrayList;import java.util.Arrays;@@ -35,30 +35,30 @@ import org.joda.time.DateTime;import com.gitplex.server.GitPlex;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.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.PullRequestWatch;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.MergeStrategy;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.component.requestreviewer.ReviewerListPanel;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.CommentedActivity;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.OpenedActivity;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.ReferencedActivity;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.RequestCommentDeleted;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.StatusChangeActivity;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.UpdatedActivity;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.CommentedActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.OpenedActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.ReferencedActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.RequestCommentDeleted;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.StatusChangeActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.UpdatedActivity;+import com.gitplex.server.web.page.project.pullrequest.requestlist.RequestListPage;import com.gitplex.server.web.util.ConfirmOnClick;import com.gitplex.server.web.websocket.PageDataChanged;import com.google.common.collect.Lists;@@ -122,11 +122,11 @@ public class RequestOverviewPage extends RequestDetailPage {row.add(AttributeAppender.append("class", " discussion"));PullRequest request = ((OpenedActivity)activity).getRequest();avatarColumn.add(new AvatarLink("avatar",- Account.getForDisplay(request.getSubmitter(), request.getSubmitterName())));+ User.getForDisplay(request.getSubmitter(), request.getSubmitterName())));} else if (activity instanceof CommentedActivity) {row.add(AttributeAppender.append("class", " discussion"));PullRequestComment comment = ((CommentedActivity)activity).getComment();- avatarColumn.add(new AvatarLink("avatar", Account.getForDisplay(comment.getUser(), comment.getUserName())));+ avatarColumn.add(new AvatarLink("avatar", User.getForDisplay(comment.getUser(), comment.getUserName())));} else {row.add(AttributeAppender.append("class", " non-discussion"));avatarColumn.add(new WebMarkupContainer("avatar"));@@ -310,12 +310,12 @@ public class RequestOverviewPage extends RequestDetailPage {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());}@Override- protected Depot getDepot() {- return RequestOverviewPage.this.getDepot();+ protected Project getProject() {+ return RequestOverviewPage.this.getProject();}@Override@@ -394,7 +394,7 @@ public class RequestOverviewPage extends RequestDetailPage {PullRequest request = getPullRequest();GitPlex.getInstance(PullRequestManager.class).delete(request);Session.get().success("Pull request #" + request.getNumber() + " is deleted");- setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getDepot()));+ setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getProject()));}}.add(new ConfirmOnClick("Do you really want to delete this pull request?")));@@ -604,11 +604,6 @@ public class RequestOverviewPage extends RequestDetailPage {return watchContainer;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javaindex 0ce1b715e3..f5a35ef752 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview;import org.apache.wicket.request.resource.CssResourceReference;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/project/pullrequest/requestdetail/overview/SinceChangesLink.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.javaindex 43aaa7d9d0..d75f7bafa1 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/project/pullrequest/requestdetail/overview/SinceChangesLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview;import java.util.Date;@@ -11,7 +11,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")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/project/pullrequest/requestdetail/overview/activity/CommentedActivity.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.javaindex 89c81e878d..d67ffe0770 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/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.model.PullRequestComment;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class CommentedActivity implements PullRequestActivity {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.htmldiff --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/project/pullrequest/requestdetail/overview/activity/CommentedPanel.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.javaindex 69bc3c0131..803c5c0e7c 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/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -18,18 +18,18 @@ import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestCommentManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.component.markdown.ContentVersionSupport;import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;@@ -47,7 +47,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {protected void onInitialize() {super.onInitialize();- add(new AccountLink("user", Account.getForDisplay(getComment().getUser(), getComment().getUserName())));+ add(new UserLink("user", User.getForDisplay(getComment().getUser(), getComment().getUserName())));add(new Label("age", DateUtils.formatAge(getComment().getDate())));add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {@@ -119,7 +119,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getDepot(), getComment().getRequest().getUUID());+ return new ProjectAttachmentSupport(getProject(), getComment().getRequest().getUUID());}@Override@@ -128,8 +128,8 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {}@Override- protected Depot getDepot() {- return getComment().getDepot();+ protected Project getProject() {+ return getComment().getProject();}};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/project/pullrequest/requestdetail/overview/activity/OpenedActivity.javasimilarity index 83%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.javaindex ced2e8cb0f..459be20c6c 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/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class OpenedActivity implements PullRequestActivity {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.htmldiff --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/project/pullrequest/requestdetail/overview/activity/OpenedPanel.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.javaindex 27888c45a5..41b2b6849e 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/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -17,14 +17,14 @@ import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.component.markdown.ContentVersionSupport;import com.gitplex.server.web.component.markdown.MarkdownViewer;@@ -102,7 +102,7 @@ class OpenedPanel extends GenericPanel<PullRequest> {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getPullRequest().getTargetDepot(), getPullRequest().getUUID());+ return new ProjectAttachmentSupport(getPullRequest().getTargetProject(), getPullRequest().getUUID());}@Override@@ -111,8 +111,8 @@ class OpenedPanel extends GenericPanel<PullRequest> {}@Override- protected Depot getDepot() {- return getPullRequest().getTargetDepot();+ protected Project getProject() {+ return getPullRequest().getTargetProject();}};@@ -181,7 +181,7 @@ class OpenedPanel extends GenericPanel<PullRequest> {super.onInitialize();PullRequest request = getPullRequest();- add(new AccountLink("user", Account.getForDisplay(request.getSubmitter(), request.getSubmitterName())));+ add(new UserLink("user", User.getForDisplay(request.getSubmitter(), request.getSubmitterName())));add(new Label("age", DateUtils.formatAge(request.getSubmitDate())));add(newViewer());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/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.javaindex a7004f008b..bac7da7fd1 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/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestReferenceManager;import com.gitplex.server.model.PullRequestReference;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class ReferencedActivity implements PullRequestActivity {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmldiff --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/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.javasimilarity index 78%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.javaindex 543e03c79f..b11f4f90da 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/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java@@ -1,18 +1,18 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestReference;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.requeststatus.RequestStatusPanel;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;@SuppressWarnings("serial")@@ -28,9 +28,9 @@ class ReferencedPanel extends GenericPanel<PullRequestReference> {PullRequestReference reference = getModelObject();- Account userForDisplay = Account.getForDisplay(reference.getUser(), reference.getUserName());+ User userForDisplay = User.getForDisplay(reference.getUser(), reference.getUserName());add(new AvatarLink("avatar", userForDisplay));- add(new AccountLink("name", userForDisplay));+ add(new UserLink("name", userForDisplay));add(new Label("age", DateUtils.formatAge(reference.getDate())));ViewStateAwarePageLink<Void> link = new ViewStateAwarePageLink<Void>("link",diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javasimilarity index 72%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javaindex 13cd2f1e35..327084e566 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import org.apache.wicket.ajax.AjaxRequestTarget;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/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javaindex f48682a427..dfe715e081 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/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.model.PullRequestStatusChange;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class StatusChangeActivity implements PullRequestActivity {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmldiff --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/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.javaindex d69847be68..db93c5587d 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/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -19,19 +19,19 @@ import org.hibernate.StaleStateException;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestStatusChangeManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.comment.CommentInput;-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;-import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.component.markdown.ContentVersionSupport;import com.gitplex.server.web.component.markdown.MarkdownViewer;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -106,13 +106,13 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getStatusChange().getRequest().getTargetDepot(),+ return new ProjectAttachmentSupport(getStatusChange().getRequest().getTargetProject(),getStatusChange().getRequest().getUUID());}@Override- protected Depot getDepot() {- return getStatusChange().getRequest().getTargetDepot();+ protected Project getProject() {+ return getStatusChange().getRequest().getTargetProject();}@Override@@ -197,9 +197,9 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {if (iconClass != null)icon.add(AttributeAppender.append("class", iconClass));- Account userForDisplay = Account.getForDisplay(statusChange.getUser(), statusChange.getUserName());+ User userForDisplay = User.getForDisplay(statusChange.getUser(), statusChange.getUserName());container.add(new AvatarLink("userAvatar", userForDisplay));- container.add(new AccountLink("userName", userForDisplay));+ container.add(new UserLink("userName", userForDisplay));container.add(new Label("eventName", statusChange.getType().getName()));container.add(new Label("eventDate", DateUtils.formatAge(statusChange.getDate())));container.add(new SinceChangesLink("changes", new LoadableDetachableModel<PullRequest>() {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/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.javasimilarity index 83%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.javaindex ddb74217c5..b891c93b66 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/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class UpdatedActivity implements PullRequestActivity {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmldiff --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/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.javasimilarity index 80%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.javaindex cc0329d930..bfe38f6f30 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/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;import java.util.List;@@ -19,15 +19,15 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;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;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;@SuppressWarnings("serial")class UpdatedPanel extends GenericPanel<PullRequestUpdate> {@@ -69,29 +69,29 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {item.add(new AvatarLink("author", commit.getAuthorIdent(), true));- IModel<Depot> depotModel = new AbstractReadOnlyModel<Depot>() {+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {@Override- public Depot getObject() {- return getUpdate().getRequest().getTarget().getDepot();+ public Project getObject() {+ return getUpdate().getRequest().getTarget().getProject();}};- item.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));+ item.add(new ExpandableCommitMessagePanel("message", projectModel, item.getModel()));CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);item.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);browseState.requestId = getUpdate().getRequest().getId();- params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);- item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));+ params = ProjectBlobPage.paramsOf(projectModel.getObject(), browseState);+ item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));if (getUpdate().getRequest().getTarget().getObjectId(false) != null) {if (getUpdate().getRequest().getMergedCommits().contains(commit)) {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/request-overview.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/request-overview.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.htmldiff --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/project/pullrequest/requestlist/RequestListPage.javasimilarity index 82%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.javaindex 750a46cae7..07df779676 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/project/pullrequest/requestlist/RequestListPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.project.pullrequest.requestlist;import java.util.ArrayList;import java.util.Date;@@ -7,7 +7,6 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;@@ -32,32 +31,32 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.link.BranchLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.component.requeststatus.RequestStatusPanel;import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption.Direction;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption.Status;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Direction;+import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Status;import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;@SuppressWarnings("serial")-public class RequestListPage extends DepotPage {+public class RequestListPage extends ProjectPage {private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();@@ -89,7 +88,7 @@ public class RequestListPage extends DepotPage {protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {List<MenuItem> menuItems = new ArrayList<>();- Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();+ User currentUser = GitPlex.getInstance(UserManager.class).getCurrent();if (currentUser != null) {String userName = currentUser.getName();menuItems.add(new MenuItem() {@@ -109,7 +108,7 @@ public class RequestListPage extends DepotPage {searchOption.setStatus(Status.OPEN);searchOption.setSubmitterName(userName);- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -133,7 +132,7 @@ public class RequestListPage extends DepotPage {searchOption = new SearchOption();searchOption.setStatus(Status.OPEN);- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -157,7 +156,7 @@ public class RequestListPage extends DepotPage {searchOption.setDirection(Direction.INCOMING);searchOption.setStatus(Status.OPEN);- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -181,7 +180,7 @@ public class RequestListPage extends DepotPage {searchOption.setDirection(Direction.OUTGOING);searchOption.setStatus(Status.OPEN);- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -223,7 +222,7 @@ public class RequestListPage extends DepotPage {@Overridepublic void onClick() {- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -241,8 +240,8 @@ public class RequestListPage extends DepotPage {@Overridepublic void onClick() {- DepotPage page = (DepotPage) getPage();- setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(page.getDepot()));+ ProjectPage page = (ProjectPage) getPage();+ setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(page.getProject()));}});@@ -253,7 +252,7 @@ public class RequestListPage extends DepotPage {protected void onSubmit() {super.onSubmit();- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));}};@@ -280,7 +279,7 @@ public class RequestListPage extends DepotPage {});fragment.add(new RequestStatusPanel("status", rowModel));- fragment.add(new AccountLink("submitter", Account.getForDisplay(request.getSubmitter(),+ fragment.add(new UserLink("submitter", User.getForDisplay(request.getSubmitter(),request.getSubmitterName())));fragment.add(new BranchLink("target", request.getTarget(), null));if (request.getSource() != null)@@ -292,9 +291,9 @@ public class RequestListPage extends DepotPage {WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");if (request.getLastEvent() != null) {- Account userForDisplay = Account.getForDisplay(request.getLastEvent().getUser(),+ User userForDisplay = User.getForDisplay(request.getLastEvent().getUser(),request.getLastEvent().getUserName());- lastEventContainer.add(new AccountLink("user", userForDisplay));+ lastEventContainer.add(new UserLink("user", userForDisplay));String description = request.getLastEvent().getType();lastEventContainer.add(new Label("description", description));lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getLastEvent().getDate())));@@ -327,17 +326,17 @@ public class RequestListPage extends DepotPage {@Overridepublic Iterator<? extends PullRequest> iterator(long first, long count) {- DepotPage page = (DepotPage) getPage();+ ProjectPage page = (ProjectPage) getPage();- EntityCriteria<PullRequest> criteria = searchOption.getCriteria(page.getDepot());+ EntityCriteria<PullRequest> criteria = searchOption.getCriteria(page.getProject());criteria.addOrder(sortOption.getOrder());return GitPlex.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();}@Overridepublic long size() {- DepotPage page = (DepotPage) getPage();- return GitPlex.getInstance(Dao.class).count(searchOption.getCriteria(page.getDepot()));+ ProjectPage page = (ProjectPage) getPage();+ return GitPlex.getInstance(Dao.class).count(searchOption.getCriteria(page.getProject()));}@Override@@ -355,7 +354,7 @@ public class RequestListPage extends DepotPage {};DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,- dataProvider, WebConstants.DEFAULT_PAGE_SIZE);+ dataProvider, WebConstants.PAGE_SIZE);dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {@@ -375,16 +374,11 @@ public class RequestListPage extends DepotPage {response.render(CssHeaderItem.forReference(new RequestListResourceReference()));}- public static PageParameters paramsOf(Depot depot, SearchOption searchOption, SortOption sortOption) {- PageParameters params = paramsOf(depot);+ public static PageParameters paramsOf(Project project, SearchOption searchOption, SortOption sortOption) {+ PageParameters params = paramsOf(project);searchOption.fillPageParams(params);sortOption.fillPageParams(params);return params;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.javaindex 7a79601e17..aadd2e64fa 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.project.pullrequest.requestlist;import org.apache.wicket.request.resource.CssResourceReference;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/project/pullrequest/requestlist/SearchOption.javasimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SearchOption.javaindex e13f40a6f9..43c9033911 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/project/pullrequest/requestlist/SearchOption.java@@ -1,9 +1,9 @@-package com.gitplex.server.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.project.pullrequest.requestlist;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.ofSourceProject;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.CriterionHelper.ofTargetProject;import java.io.Serializable;import java.util.Date;@@ -13,11 +13,11 @@ import javax.validation.constraints.NotNull;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.support.DepotAndBranch;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.util.editable.annotation.AccountChoice;+import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.editable.annotation.BranchChoice;import com.gitplex.server.util.editable.annotation.Editable;@@ -78,7 +78,7 @@ public class SearchOption implements Serializable {}@Editable(order=300, name="Submitted By")- @AccountChoice+ @UserChoicepublic String getSubmitterName() {return submitterName;}@@ -150,24 +150,24 @@ public class SearchOption implements Serializable {endDate = new Date(Long.valueOf(value));}- public EntityCriteria<PullRequest> getCriteria(Depot depot) {+ public EntityCriteria<PullRequest> getCriteria(Project project) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);if (direction == Direction.INCOMING) {if (branch != null)- criteria.add(ofTarget(new DepotAndBranch(depot, branch)));+ criteria.add(ofTarget(new ProjectAndBranch(project, branch)));else- criteria.add(ofTargetDepot(depot));+ criteria.add(ofTargetProject(project));} else if (direction == Direction.OUTGOING) {if (branch != null)- criteria.add(ofSource(new DepotAndBranch(depot, branch)));+ criteria.add(ofSource(new ProjectAndBranch(project, branch)));else- criteria.add(ofSourceDepot(depot));+ criteria.add(ofSourceProject(project));} else if (branch != null) {criteria.add(Restrictions.or(- ofTarget(new DepotAndBranch(depot, branch)),- ofSource(new DepotAndBranch(depot, branch))));+ ofTarget(new ProjectAndBranch(project, branch)),+ ofSource(new ProjectAndBranch(project, branch))));} else {- criteria.add(Restrictions.or(ofTargetDepot(depot), ofSourceDepot(depot)));+ criteria.add(Restrictions.or(ofTargetProject(project), ofSourceProject(project)));}if (status == Status.OPEN)diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SortOption.javasimilarity index 96%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SortOption.javaindex a7544fc761..9571038bfc 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SortOption.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.project.pullrequest.requestlist;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/request-list.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/request-list.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.htmlnew file mode 100644index 0000000000..5c91e0c331--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.html@@ -0,0 +1,14 @@+<wicket:extend>+ <div id="project-setting">+ <table>+ <tr>+ <td class="nav">+ <ul wicket:id="projectSettingTabs" class="tabs list-unstyled"></ul>+ </td>+ <td class="content">+ <wicket:child></wicket:child>+ </td>+ </tr>+ </table>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.javanew file mode 100644index 0000000000..911eed415b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingPage.java@@ -0,0 +1,58 @@+package com.gitplex.server.web.page.project.setting;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.component.tabbable.PageTab;+import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import com.gitplex.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import com.gitplex.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;+import com.gitplex.server.web.page.project.setting.general.GeneralSettingPage;+import com.gitplex.server.web.page.project.setting.tagprotection.TagProtectionPage;++@SuppressWarnings("serial")+public abstract class ProjectSettingPage extends ProjectPage {++ public ProjectSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getProject());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));+ tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-lock", ProjectAuthorizationsPage.class));+ tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));+ tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));+ tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));++ add(new Tabbable("projectSettingTabs", tabs));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(CssHeaderItem.forReference(new ProjectSettingResourceReference()));+ String script = String.format(""+ + "var $projectSetting = $('#project-setting');"+ + "$projectSetting.find('>table').height($projectSetting.parent().outerHeight());");+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingResourceReference.javanew file mode 100644index 0000000000..8d1bec64c5--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.project.setting;++import org.apache.wicket.request.resource.CssResourceReference;++public class ProjectSettingResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectSettingResourceReference() {+ super(ProjectSettingResourceReference.class, "project-setting.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTab.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTab.javanew file mode 100644index 0000000000..7c47df5f60--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTab.java@@ -0,0 +1,75 @@+package com.gitplex.server.web.page.project.setting;++import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import com.gitplex.server.web.component.tabbable.PageTab;++@SuppressWarnings("serial")+public class ProjectSettingTab extends PageTab {++ private final String iconClass;++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass) {+ super(Model.of(title), mainPageClass);+ this.iconClass = iconClass;+ }++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass,+ Class<? extends ProjectSettingPage> additionalPageClass1) {+ super(Model.of(title), mainPageClass, additionalPageClass1);+ this.iconClass = iconClass;+ }++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass,+ Class<? extends ProjectSettingPage> additionalPageClass1,+ Class<? extends ProjectSettingPage> additionalPageClass2) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);+ this.iconClass = iconClass;+ }++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass,+ Class<? extends ProjectSettingPage> additionalPageClass1,+ Class<? extends ProjectSettingPage> additionalPageClass2,+ Class<? extends ProjectSettingPage> additionalPageClass3) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ this.iconClass = iconClass;+ }++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass,+ Class<? extends ProjectSettingPage> additionalPageClass1,+ Class<? extends ProjectSettingPage> additionalPageClass2,+ Class<? extends ProjectSettingPage> additionalPageClass3,+ Class<? extends ProjectSettingPage> additionalPageClass4) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,+ additionalPageClass3, additionalPageClass4);+ this.iconClass = iconClass;+ }++ public ProjectSettingTab(String title, String iconClass,+ Class<? extends ProjectSettingPage> mainPageClass,+ Class<? extends ProjectSettingPage> additionalPageClass1,+ Class<? extends ProjectSettingPage> additionalPageClass2,+ Class<? extends ProjectSettingPage> additionalPageClass3,+ Class<? extends ProjectSettingPage> additionalPageClass4,+ Class<? extends ProjectSettingPage> additionalPageClass5) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,+ additionalPageClass3, additionalPageClass4, additionalPageClass5);+ this.iconClass = iconClass;+ }++ @Override+ public Component render(String componentId) {+ return new ProjectSettingTabLink(componentId, this);+ }++ public String getIconClass() {+ return iconClass;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.htmlnew file mode 100644index 0000000000..4686880dcd--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.javasimilarity index 65%rename from web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.javaindex c11715a138..21672b0231 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/ProjectSettingTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.account;+package com.gitplex.server.web.page.project.setting;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -9,11 +9,11 @@ import org.apache.wicket.markup.html.panel.Panel;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;@SuppressWarnings("serial")-public class AccountTabLink extends Panel {+public class ProjectSettingTabLink extends Panel {- private final AccountTab tab;+ private final ProjectSettingTab tab;- public AccountTabLink(String id, AccountTab tab) {+ public ProjectSettingTabLink(String id, ProjectSettingTab tab) {super(id);this.tab = tab;@@ -23,12 +23,11 @@ public class AccountTabLink extends Panel {protected void onInitialize() {super.onInitialize();- AccountPage page = (AccountPage) getPage();+ ProjectSettingPage page = (ProjectSettingPage) getPage();Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), AccountPage.paramsOf(page.getAccount()));+ tab.getMainPageClass(), ProjectSettingPage.paramsOf(page.getProject()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));- link.add(new Label("count", tab.getCount()).setVisible(tab.getCount()!=0));add(link);}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmlnew file mode 100644index 0000000000..d307a6aecc--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html@@ -0,0 +1,24 @@+<wicket:extend>+ <div class="authorization list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="userFrag">+ <a wicket:id="avatarLink"></a>+ <a wicket:id="nameLink"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="privilegeFrag">+ <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>+ <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javanew file mode 100644index 0000000000..26c79507df--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -0,0 +1,412 @@+package com.gitplex.server.web.page.project.setting.authorization;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.User;+import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.UserLink;+import com.gitplex.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;+import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class ProjectAuthorizationsPage extends ProjectSettingPage {++ private String searchInput;++ private DataTable<User, Void> authorizationsTable;++ private SelectionColumn<User, Void> selectionColumn;++ private IModel<Map<User, ProjectPrivilege>> userAuthorizationsModel =+ new LoadableDetachableModel<Map<User, ProjectPrivilege>>() {++ @Override+ protected Map<User, ProjectPrivilege> load() {+ Map<User, ProjectPrivilege> userAuthorizations = new HashMap<>();+ Collection<User> usersAuthorizedFromOtherSources = new HashSet<>();+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ userAuthorizations.put(userManager.getRoot(), ProjectPrivilege.ADMIN);+ usersAuthorizedFromOtherSources.add(userManager.getRoot());++ EntityCriteria<Group> adminGroupCriteria = EntityCriteria.of(Group.class);+ adminGroupCriteria.add(Restrictions.eq("administrator", true));+ for (Group group: GitPlex.getInstance(GroupManager.class).findAll(adminGroupCriteria)) {+ for (User user: group.getMembers()) {+ userAuthorizations.put(user, ProjectPrivilege.ADMIN);+ usersAuthorizedFromOtherSources.add(user);+ }+ }+ for (GroupAuthorization authorization: getProject().getGroupAuthorizations()) {+ for (User user: authorization.getGroup().getMembers()) {+ ProjectPrivilege privilege = userAuthorizations.get(user);+ if (privilege == null || authorization.getPrivilege().implies(privilege))+ userAuthorizations.put(user, authorization.getPrivilege());+ usersAuthorizedFromOtherSources.add(user);+ }+ }+ for (UserAuthorization authorization: getProject().getUserAuthorizations()) {+ ProjectPrivilege privilege = userAuthorizations.get(authorization.getUser());+ if (privilege == null || authorization.getPrivilege().implies(privilege))+ userAuthorizations.put(authorization.getUser(), authorization.getPrivilege());+ }+ if (getProject().isPublicRead()) {+ for (User user: userManager.findAll()) {+ ProjectPrivilege privilege = userAuthorizations.get(user);+ if (privilege == null || ProjectPrivilege.READ.implies(privilege))+ userAuthorizations.put(user, ProjectPrivilege.READ);+ usersAuthorizedFromOtherSources.add(user);+ }+ }++ Map<User, UserAuthorization> projectAuthorizationMap = getProjectAuthorizationMap();+ List<User> users = new ArrayList<>(userAuthorizations.keySet());+ Collections.sort(users, new Comparator<User>() {++ @Override+ public int compare(User o1, User o2) {+ if (usersAuthorizedFromOtherSources.contains(o1)) {+ if (usersAuthorizedFromOtherSources.contains(o2)) {+ return o1.getDisplayName().compareTo(o2.getDisplayName());+ } else {+ return -1;+ }+ } else {+ if (usersAuthorizedFromOtherSources.contains(o2)) {+ return 1;+ } else {+ return projectAuthorizationMap.get(o2).getId()+ .compareTo(projectAuthorizationMap.get(o1).getId());+ }+ }+ }++ });++ Map<User, ProjectPrivilege> sortedUserAuthorizations = new LinkedHashMap<>();+ for (User user: users)+ sortedUserAuthorizations.put(user, userAuthorizations.get(user));++ return sortedUserAuthorizations;+ }++ };++ public ProjectAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onDetach() {+ userAuthorizationsModel.detach();+ super.onDetach();+ }++ private Map<User, UserAuthorization> getProjectAuthorizationMap() {+ Map<User, UserAuthorization> projectAuthorizationMap = new HashMap<>();+ for (UserAuthorization authorization: getProject().getUserAuthorizations()) {+ projectAuthorizationMap.put(authorization.getUser(), authorization);+ }+ return projectAuthorizationMap;+ }++ private Map<User, ProjectPrivilege> getUserAuthorizations() {+ return userAuthorizationsModel.getObject();+ }++ private boolean isPrivilegeFromOtherSources(User user) {+ UserAuthorization projectAuthorization = getProjectAuthorizationMap().get(user);+ ProjectPrivilege privilege = getUserAuthorizations().get(user);+ return projectAuthorization == null || !projectAuthorization.getPrivilege().implies(privilege);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterUsers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(authorizationsTable);+ }++ });++ add(new SelectToAddChoice<User>("addNew", new AbstractUserChoiceProvider() {++ @Override+ public void query(String term, int page, Response<User> response) {+ List<User> notAuthorized = new ArrayList<>();++ for (User user: GitPlex.getInstance(UserManager.class).findAll()) {+ if (user.matches(searchInput) && !getUserAuthorizations().containsKey(user))+ notAuthorized.add(user);+ }+ Collections.sort(notAuthorized);+ Collections.reverse(notAuthorized);+ new ResponseFiller<User>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add user...");+ getSettings().setFormatResult("gitplex.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.userChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, User selection) {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setProject(getProject());+ authorization.setUser(selection);+ GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);+ target.add(authorizationsTable);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();+ Map<User, UserAuthorization> projectAuthorizationMap = getProjectAuthorizationMap();+ for (IModel<User> model: selectionColumn.getSelections()) {+ UserAuthorization authorization = projectAuthorizationMap.get(model.getObject());+ if (authorization != null)+ authorizationsToDelete.add(authorization);+ }+ GitPlex.getInstance(UserAuthorizationManager.class).delete(authorizationsToDelete);+ getProject().getUserAuthorizations().removeAll(authorizationsToDelete);+ target.add(authorizationsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ boolean hasLocalPrivileges = false;+ for (IModel<User> model: selectionColumn.getSelections()) {+ User user = model.getObject();+ if (!isPrivilegeFromOtherSources(user)) {+ hasLocalPrivileges = true;+ break;+ }+ }+ setVisible(hasLocalPrivileges);+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<User, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<User, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<User, Void>(Model.of("User")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ Fragment fragment = new Fragment(componentId, "userFrag", ProjectAuthorizationsPage.this);+ fragment.add(new AvatarLink("avatarLink", rowModel.getObject()));+ fragment.add(new UserLink("nameLink", rowModel.getObject()));+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<User, Void>(Model.of("Permission")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ Fragment fragment = new Fragment(componentId, "privilegeFrag", ProjectAuthorizationsPage.this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ String script = String.format(""+ + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",+ getMarkupId(), isPrivilegeFromOtherSources(rowModel.getObject()));++ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };+ WebMarkupContainer dropdown = new DropdownLink("dropdown") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ ProjectPrivilege privilege = getUserAuthorizations().get(rowModel.getObject());+ return new PrivilegeSelectionPanel(id, privilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {+ dropdown.close();+ User user = rowModel.getObject();+ UserAuthorization userAuthorization = getProjectAuthorizationMap().get(user);+ if (userAuthorization == null) {+ userAuthorization = new UserAuthorization();+ userAuthorization.setProject(getProject());+ userAuthorization.setUser(user);+ getProject().getUserAuthorizations().add(userAuthorization);+ }+ userAuthorization.setPrivilege(privilege);+ if (getUserAuthorizations().get(user) != privilege) {+ Session.get().warn("Specified permission is not taking effect as a higher permission is granted from other sources");+ }+ GitPlex.getInstance(UserAuthorizationManager.class).save(userAuthorization);+ target.add(fragment);+ }++ };+ }++ };+ dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getUserAuthorizations().get(rowModel.getObject()).name();+ }++ }));+ fragment.add(dropdown);++ fragment.add(new DropdownLink("otherSources") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ User user = rowModel.getObject();+ return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(user));+ }++ });++ fragment.setOutputMarkupId(true);+ cellItem.add(fragment);+ }+ });++ SortableDataProvider<User, Void> dataProvider = new SortableDataProvider<User, Void>() {++ @Override+ public Iterator<? extends User> iterator(long first, long count) {+ List<User> users = new ArrayList<>(getUserAuthorizations().keySet());+ if (first + count <= users.size())+ return users.subList((int)first, (int)(first+count)).iterator();+ else+ return users.subList((int)first, users.size()).iterator();+ }++ @Override+ public long size() {+ return getUserAuthorizations().size();+ }++ @Override+ public IModel<User> model(User object) {+ Long userId = object.getId();+ return new LoadableDetachableModel<User>() {++ @Override+ protected User load() {+ return GitPlex.getInstance(UserManager.class).load(userId);+ }++ };+ }+ };++ add(authorizationsTable = new DefaultDataTable<User, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE));+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionEditor.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionEditor.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionEditor.javanew file mode 100644index 0000000000..e206a0d719--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java@@ -0,0 +1,81 @@+package com.gitplex.server.web.page.project.setting.branchprotection;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+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.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.support.BranchProtection;+import com.gitplex.server.util.reviewappointment.ReviewAppointment;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.page.project.ProjectPage;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++@SuppressWarnings("serial")+abstract class BranchProtectionEditor extends Panel {++ private final BranchProtection protection;++ public BranchProtectionEditor(String id, BranchProtection protection) {+ super(id);++ this.protection = protection;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");+ form.add(new NotificationPanel("feedback", form));++ Project project = ((ProjectPage) getPage()).getProject();++ List<String> reviewerNames = new ArrayList<>();+ ReviewAppointment reviewAppointment = protection.getReviewAppointment(project);+ if (reviewAppointment != null) {+ for (User user: reviewAppointment.getUsers())+ reviewerNames.add(user.getName());+ }++ form.add(BeanContext.editBean("editor", protection));++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onSave(target, protection);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);++ protected abstract void onCancel(AjaxRequestTarget target);+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPage.javasimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPage.javaindex e69db58bc3..ccc04a1cd5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting.branchprotection;+package com.gitplex.server.web.page.project.setting.branchprotection;import java.util.List;@@ -13,15 +13,14 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.support.BranchProtection;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;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class BranchProtectionPage extends DepotSettingPage {+public class BranchProtectionPage extends ProjectSettingPage {private WebMarkupContainer container;@@ -40,7 +39,7 @@ public class BranchProtectionPage extends DepotSettingPage {@Overridepublic List<BranchProtection> getObject() {- return getDepot().getBranchProtections();+ return getProject().getBranchProtections();}}) {@@ -50,15 +49,15 @@ public class BranchProtectionPage extends DepotSettingPage {@Overrideprotected void onDelete(AjaxRequestTarget target) {- getDepot().getBranchProtections().remove(item.getIndex());- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getBranchProtections().remove(item.getIndex());+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);target.add(container);}@Overrideprotected void onSave(AjaxRequestTarget target, BranchProtection protection) {- getDepot().getBranchProtections().set(item.getIndex(), protection);- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getBranchProtections().set(item.getIndex(), protection);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);}});@@ -70,10 +69,10 @@ public class BranchProtectionPage extends DepotSettingPage {@Overrideprotected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- List<BranchProtection> protections = getDepot().getBranchProtections();+ List<BranchProtection> protections = getProject().getBranchProtections();BranchProtection protection = protections.get(from.getItemIndex());protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);target.add(container);}@@ -95,8 +94,8 @@ public class BranchProtectionPage extends DepotSettingPage {@Overrideprotected void onSave(AjaxRequestTarget target, BranchProtection protection) {- getDepot().getBranchProtections().add(protection);- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getBranchProtections().add(protection);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);container.replace(newAddNewFrag());target.add(container);}@@ -118,9 +117,4 @@ public class BranchProtectionPage extends DepotSettingPage {return fragment;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(BranchProtectionPage.class, BranchProtectionPage.paramsOf(depot));- }-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPanel.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPanel.javaindex c9ccc64ca0..8e4c37413f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/branchprotection/BranchProtectionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting.branchprotection;+package com.gitplex.server.web.page.project.setting.branchprotection;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.htmldiff --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/project/setting/commitmessagetransform/CommitMessageTransformPage.javasimilarity index 64%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.javaindex 88e6b0a736..5414d72b73 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/project/setting/commitmessagetransform/CommitMessageTransformPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting.commitmessagetransform;+package com.gitplex.server.web.page.project.setting.commitmessagetransform;import java.io.Serializable;@@ -8,15 +8,15 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;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;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class CommitMessageTransformPage extends DepotSettingPage {+public class CommitMessageTransformPage extends ProjectSettingPage {public CommitMessageTransformPage(PageParameters params) {super(params);@@ -31,12 +31,12 @@ public class CommitMessageTransformPage extends DepotSettingPage {@Overrideprotected void onSubmit() {super.onSubmit();- GitPlex.getInstance(DepotManager.class).save(getDepot());+ GitPlex.getInstance(ProjectManager.class).save(getProject());Session.get().success("Commit message transform setting is updated");}};- form.add(new ReflectionPropertyEditor("editor", new PropertyDescriptor(Depot.class, "commitMessageTransformSetting"), new IModel<Serializable>() {+ form.add(new ReflectionPropertyEditor("editor", new PropertyDescriptor(Project.class, "commitMessageTransformSetting"), new IModel<Serializable>() {@Overridepublic void detach() {@@ -44,12 +44,12 @@ public class CommitMessageTransformPage extends DepotSettingPage {@Overridepublic Serializable getObject() {- return getDepot().getCommitMessageTransformSetting();+ return getProject().getCommitMessageTransformSetting();}@Overridepublic void setObject(Serializable object) {- getDepot().setCommitMessageTransformSetting((CommitMessageTransformSetting) object);+ getProject().setCommitMessageTransformSetting((CommitMessageTransformSetting) object);}}));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.htmlsimilarity index 64%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.htmlindex bea726a415..b24c0ea7ce 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.html@@ -1,10 +1,10 @@<wicket:extend>- <div class="profile-edit">+ <div class="general-setting"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions"><input class="btn btn-primary dirty-aware" value="Update" type="submit"></input>- <a wicket:id="delete" class="btn btn-danger pull-right">Delete this Account</a>+ <a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a></div></form></div>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.javanew file mode 100644index 0000000000..d46cd57444--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java@@ -0,0 +1,107 @@+package com.gitplex.server.web.page.project.setting.general;++import java.io.Serializable;++import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteProjectModal;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.home.DashboardPage;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class GeneralSettingPage extends ProjectSettingPage {++ private String oldName;++ private BeanEditor<?> editor;++ public GeneralSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ editor = BeanContext.editModel("editor", new IModel<Serializable>() {++ @Override+ public void detach() {+ }++ @Override+ public Serializable getObject() {+ return getProject();+ }++ @Override+ public void setObject(Serializable object) {+ // check contract of projectManager.save on why we assign oldName here+ oldName = getProject().getName();+ editor.getBeanDescriptor().copyProperties(object, getProject());+ }++ });++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ }++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Project project = getProject();+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);+ Project projectWithSameName = projectManager.find(project.getName());+ if (projectWithSameName != null && !projectWithSameName.equals(project)) {+ String errorMessage = "This name has already been used by another project";+ editor.getErrorContext(new PathSegment.Property("name")).addError(errorMessage);+ } else {+ projectManager.save(project, oldName);+ Session.get().success("General setting has been updated");+ setResponsePage(GeneralSettingPage.class, paramsOf(project));+ }+ }++ };+ form.add(editor);++ form.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ConfirmDeleteProjectModal(target) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ setResponsePage(DashboardPage.class);+ }++ @Override+ protected Project getProject() {+ return GeneralSettingPage.this.getProject();+ }+ };+ }++ });++ add(form);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.css b/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.cssnew file mode 100644index 0000000000..5f08c1a24c--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.css@@ -0,0 +1,92 @@+#project-setting>table>tbody>tr>td.nav {+ width: 200px;+ border-right: 1px solid #DDD;+ white-space: nowrap;+ padding: 20px 0;+}+#project-setting>table>tbody>tr>td.nav a {+ display: block;+ color: #666;+ text-decoration: none;+ padding: 6px 12px;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}+#project-setting>table>tbody>tr>td.nav li:hover a {+ background: #F5F5F5;+ color: #010203;+}+#project-setting>table>tbody>tr>td.nav li.active a {+ background: #E8E8E8;+ color: #010203;+ font-weight: bold;+}+#project-setting>table>tbody>tr>td.content {+ padding: 20px;+}+#project-setting .general-setting form .delete {+ margin-right: 0;+}+#project-setting .drag-handle {+ cursor: move;+}+#project-setting .panel-list .drag-handle {+ margin-right: 8px;+}+#project-setting .panel-list .panel-heading a {+ color: #444;+ margin-right: 8px;+}+#project-setting .panel-list .add-new {+ display: block;+ padding: 16px;+ background: #F2F2F2;+ border: 1px solid #DDD;+ border-radius: 4px;+ font-size: 16px;+ color: #444;+ margin-bottom: 16px;+}+#project-setting .panel-list a.add-new:hover {+ text-decoration: none;+ background-color: #EBEBEB;+ border-color: #ADADAD;+}+#project-setting .panel-list a.add-new .fa {+ margin-left: 8px;+}+#project-setting .panel-list .concrete.list td.path,+#project-setting .panel-list .concrete.list td.reviewerNames,+#project-setting .panel-list .concrete.list td.reviewAppointment {+ width: 45%;+}++#project-setting .authorization .list table td.actions {+ width: 20%;+ white-space: nowrap;+}+#project-setting .authorization .list td.name .note {+ font-size: 12px;+ color: #888;+ margin-top: 4px;+}+#project-setting .authorization .list td.privilege {+ width: 20%;+}++.modal .transfer-project .message {+ font-size: 13px;+ margin-bottom: 20px;+}++#project-setting .commit-message-transform>label {+ float: left;+ margin-right: 4px;+}+#project-setting .commit-message-transform>.help-block {+ margin-top: 20px;+}+#project-setting .authorization.list a.other-sources {+ margin-left: 4px;+ color: #DCB508;+ vertical-align: middle;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionEditor.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionEditor.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionEditor.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionEditor.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionEditor.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionEditor.javanew file mode 100644index 0000000000..c6b64252d6--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionEditor.java@@ -0,0 +1,65 @@+package com.gitplex.server.web.page.project.setting.tagprotection;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+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.model.support.TagProtection;+import com.gitplex.server.web.editable.BeanContext;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++@SuppressWarnings("serial")+abstract class TagProtectionEditor extends Panel {++ private final TagProtection protection;++ public TagProtectionEditor(String id, TagProtection protection) {+ super(id);++ this.protection = protection;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");+ form.add(new NotificationPanel("feedback", form));++ form.add(BeanContext.editBean("editor", protection));++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onSave(target, protection);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);++ protected abstract void onCancel(AjaxRequestTarget target);+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPage.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPage.javasimilarity index 74%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPage.javaindex 1f497008cc..1cf6a7920a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;+package com.gitplex.server.web.page.project.setting.tagprotection;import java.util.List;@@ -13,15 +13,14 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.support.TagProtection;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;+import com.gitplex.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class TagProtectionPage extends DepotSettingPage {+public class TagProtectionPage extends ProjectSettingPage {private WebMarkupContainer container;@@ -40,7 +39,7 @@ public class TagProtectionPage extends DepotSettingPage {@Overridepublic List<TagProtection> getObject() {- return getDepot().getTagProtections();+ return getProject().getTagProtections();}}) {@@ -50,15 +49,15 @@ public class TagProtectionPage extends DepotSettingPage {@Overrideprotected void onDelete(AjaxRequestTarget target) {- getDepot().getTagProtections().remove(item.getIndex());- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getTagProtections().remove(item.getIndex());+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);target.add(container);}@Overrideprotected void onSave(AjaxRequestTarget target, TagProtection protection) {- getDepot().getTagProtections().set(item.getIndex(), protection);- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getTagProtections().set(item.getIndex(), protection);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);}});@@ -70,10 +69,10 @@ public class TagProtectionPage extends DepotSettingPage {@Overrideprotected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- List<TagProtection> protections = getDepot().getTagProtections();+ List<TagProtection> protections = getProject().getTagProtections();TagProtection protection = protections.get(from.getItemIndex());protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);target.add(container);}@@ -95,8 +94,8 @@ public class TagProtectionPage extends DepotSettingPage {@Overrideprotected void onSave(AjaxRequestTarget target, TagProtection protection) {- getDepot().getTagProtections().add(protection);- GitPlex.getInstance(DepotManager.class).save(getDepot(), null, null);+ getProject().getTagProtections().add(protection);+ GitPlex.getInstance(ProjectManager.class).save(getProject(), null);container.replace(newAddNewFrag());target.add(container);}@@ -118,9 +117,4 @@ public class TagProtectionPage extends DepotSettingPage {return fragment;}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(TagProtectionPage.class, TagProtectionPage.paramsOf(depot));- }-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPanel.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPanel.javarename to web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPanel.javaindex 4f26a35d17..a0479630e7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/tagprotection/TagProtectionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/tagprotection/TagProtectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.setting.tagprotection;+package com.gitplex.server.web.page.project.setting.tagprotection;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.htmldiff --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/project/tags/ProjectTagsPage.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.javaindex 8130641067..8c831fbd8c 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/project/tags/ProjectTagsPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.tags;+package com.gitplex.server.web.page.project.tags;import java.util.Iterator;import java.util.List;@@ -35,22 +35,21 @@ import org.eclipse.jgit.revwalk.RevTag;import com.gitplex.server.git.BlobIdent;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;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;-import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.link.ArchiveMenuLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.component.revisionpicker.RevisionPicker;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;-import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.project.NoBranchesPage;+import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;@@ -58,7 +57,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@SuppressWarnings("serial")-public class DepotTagsPage extends DepotPage {+public class ProjectTagsPage extends ProjectPage {private WebMarkupContainer tagsContainer;@@ -66,11 +65,11 @@ public class DepotTagsPage extends DepotPage {private WebMarkupContainer noTagsContainer;- public DepotTagsPage(PageParameters params) {+ public ProjectTagsPage(PageParameters params) {super(params);- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));+ if (getProject().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getProject()));}@Override@@ -96,17 +95,17 @@ public class DepotTagsPage extends DepotPage {private String tagMessage;- private String tagRevision = getDepot().getDefaultBranch();+ private String tagRevision = getProject().getDefaultBranch();@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canCreateTag(getDepot(), Constants.R_TAGS));+ setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));}private RevisionPicker newRevisionPicker() {- return new RevisionPicker("revision", depotModel, tagRevision) {+ return new RevisionPicker("revision", projectModel, tagRevision) {@Overrideprotected void onSelect(AjaxRequestTarget target, String revision) {@@ -121,7 +120,7 @@ public class DepotTagsPage extends DepotPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "createTagFrag", DepotTagsPage.this);+ Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);form.add(new NotificationPanel("feedback", form));@@ -179,12 +178,12 @@ public class DepotTagsPage extends DepotPage {form.error("Invalid tag name.");target.focusComponent(nameInput);target.add(form);- } else if (getDepot().getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {form.error("Tag '" + tagName + "' already exists, please choose a different name.");target.focusComponent(nameInput);target.add(form);} else {- getDepot().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);+ getProject().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);modal.close();target.add(tagsContainer);target.add(pagingNavigator);@@ -213,7 +212,7 @@ public class DepotTagsPage extends DepotPage {@Overrideprotected List<RefInfo> load() {- List<RefInfo> refs = getDepot().getTags();+ List<RefInfo> refs = getProject().getTags();String searchFor = searchField.getModelObject();if (StringUtils.isNotBlank(searchFor)) {searchFor = searchFor.trim().toLowerCase();@@ -242,7 +241,7 @@ public class DepotTagsPage extends DepotPage {PageableListView<RefInfo> tagsView;tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,- com.gitplex.server.web.WebConstants.DEFAULT_PAGE_SIZE) {+ com.gitplex.server.web.WebConstants.PAGE_SIZE) {@Overrideprotected void populateItem(ListItem<RefInfo> item) {@@ -250,17 +249,17 @@ public class DepotTagsPage extends DepotPage {String tagName = GitUtils.ref2tag(ref.getRef().getName());BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",- DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));link.add(new Label("name", tagName));item.add(link);if (ref.getObj() instanceof RevTag) {RevTag revTag = (RevTag) ref.getObj();- Fragment fragment = new Fragment("annotated", "annotatedFrag", DepotTagsPage.this);+ Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);if (revTag.getTaggerIdent() != null) {- fragment.add(new AccountLink("author", revTag.getTaggerIdent()));+ fragment.add(new UserLink("author", revTag.getTaggerIdent()));fragment.add(new Label("date", DateUtils.formatDate(revTag.getTaggerIdent().getWhen())));} else {fragment.add(new WebMarkupContainer("author").setVisible(false));@@ -280,7 +279,7 @@ public class DepotTagsPage extends DepotPage {}RevCommit commit = (RevCommit) ref.getPeeledObj();- PageParameters params = CommitDetailPage.paramsOf(getDepot(), commit.name());+ PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());link = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);link.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));@@ -293,7 +292,7 @@ public class DepotTagsPage extends DepotPage {link.add(new Label("message", commit.getShortMessage()));item.add(link);- item.add(new ArchiveMenuLink("download", depotModel) {+ item.add(new ArchiveMenuLink("download", projectModel) {@Overrideprotected String getRevision() {@@ -312,7 +311,7 @@ public class DepotTagsPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getDepot().deleteTag(tagName);+ getProject().deleteTag(tagName);target.add(tagsContainer);target.add(pagingNavigator);target.add(noTagsContainer);@@ -322,7 +321,7 @@ public class DepotTagsPage extends DepotPage {protected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canDeleteTag(getDepot(), tagName));+ setVisible(SecurityUtils.canDeleteTag(getProject(), tagName));}});@@ -356,11 +355,7 @@ public class DepotTagsPage extends DepotPage {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new DepotTagsResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));}- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotTagsPage.class, paramsOf(depot));- }}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsResourceReference.javanew file mode 100644index 0000000000..dc1b91cc33--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.project.tags;++import org.apache.wicket.request.resource.CssResourceReference;++public class ProjectTagsResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectTagsResourceReference() {+ super(ProjectTagsResourceReference.class, "project-tags.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/depot-tags.css b/web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/tags/depot-tags.cssrename to web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.cssdiff --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 f9c0d9cba7..00f7483184 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.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.web.behavior.testform.TestFormBehavior;import com.gitplex.server.web.behavior.testform.TestResult;@@ -53,25 +53,25 @@ public class ForgetPage extends BasePage {@Overrideprotected TestResult test() {- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account user = accountManager.findByName(bean.getUserNameOrEmailAddress());+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ User user = userManager.findByName(bean.getUserNameOrEmailAddress());if (user == null) {- user = accountManager.findByEmail(bean.getUserNameOrEmailAddress());+ user = userManager.findByEmail(bean.getUserNameOrEmailAddress());}if (user == null) {- return new TestResult.Failed("No account found with name or email: " + bean.getUserNameOrEmailAddress());+ return new TestResult.Failed("No user found with name or email: " + bean.getUserNameOrEmailAddress());} else {ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);if (configManager.getMailSetting() != null) {String password = RandomStringUtils.random(10, true, true);user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));- accountManager.save(user);+ userManager.save(user);MailManager mailManager = GitPlex.getInstance(MailManager.class);try {String mailBody = String.format("Dear %s, "+ "<p style='margin: 16px 0;'>"- + "Per your request, password of your account \"%s\" has been reset to:<br>"+ + "Per your request, password of your user \"%s\" has been reset to:<br>"+ "%s<br><br>"+ "Please login and change the password in your earliest convenience."+ "<p style='margin: 16px 0;'>"@@ -125,7 +125,7 @@ public class ForgetPage extends BasePage {private String userNameOrEmailAddress;- @Editable(name="Please specify your account name or email address")+ @Editable(name="Please specify your user name or email address")@NotEmptypublic String getUserNameOrEmailAddress() {return userNameOrEmailAddress;diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.htmlindex a75db1582a..e6f40e8a08 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html@@ -25,7 +25,7 @@<hr /><p class="text-right"><a wicket:id="forgetPassword">Forgot your password?</a>- <a wicket:id="registerAccount">Register an account</a>+ <a wicket:id="registerUser">Register an user</a></p></div></wicket:extend>\ No newline at end of filediff --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 b23a95e7a3..7b3ed37503 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@@ -19,10 +19,10 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.web.WebSession;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.base.BasePage;@@ -59,18 +59,18 @@ public class LoginPage extends BasePage {String feedback = null;- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);+ UserManager userManager = GitPlex.getInstance(UserManager.class);if (userName != null) {- Account user = accountManager.findByName(userName);+ User user = userManager.findByName(userName);if (user != null && user.getPassword() != null && user.getPassword().startsWith("@hash^prefix@")) {String hashAlgorithmChangeMessage = "GitPlex password hash algorithm has been changed for security reason.";- if (user.isAdministrator()) {+ if (user.isRoot()) {feedback = hashAlgorithmChangeMessage + " Please reset administrator password by running "+ "reset_admin_password command from GitPlex bin directory";} else {String password = RandomStringUtils.random(10, true, true);user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));- accountManager.save(user);+ userManager.save(user);ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);if (configManager.getMailSetting() != null) {@@ -80,7 +80,7 @@ public class LoginPage extends BasePage {String mailBody = String.format("Dear %s, "+ "<p style='margin: 16px 0;'>"+ hashAlgorithmChangeMessage- + " As a result of this, password of your account \"%s\" has been reset to:<br>"+ + " As a result of this, password of your user \"%s\" has been reset to:<br>"+ "%s<br><br>"+ "-- Sent by GitPlex",user.getDisplayName(), user.getName(), password);@@ -88,7 +88,7 @@ public class LoginPage extends BasePage {mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()),"Your GitPlex password has been reset", mailBody);feedback = hashAlgorithmChangeMessage- + " As a result of this, password of your account has been reset and sent to "+ + " As a result of this, password of your user has been reset and sent to "+ "address " + user.getEmail();} catch (Exception e) {logger.error("Error sending password reset email", e);@@ -185,7 +185,7 @@ public class LoginPage extends BasePage {});boolean enableSelfRegister = GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister();- add(new ViewStateAwarePageLink<Void>("registerAccount", RegisterPage.class).setVisible(enableSelfRegister));+ add(new ViewStateAwarePageLink<Void>("registerUser", RegisterPage.class).setVisible(enableSelfRegister));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.html b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.htmlindex 7b6d096a2b..f9ddcc79bb 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.html@@ -1,6 +1,6 @@<wicket:extend><div id="register" class="center-box">- <h1><i class="fa fa-ext fa-gitplex-logo"></i> Register GitPlex Account</h1>+ <h1><i class="fa fa-ext fa-gitplex-logo"></i> Register GitPlex User</h1><form wicket:id="form"><div wicket:id="editor"></div><div class="actions">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 3e88484831..85a39c01e7 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@@ -11,34 +11,34 @@ import org.apache.wicket.markup.html.link.Link;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.account.AccountPage;-import com.gitplex.server.web.page.account.setting.AvatarEditPage;import com.gitplex.server.web.page.base.BasePage;import com.gitplex.server.web.page.home.DashboardPage;+import com.gitplex.server.web.page.user.AvatarEditPage;+import com.gitplex.server.web.page.user.UserPage;@SuppressWarnings("serial")public class RegisterPage extends BasePage {public RegisterPage() {if (!GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister())- throw new UnauthenticatedException("Account self-register is disabled");+ throw new UnauthenticatedException("User self-register is disabled");if (getLoginUser() != null)- throw new IllegalStateException("Can not sign up an account while signed in");+ throw new IllegalStateException("Can not sign up an user while signed in");}@Overrideprotected void onInitialize() {super.onInitialize();- final Account account = new Account();- final BeanEditor<?> editor = BeanContext.editBean("editor", account, Account.getUserExcludeProperties());+ final User user = new User();+ final BeanEditor<?> editor = BeanContext.editBean("editor", user);Form<?> form = new Form<Void>("form") {@@ -46,23 +46,23 @@ public class RegisterPage extends BasePage {protected void onSubmit() {super.onSubmit();- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);- Account accountWithSameName = accountManager.findByName(account.getName());- if (accountWithSameName != null) {+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ User userWithSameName = userManager.findByName(user.getName());+ if (userWithSameName != null) {editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another account.");+ .addError("This name has already been used by another user.");}- Account accountWithSameEmail = accountManager.findByEmail(account.getEmail());- if (accountWithSameEmail != null) {+ User userWithSameEmail = userManager.findByEmail(user.getEmail());+ if (userWithSameEmail != null) {editor.getErrorContext(new PathSegment.Property("email"))- .addError("This email has already been used by another account.");+ .addError("This email has already been used by another user.");}if (!editor.hasErrors(true)) {- account.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(account.getPassword()));- accountManager.save(account, null);- Session.get().success("New account registered");- SecurityUtils.getSubject().runAs(account.getPrincipals());- setResponsePage(AvatarEditPage.class, AccountPage.paramsOf(account));+ user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));+ userManager.save(user, null);+ Session.get().success("New user registered");+ SecurityUtils.getSubject().runAs(user.getPrincipals());+ setResponsePage(AvatarEditPage.class, UserPage.paramsOf(user));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.html b/web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.htmldiff --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/user/AvatarEditPage.javasimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.javarename to web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.javaindex e67f9a7543..4de7886d9c 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/user/AvatarEditPage.java@@ -1,11 +1,9 @@-package com.gitplex.server.web.page.account.setting;+package com.gitplex.server.web.page.user;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.event.Broadcast;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.upload.FileUpload;@@ -13,7 +11,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.model.Account;+import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.FileUtils;import com.gitplex.server.web.component.avatar.AvatarChanged;import com.gitplex.server.web.util.avatar.AvatarManager;@@ -21,7 +19,7 @@ import com.gitplex.server.web.util.avatar.AvatarManager;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")-public class AvatarEditPage extends AccountSettingPage {+public class AvatarEditPage extends UserPage {private static final int MAX_IMAGE_SIZE = 10*1024*1024;@@ -56,9 +54,9 @@ public class AvatarEditPage extends AccountSettingPage {form.error("Upload must be less than " + FileUtils.byteCountToDisplaySize(MAX_IMAGE_SIZE));} else {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- avatarManager.useAvatar(accountModel.getObject(), upload);+ avatarManager.useAvatar(userModel.getObject(), upload);form.success("Avatar has been updated.");- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));+ send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));}target.add(form);}@@ -77,16 +75,16 @@ public class AvatarEditPage extends AccountSettingPage {protected void onConfigure() {super.onConfigure();AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- setVisible(avatarManager.getUploaded(accountModel.getObject()).exists());+ setVisible(avatarManager.getUploaded(userModel.getObject()).exists());}@Overridepublic void onClick(AjaxRequestTarget target) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- avatarManager.useAvatar(accountModel.getObject(), null);+ avatarManager.useAvatar(userModel.getObject(), null);form.success("Avatar has been reset");target.add(form);- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));+ send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));}});@@ -97,15 +95,8 @@ public class AvatarEditPage extends AccountSettingPage {}@Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new AvatarEditResourceReference()));- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AvatarEditPage.class, paramsOf(account));+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getUser());}}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.java b/web/src/main/java/com/gitplex/server/web/page/user/OldPassword.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.javarename to web/src/main/java/com/gitplex/server/web/page/user/OldPassword.javaindex d5af91eac3..116afa34cc 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/OldPassword.java@@ -5,7 +5,7 @@** Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $*/-package com.gitplex.server.web.page.account.setting;+package com.gitplex.server.web.page.user;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java b/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.javasimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.javarename to web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.javaindex 79b73c2905..bd29933240 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.account.setting;+package com.gitplex.server.web.page.user;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -6,7 +6,6 @@ import javax.validation.ConstraintValidatorContext;import org.apache.shiro.authc.credential.PasswordService;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.util.WicketUtils;public class OldPasswordValidator implements ConstraintValidator<OldPassword, String> {@@ -16,9 +15,9 @@ public class OldPasswordValidator implements ConstraintValidator<OldPassword, Stpublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {if (value != null) {- AccountPage page = (AccountPage) WicketUtils.getPage();+ UserPage page = (UserPage) WicketUtils.getPage();PasswordService passwordService = AppLoader.getInstance(PasswordService.class);- if (!passwordService.passwordsMatch(value, (String) page.getAccount().getCredentials())) {+ if (!passwordService.passwordsMatch(value, (String) page.getUser().getCredentials())) {constraintContext.disableDefaultConstraintViolation();constraintContext.buildConstraintViolationWithTemplate("Old password does not match").addConstraintViolation();return false;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.javasimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.javarename to web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.javaindex f5e90e03fc..1d2c078ec4 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditBean.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.account.setting;+package com.gitplex.server.web.page.user;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.html b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.htmldiff --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/user/PasswordEditPage.javasimilarity index 52%rename from web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.javarename to web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.javaindex 09866249f9..c1726f163b 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/user/PasswordEditPage.java@@ -1,29 +1,24 @@-package com.gitplex.server.web.page.account.setting;+package com.gitplex.server.web.page.user;import java.util.HashSet;import java.util.Set;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.Form;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.manager.AccountManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.editable.BeanContext;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")-public class PasswordEditPage extends AccountSettingPage {+public class PasswordEditPage extends UserPage {public PasswordEditPage(PageParameters params) {super(params);- Preconditions.checkState(!getAccount().isOrganization());}@Override@@ -34,9 +29,8 @@ public class PasswordEditPage extends AccountSettingPage {Set<String> excludedProperties = new HashSet<>();- // in case administrator changes password for non-adminsitrator user, we do not- // ask for old password- if (SecurityUtils.getAccount().isAdministrator() && !getAccount().isAdministrator())+ // in case administrator changes password we do not ask for old password+ if (SecurityUtils.isAdministrator())excludedProperties.add("oldPassword");Form<?> form = new Form<Void>("form") {@@ -44,8 +38,8 @@ public class PasswordEditPage extends AccountSettingPage {@Overrideprotected void onSubmit() {super.onSubmit();- getAccount().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));- GitPlex.getInstance(AccountManager.class).save(getAccount(), null);+ getUser().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));+ GitPlex.getInstance(UserManager.class).save(getUser(), null);Session.get().success("Password has been changed");bean.setOldPassword(null);@@ -59,11 +53,8 @@ public class PasswordEditPage extends AccountSettingPage {}@Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(AccountOverviewPage.class, paramsOf(account));- else- setResponsePage(PasswordEditPage.class, paramsOf(account));+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getUser());}}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.html b/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.htmldiff --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/user/TaskListPage.javasimilarity index 84%rename from web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.javarename to web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.javaindex 43b78b78a9..534d2aea3a 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/user/TaskListPage.java@@ -1,9 +1,8 @@-package com.gitplex.server.web.page.account.tasks;+package com.gitplex.server.web.page.user;import java.util.ArrayList;import java.util.List;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;@@ -21,30 +20,25 @@ import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;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.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.datatable.DefaultDataTable;import com.gitplex.server.web.component.datatable.EntityDataProvider;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.link.BranchLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.account.overview.AccountOverviewPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;-import com.google.common.base.Preconditions;@SuppressWarnings("serial")-public class TaskListPage extends AccountLayoutPage {+public class TaskListPage extends UserPage {public TaskListPage(PageParameters params) {super(params);-- Preconditions.checkState(!getAccount().isOrganization());}@Override@@ -56,7 +50,7 @@ public class TaskListPage extends AccountLayoutPage {@Overrideprotected void restrict(EntityCriteria<? extends AbstractEntity> criteria) {- criteria.add(Restrictions.eq("user", getAccount()));+ criteria.add(Restrictions.eq("user", getUser()));}};@@ -65,7 +59,7 @@ public class TaskListPage extends AccountLayoutPage {List<IColumn<PullRequestTask, String>> columns = new ArrayList<>();selectionColumn = new SelectionColumn<PullRequestTask, String>();- if (getAccount().equals(getLoginUser()))+ if (getUser().equals(getLoginUser()))columns.add(selectionColumn);columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("Pull Request"), "request") {@@ -143,7 +137,7 @@ public class TaskListPage extends AccountLayoutPage {});DataTable<PullRequestTask, String> dataTable =- new DefaultDataTable<PullRequestTask, String>("tasks", columns, dataProvider, WebConstants.DEFAULT_PAGE_SIZE);+ new DefaultDataTable<PullRequestTask, String>("tasks", columns, dataProvider, WebConstants.PAGE_SIZE);dataTable.setVisible(dataTable.getRowCount() != 0);add(dataTable);@@ -159,24 +153,21 @@ public class TaskListPage extends AccountLayoutPage {for (IModel<PullRequestTask> model: selectionColumn.getSelections())GitPlex.getInstance(Dao.class).remove(model.getObject());}- setResponsePage(TaskListPage.class, TaskListPage.paramsOf(getAccount()));+ setResponsePage(TaskListPage.class, TaskListPage.paramsOf(getUser()));}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAccount().equals(getLoginUser()) && dataTable.getRowCount() != 0);+ setVisible(getUser().equals(getLoginUser()) && dataTable.getRowCount() != 0);}});}@Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(AccountOverviewPage.class, paramsOf(account));- else- setResponsePage(TaskListPage.class, paramsOf(account));+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getUser());}}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.html b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.htmlnew file mode 100644index 0000000000..9f59657b6f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.html@@ -0,0 +1,23 @@+<wicket:extend>+ <div class="authorization list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="projectFrag">+ <a wicket:id="project"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="privilegeFrag">+ <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>+ <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.javanew file mode 100644index 0000000000..2d956cafa9--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java@@ -0,0 +1,407 @@+package com.gitplex.server.web.page.user;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Membership;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.permission.SystemAdministration;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.projectchoice.AbstractProjectChoiceProvider;+import com.gitplex.server.web.component.projectchoice.ProjectChoiceResourceReference;+import com.gitplex.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public class UserAuthorizationsPage extends UserPage {++ private String searchInput;++ private DataTable<Project, Void> authorizationsTable;++ private SelectionColumn<Project, Void> selectionColumn;++ private IModel<Map<Project, ProjectPrivilege>> projectAuthorizationsModel =+ new LoadableDetachableModel<Map<Project, ProjectPrivilege>>() {++ @Override+ protected Map<Project, ProjectPrivilege> load() {+ Map<Project, ProjectPrivilege> projectAuthorizations = new HashMap<>();+ Collection<Project> projectsAuthorizedFromOtherSources = new HashSet<>();+ if (getUser().asSubject().isPermitted(new SystemAdministration())) {+ for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {+ projectAuthorizations.put(project, ProjectPrivilege.ADMIN);+ projectsAuthorizedFromOtherSources.add(project);+ }+ } else {+ for (UserAuthorization authorization: getUser().getAuthorizations())+ projectAuthorizations.put(authorization.getProject(), authorization.getPrivilege());+ for (Membership membership: getUser().getMemberships()) {+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {+ ProjectPrivilege existingPrivilege = projectAuthorizations.get(authorization.getProject());+ if (existingPrivilege == null || authorization.getPrivilege().implies(existingPrivilege))+ projectAuthorizations.put(authorization.getProject(), authorization.getPrivilege());+ projectsAuthorizedFromOtherSources.add(authorization.getProject());+ }+ }+ for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {+ if (project.isPublicRead()) {+ if (!projectAuthorizations.containsKey(project))+ projectAuthorizations.put(project, ProjectPrivilege.READ);+ projectsAuthorizedFromOtherSources.add(project);+ }+ }+ }++ Map<Project, UserAuthorization> userAuthorizationMap = getUserAuthorizationMap();+ List<Project> projects = new ArrayList<>(projectAuthorizations.keySet());+ Collections.sort(projects, new Comparator<Project>() {++ @Override+ public int compare(Project o1, Project o2) {+ if (projectsAuthorizedFromOtherSources.contains(o1)) {+ if (projectsAuthorizedFromOtherSources.contains(o2)) {+ return o1.getName().compareTo(o2.getName());+ } else {+ return -1;+ }+ } else {+ if (projectsAuthorizedFromOtherSources.contains(o2)) {+ return 1;+ } else {+ return userAuthorizationMap.get(o2).getId().compareTo(userAuthorizationMap.get(o1).getId());+ }+ }+ }++ });++ Map<Project, ProjectPrivilege> sortedProjectAuthorizations = new LinkedHashMap<>();+ for (Project project: projects)+ sortedProjectAuthorizations.put(project, projectAuthorizations.get(project));++ return sortedProjectAuthorizations;+ }++ };++ public UserAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onDetach() {+ projectAuthorizationsModel.detach();+ super.onDetach();+ }++ private Map<Project, UserAuthorization> getUserAuthorizationMap() {+ Map<Project, UserAuthorization> userAuthorizationMap = new HashMap<>();+ for (UserAuthorization authorization: getUser().getAuthorizations()) {+ userAuthorizationMap.put(authorization.getProject(), authorization);+ }+ return userAuthorizationMap;+ }++ private Map<Project, ProjectPrivilege> getProjectAuthorizations() {+ return projectAuthorizationsModel.getObject();+ }++ private boolean isPrivilegeFromOtherSources(Project project) {+ UserAuthorization userAuthorization = getUserAuthorizationMap().get(project);+ ProjectPrivilege privilege = getProjectAuthorizations().get(project);+ return userAuthorization == null || !userAuthorization.getPrivilege().implies(privilege);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterProjects", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(authorizationsTable);+ }++ });++ add(new SelectToAddChoice<Project>("addNew", new AbstractProjectChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Project> response) {+ List<Project> notAuthorized = new ArrayList<>();++ for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {+ if (project.matches(searchInput) && !getProjectAuthorizations().containsKey(project))+ notAuthorized.add(project);+ }+ Collections.sort(notAuthorized);+ Collections.reverse(notAuthorized);+ new ResponseFiller<Project>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add project...");+ getSettings().setFormatResult("gitplex.server.projectChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.projectChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.projectChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Project selection) {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setUser(getUser());+ authorization.setProject(selection);+ GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);+ target.add(authorizationsTable);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();+ Map<Project, UserAuthorization> userAuthorizationMap = getUserAuthorizationMap();+ for (IModel<Project> model: selectionColumn.getSelections()) {+ UserAuthorization authorization = userAuthorizationMap.get(model.getObject());+ if (authorization != null)+ authorizationsToDelete.add(authorization);+ }+ GitPlex.getInstance(UserAuthorizationManager.class).delete(authorizationsToDelete);+ getUser().getAuthorizations().removeAll(authorizationsToDelete);+ target.add(authorizationsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ boolean hasLocalPrivileges = false;+ for (IModel<Project> model: selectionColumn.getSelections()) {+ Project project = model.getObject();+ if (!isPrivilegeFromOtherSources(project)) {+ hasLocalPrivileges = true;+ break;+ }+ }+ setVisible(hasLocalPrivileges);+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<Project, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<Project, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<Project, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {+ Fragment fragment = new Fragment(componentId, "projectFrag", UserAuthorizationsPage.this);+ fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(rowModel.getObject())) {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getName());+ }++ });+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Project, Void>(Model.of("Permission")) {++ @Override+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {+ Fragment fragment = new Fragment(componentId, "privilegeFrag", UserAuthorizationsPage.this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ String script = String.format(""+ + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",+ getMarkupId(), isPrivilegeFromOtherSources(rowModel.getObject()));++ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };+ WebMarkupContainer dropdown = new DropdownLink("dropdown") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ ProjectPrivilege privilege = getProjectAuthorizations().get(rowModel.getObject());+ return new PrivilegeSelectionPanel(id, privilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {+ dropdown.close();+ Project project = rowModel.getObject();+ UserAuthorization userAuthorization = getUserAuthorizationMap().get(project);+ if (userAuthorization == null) {+ userAuthorization = new UserAuthorization();+ userAuthorization.setUser(getUser());+ userAuthorization.setProject(project);+ getUser().getAuthorizations().add(userAuthorization);+ }+ userAuthorization.setPrivilege(privilege);+ if (getProjectAuthorizations().get(project) != privilege) {+ Session.get().warn("Specified permission is not taking effect as a higher permission is granted from other sources");+ }+ GitPlex.getInstance(UserAuthorizationManager.class).save(userAuthorization);+ target.add(fragment);+ }++ };+ }++ };+ dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getProjectAuthorizations().get(rowModel.getObject()).name();+ }++ }));+ fragment.add(dropdown);++ fragment.add(new DropdownLink("otherSources") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Project project = rowModel.getObject();+ return new PrivilegeSourcePanel(id, getUser(), project,+ getProjectAuthorizations().get(project));+ }++ });++ fragment.setOutputMarkupId(true);+ cellItem.add(fragment);+ }+ });++ SortableDataProvider<Project, Void> dataProvider = new SortableDataProvider<Project, Void>() {++ @Override+ public Iterator<? extends Project> iterator(long first, long count) {+ List<Project> projects = new ArrayList<>(getProjectAuthorizations().keySet());+ if (first + count <= projects.size())+ return projects.subList((int)first, (int)(first+count)).iterator();+ else+ return projects.subList((int)first, projects.size()).iterator();+ }++ @Override+ public long size() {+ return getProjectAuthorizations().size();+ }++ @Override+ public IModel<Project> model(Project object) {+ Long projectId = object.getId();+ return new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ return GitPlex.getInstance(ProjectManager.class).load(projectId);+ }++ };+ }+ };++ add(authorizationsTable = new DefaultDataTable<Project, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE));+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.html b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.htmlnew file mode 100644index 0000000000..603fae7b2f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.html@@ -0,0 +1,19 @@+<wicket:extend>+ <div class="membership list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="memberships" class="memberships table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="groupFrag">+ <a wicket:id="group"></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.javanew file mode 100644index 0000000000..4a8da328f7--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java@@ -0,0 +1,239 @@+package com.gitplex.server.web.page.user;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.manager.MembershipManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.Membership;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.groupchoice.AbstractGroupChoiceProvider;+import com.gitplex.server.web.component.groupchoice.GroupChoiceResourceReference;+import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;+import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.page.group.GroupProfilePage;++@SuppressWarnings("serial")+public class UserMembershipsPage extends UserPage {++ private String searchInput;++ private DataTable<Membership, Void> membershipsTable;++ private SelectionColumn<Membership, Void> selectionColumn;++ public UserMembershipsPage(PageParameters params) {+ super(params);+ }++ private EntityCriteria<Membership> getCriteria() {+ EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);+ if (searchInput != null)+ criteria.createCriteria("group").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));+ criteria.add(Restrictions.eq("user", getUser()));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterGroups", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(membershipsTable);+ }++ });++ add(new SelectToAddChoice<Group>("addNew", new AbstractGroupChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Group> response) {+ List<Group> notMembersOf = new ArrayList<>();+ for (Group group: GitPlex.getInstance(GroupManager.class).findAll()) {+ if (group.matches(searchInput) && !getUser().getGroups().contains(group))+ notMembersOf.add(group);+ }+ Collections.sort(notMembersOf);+ Collections.reverse(notMembersOf);+ new ResponseFiller<Group>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add group...");+ getSettings().setFormatResult("gitplex.server.groupChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.groupChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.groupChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Group selection) {+ Membership membership = new Membership();+ membership.setUser(getUser());+ membership.setGroup(selection);+ GitPlex.getInstance(MembershipManager.class).save(membership);+ target.add(membershipsTable);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<Membership> membershipsToDelete = new HashSet<>();+ for (IModel<Membership> model: selectionColumn.getSelections()) {+ membershipsToDelete.add(model.getObject());+ }+ GitPlex.getInstance(MembershipManager.class).delete(membershipsToDelete);+ target.add(membershipsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!selectionColumn.getSelections().isEmpty());+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<Membership, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<Membership, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ if (SecurityUtils.isAdministrator())+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<Membership, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,+ IModel<Membership> rowModel) {+ Membership membership = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "groupFrag", UserMembershipsPage.this);+ Link<Void> link = new BookmarkablePageLink<Void>("group", GroupProfilePage.class,+ GroupProfilePage.paramsOf(membership.getGroup())) {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getGroup().getName());+ }++ };+ fragment.add(link);+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Membership, Void>(Model.of("Description")) {++ @Override+ public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,+ IModel<Membership> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getGroup().getDescription()));+ }+ });++ SortableDataProvider<Membership, Void> dataProvider = new SortableDataProvider<Membership, Void>() {++ @Override+ public Iterator<? extends Membership> iterator(long first, long count) {+ EntityCriteria<Membership> criteria = getCriteria();+ criteria.addOrder(Order.desc("id"));+ return GitPlex.getInstance(MembershipManager.class).findRange(criteria, (int)first,+ (int)count).iterator();+ }++ @Override+ public long size() {+ return GitPlex.getInstance(MembershipManager.class).count(getCriteria());+ }++ @Override+ public IModel<Membership> model(Membership object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Membership>() {++ @Override+ protected Membership load() {+ return GitPlex.getInstance(MembershipManager.class).load(id);+ }++ };+ }+ };++ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,+ WebConstants.PAGE_SIZE));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.html b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.htmlsimilarity index 71%rename from web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/user/UserPage.htmlindex bc30b1bdcd..3f162be54c 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div id="account" class="sidebar">+ <div id="user" class="sidebar"><table><tr><td class="nav">@@ -8,7 +8,7 @@<a wicket:id="avatar"><img wicket:id="avatar"></img></a></div></div>- <ul wicket:id="accountTabs" class="tabs list-unstyled"></ul>+ <ul wicket:id="userTabs" class="tabs list-unstyled"></ul></td><td class="content"><wicket:child></wicket:child>diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.javanew file mode 100644index 0000000000..8b8ec57892--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java@@ -0,0 +1,104 @@+package com.gitplex.server.web.page.user;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.component.tabbable.PageTab;+import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.util.model.EntityModel;++@SuppressWarnings("serial")+public abstract class UserPage extends LayoutPage {++ private static final String PARAM_USER = "user";++ protected final IModel<User> userModel;++ public UserPage(PageParameters params) {+ super(params);++ User user = GitPlex.getInstance(UserManager.class).load(params.get(PARAM_USER).toLong());+ userModel = new EntityModel<User>(user);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",+ AvatarEditPage.class, AvatarEditPage.paramsOf(getUser())) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ };+ if (!SecurityUtils.canManage(getUser())) {+ avatarLink.setEnabled(false);+ }+ add(avatarLink);+ avatarLink.add(new Avatar("avatar", userModel.getObject()));++ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));+ if (SecurityUtils.canManage(getUser())) {+ tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));+ tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));+ }+ tabs.add(new UserTab("Groups", "fa fa-fw fa-group", UserMembershipsPage.class));+ if (SecurityUtils.isAdministrator())+ tabs.add(new UserTab("Authorizations", "fa fa-fw fa-lock", UserAuthorizationsPage.class));+ if (SecurityUtils.canManage(getUser()))+ tabs.add(new UserTab("Tasks", "fa fa-fw fa-bell-o", TaskListPage.class));++ add(new Tabbable("userTabs", tabs));+ }++ @Override+ protected void onDetach() {+ userModel.detach();++ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new UserResourceReference()));+ }++ public User getUser() {+ return userModel.getObject();+ }++ public static PageParameters paramsOf(User user) {+ PageParameters params = new PageParameters();+ params.add(PARAM_USER, user.getId());+ return params;+ }++ @Override+ protected Component newContextHead(String componentId) {+ return new Label(componentId, "User - " + getUser().getDisplayName());+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.html b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.htmlnew file mode 100644index 0000000000..e0dc33a953--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.html@@ -0,0 +1,12 @@+<wicket:extend>+ <div wicket:id="content" class="profile"></div>+ <wicket:fragment wicket:id="editFrag">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>+ <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.javanew file mode 100644index 0000000000..9162d7cb5e--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java@@ -0,0 +1,117 @@+package com.gitplex.server.web.page.user;++import java.io.Serializable;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.launcher.loader.AppLoader;+import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.EditSupportRegistry;+import com.gitplex.server.web.editable.PathSegment;+import com.gitplex.server.web.page.home.DashboardPage;+import com.gitplex.server.web.util.ConfirmOnClick;+import com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class UserProfilePage extends UserPage {++ private BeanEditor<?> editor;++ private String oldName;++ public UserProfilePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (SecurityUtils.canManage(getUser())) {+ Fragment fragment = new Fragment("content", "editFrag", this);+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {++ @Override+ public void detach() {+ }++ @Override+ public Serializable getObject() {+ return getUser();+ }++ @Override+ public void setObject(Serializable object) {+ // check contract of UserManager.save on why we assign oldName here+ oldName = getUser().getName();+ editor.getBeanDescriptor().copyProperties(object, getUser());+ }++ }, Sets.newHashSet("password"));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ User user = getUser();+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ User userWithSameName = userManager.findByName(user.getName());+ if (userWithSameName != null && !userWithSameName.equals(user)) {+ editor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another user.");+ }+ User userWithSameEmail = userManager.findByEmail(user.getEmail());+ if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {+ editor.getErrorContext(new PathSegment.Property("email"))+ .addError("This email has already been used by another user.");+ }+ if (!editor.hasErrors(true)) {+ userManager.save(user, oldName);+ setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));+ }+ }++ };+ form.add(editor);++ form.add(new Link<Void>("delete") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(SecurityUtils.isAdministrator() && !getUser().isRoot());+ }++ @Override+ public void onClick() {+ GitPlex.getInstance(UserManager.class).delete(getUser());+ setResponsePage(DashboardPage.class);+ }++ }.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));++ fragment.add(form);+ add(fragment);+ } else {+ EditSupportRegistry registry = AppLoader.getInstance(EditSupportRegistry.class);+ BeanContext<Serializable> editContext = registry.getBeanEditContext(+ User.class, Sets.newHashSet("password"));+ add(editContext.renderForView("content", Model.of(getUser())));+ }++ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.javanew file mode 100644index 0000000000..d1ccf3094a--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.user;++import org.apache.wicket.request.resource.CssResourceReference;++public class UserResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public UserResourceReference() {+ super(UserResourceReference.class, "user.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserTab.java b/web/src/main/java/com/gitplex/server/web/page/user/UserTab.javanew file mode 100644index 0000000000..56531e11d2--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserTab.java@@ -0,0 +1,52 @@+package com.gitplex.server.web.page.user;++import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import com.gitplex.server.web.component.tabbable.PageTab;++@SuppressWarnings("serial")+public class UserTab extends PageTab {++ private final String iconClass;++ public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass) {+ super(Model.of(title), mainPageClass);++ this.iconClass = iconClass;+ }++ public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ Class<? extends UserPage> additionalPageClass1) {+ super(Model.of(title), mainPageClass, additionalPageClass1);++ this.iconClass = iconClass;+ }++ public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ Class<? extends UserPage> additionalPageClass1,+ Class<? extends UserPage> additionalPageClass2) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);++ this.iconClass = iconClass;+ }++ public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ Class<? extends UserPage> additionalPageClass1,+ Class<? extends UserPage> additionalPageClass2,+ Class<? extends UserPage> additionalPageClass3) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);++ this.iconClass = iconClass;+ }++ public String getIconClass() {+ return iconClass;+ }++ @Override+ public Component render(String componentId) {+ return new UserTabLink(componentId, this);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.html b/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.htmlnew file mode 100644index 0000000000..4686880dcd--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.java b/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.javanew file mode 100644index 0000000000..28a6b2234f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserTabLink.java@@ -0,0 +1,34 @@+package com.gitplex.server.web.page.user;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;++import com.gitplex.server.web.component.link.ViewStateAwarePageLink;++@SuppressWarnings("serial")+public class UserTabLink extends Panel {++ private final UserTab tab;++ public UserTabLink(String id, UserTab tab) {+ super(id);++ this.tab = tab;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ UserPage page = (UserPage) getPage();+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ tab.getMainPageClass(), UserPage.paramsOf(page.getUser()));+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));+ link.add(new Label("label", tab.getTitleModel()));+ add(link);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/user.css b/web/src/main/java/com/gitplex/server/web/page/user/user.cssnew file mode 100644index 0000000000..8ea3d9b340--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/user/user.css@@ -0,0 +1,26 @@+#user.sidebar>table>tbody>tr>td.nav>.tabs>li>a {+ width: 220px;+}+#user.sidebar>table>tbody>tr>td.nav>.head {+ margin: -20px 0 20px 0;+ padding: 10px 10px 0 10px;+ border-bottom: 1px solid #DDD;+}+#user.sidebar>table>tbody>tr>td.nav>.head>div.avatar img {+ height: 200px;+ width: 200px;+ margin-bottom: 10px;+}+#user.sidebar>table>tbody>tr>td.content {+ padding: 20px;+}++#user .avatar-edit .upload {+ margin-right: 8px;+}++#user .authorization.list a.other-sources {+ margin-left: 4px;+ color: #DCB508;+ vertical-align: middle;+}\ No newline at end of filediff --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 8f4f3825a7..8d2b74199d 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@@ -14,11 +14,12 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.CommitInfoManager;-import com.gitplex.server.model.Account;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.Team;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.model.User;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.Group;+import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.util.stringmatch.PatternApplied;import com.gitplex.server.util.stringmatch.WildcardUtils;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;@@ -26,11 +27,11 @@ import com.google.common.base.Preconditions;public class SuggestionUtils {- public static List<InputSuggestion> suggestBranch(Depot depot, String matchWith) {+ public static List<InputSuggestion> suggestBranch(Project project, String matchWith) {String lowerCaseMatchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();- for (RefInfo ref: depot.getBranches()) {+ for (RefInfo ref: project.getBranches()) {String branch = GitUtils.ref2branch(ref.getRef().getName());int index = branch.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {@@ -41,11 +42,11 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestTag(Depot depot, String matchWith) {+ public static List<InputSuggestion> suggestTag(Project project, String matchWith) {String lowerCaseMatchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();- for (RefInfo ref: depot.getTags()) {+ for (RefInfo ref: project.getTags()) {String tag = GitUtils.ref2tag(ref.getRef().getName());int index = tag.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {@@ -56,11 +57,11 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestUser(Depot depot, DepotPrivilege privilege, String matchWith) {+ public static List<InputSuggestion> suggestUser(Project project, ProjectPrivilege privilege, String matchWith) {String lowerCaseMatchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();- for (Account user: SecurityUtils.findUsersCan(depot, privilege)) {+ for (User user: SecurityUtils.findUsersCan(project, privilege)) {String name = user.getName();int index = name.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {@@ -71,11 +72,11 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestTeam(Depot depot, String matchWith) {+ public static List<InputSuggestion> suggestGroup(String matchWith) {String lowerCaseMatchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- for (Team team: depot.getAccount().getDefinedTeams()) {- String name = team.getName();+ for (Group group: GitPlex.getInstance(GroupManager.class).findAll()) {+ String name = group.getName();int index = name.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1) {Range matchRange = new Range(index, index+lowerCaseMatchWith.length());@@ -85,9 +86,9 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestPath(Depot depot, String matchWith) {+ public static List<InputSuggestion> suggestPath(Project project, String matchWith) {CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);- return suggestPath(commitInfoManager.getFiles(depot), matchWith);+ return suggestPath(commitInfoManager.getFiles(project), matchWith);}private static Set<String> getChildren(List<PatternApplied> allApplied, String path) {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 87bd45424a..63bdcaa1aa 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.model.Account;+import com.gitplex.server.model.User;public interface AvatarManager {@@ -19,7 +19,7 @@ public interface AvatarManager {* @return* url of avatar image. This url will be relative to context root if gravatar is disabled*/- String getAvatarUrl(@Nullable Account user);+ String getAvatarUrl(@Nullable User user);/*** Get URL of avatar image of specified person.@@ -31,9 +31,9 @@ public interface AvatarManager {*/String getAvatarUrl(PersonIdent person);- void useAvatar(Account user, @Nullable FileUpload avatar);+ void useAvatar(User user, @Nullable FileUpload avatar);- File getUploaded(Account account);+ File getUploaded(User user);}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 05510dfe60..7a7d7eaeaf 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@@ -18,7 +18,7 @@ import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.model.Account;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.LockUtils;@@ -43,21 +43,21 @@ public class DefaultAvatarManager implements AvatarManager {@Transactional@Override- public String getAvatarUrl(@Nullable Account account) {- if (account == null) {+ public String getAvatarUrl(@Nullable User user) {+ if (user == null) {return AVATARS_BASE_URL + "gitplex.png";- } else if (account.getId() == null) {+ } else if (user.getId() == null) {return AVATARS_BASE_URL + "default.png";} else {- File avatarFile = getUploaded(account);+ File avatarFile = getUploaded(user);if (avatarFile.exists()) {- return AVATARS_BASE_URL + "uploaded/" + account.getId() + "?version=" + avatarFile.lastModified();+ return AVATARS_BASE_URL + "uploaded/" + user.getId() + "?version=" + avatarFile.lastModified();}- if (configManager.getSystemSetting().isGravatarEnabled() && !account.isOrganization())- return Gravatar.getURL(account.getEmail(), GRAVATAR_SIZE);+ if (configManager.getSystemSetting().isGravatarEnabled())+ return Gravatar.getURL(user.getEmail(), GRAVATAR_SIZE);else- return generateAvatar(account.getDisplayName(), account.getEmail());+ return generateAvatar(user.getDisplayName(), user.getEmail());}}@@ -114,17 +114,17 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public File getUploaded(Account account) {- return new File(Bootstrap.getSiteDir(), "avatars/uploaded/" + account.getId());+ public File getUploaded(User user) {+ return new File(Bootstrap.getSiteDir(), "avatars/uploaded/" + user.getId());}@Transactional@Override- public void useAvatar(Account account, FileUpload upload) {- Lock avatarLock = LockUtils.getLock("uploaded-avatar:" + account.getId());+ public void useAvatar(User user, FileUpload upload) {+ Lock avatarLock = LockUtils.getLock("uploaded-avatar:" + user.getId());avatarLock.lock();try {- File avatarFile = getUploaded(account);+ File avatarFile = getUploaded(user);if (upload != null) {FileUtils.createDir(avatarFile.getParentFile());try {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 4d93f6da10..ba41dbb18d 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,11 +1,11 @@package com.gitplex.server.web.util.commitmessagetransform;import com.gitplex.launcher.loader.ExtensionPoint;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;@ExtensionPointpublic interface CommitMessageTransformer {- String transform(Depot depot, String commitMessage);+ String transform(Project project, String commitMessage);}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 95ff01e797..c14f66fd24 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,15 +2,15 @@ package com.gitplex.server.web.util.commitmessagetransform;import javax.inject.Singleton;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;import com.gitplex.server.model.support.CommitMessageTransformSetting;@Singletonpublic class PatternCommitMessageTransformer implements CommitMessageTransformer {@Override- public String transform(Depot depot, String commitMessage) {- CommitMessageTransformSetting setting = depot.getCommitMessageTransformSetting();+ public String transform(Project project, String commitMessage) {+ CommitMessageTransformSetting setting = project.getCommitMessageTransformSetting();if (setting != null) {return commitMessage.replaceAll(setting.getSearchFor(), setting.getReplaceWith());} else {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.javadeleted file mode 100644index fb618dd5bf..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java+++ /dev/null@@ -1,101 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import java.util.ArrayList;-import java.util.List;--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 {-- private final Account user;-- private final Depot depot;-- private transient List<PrivilegeSource> privilegeSources;-- private transient DepotPrivilege greatestPrivilege;-- public DepotAccess(Account user, Depot depot) {- this.user = user;- this.depot = depot;- }-- public Account getUser() {- return user;- }-- public Depot getDepot() {- return depot;- }-- /*- * This method utilizes cached information in account level to reduce database query- * to the minimum. This is important as this method might be called repeatedly for- * different depot or user- */- public List<PrivilegeSource> getPrivilegeSources() {- if (privilegeSources == null) {- privilegeSources = new ArrayList<>();- if (depot.isPublicRead()) {- privilegeSources.add(new IsPublicDepot());- }- if (user.isAdministrator()) {- privilegeSources.add(new IsSystemAdministrator());- }- if (user.equals(depot.getAccount())) {- privilegeSources.add(new IsDepotOwner());- }-- OrganizationMembership membership = null;- for (OrganizationMembership each: depot.getAccount().getOrganizationMembers()) {- if (each.getUser().equals(user)) {- membership = each;- break;- }- }- if (membership != null) {- if (membership.isAdmin()) {- privilegeSources.add(new IsOrganizationAdmin(membership));- }- if (membership.getOrganization().getDefaultPrivilege() != DepotPrivilege.NONE) {- privilegeSources.add(new IsOrganizationMember(membership));- }- }- for (TeamAuthorization authorization: depot.getAccount().getAllTeamAuthorizationsInOrganization()) {- if (authorization.getDepot().equals(depot)) {- for (TeamMembership teamMembership: depot.getAccount().getAllTeamMembershipsInOrganiation()) {- if (teamMembership.getUser().equals(user)- && teamMembership.getTeam().equals(authorization.getTeam())) {- privilegeSources.add(new IsTeamMember(teamMembership, authorization.getPrivilege()));- }- }- }- }- for (UserAuthorization authorization: depot.getAccount().getAllUserAuthorizationsInOrganization()) {- if (authorization.getDepot().equals(depot) && authorization.getUser().equals(user)) {- privilegeSources.add(new IsDepotCollaborator(authorization));- break;- }- }- }- return privilegeSources;- }-- public DepotPrivilege getGreatestPrivilege() {- if (greatestPrivilege == null) {- greatestPrivilege = DepotPrivilege.NONE;- for (PrivilegeSource source: getPrivilegeSources()) {- if (source.getPrivilege().can(greatestPrivilege))- greatestPrivilege = source.getPrivilege();- }- }- return greatestPrivilege;- }--}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.javadeleted file mode 100644index d2915123e4..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java+++ /dev/null@@ -1,43 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.model.LoadableDetachableModel;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.UserAuthorizationManager;-import com.gitplex.server.model.UserAuthorization;-import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsDepotCollaborator implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- private final Long authorizationId;-- private final DepotPrivilege privilege;-- public IsDepotCollaborator(UserAuthorization authorization) {- this.authorizationId = authorization.getId();- this.privilege = authorization.getPrivilege();- }-- @Override- public DepotPrivilege getPrivilege() {- return privilege;- }-- @Override- public Component render(String componentId) {- return new IsDepotCollaboratorPanel(componentId, new LoadableDetachableModel<UserAuthorization>() {-- private static final long serialVersionUID = 1L;-- @Override- protected UserAuthorization load() {- return GitPlex.getInstance(UserAuthorizationManager.class).load(authorizationId);- }-- });- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.htmldeleted file mode 100644index caf0a7e67b..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- This user is added as a <a wicket:id="collaborator">repository collaborator</a> with <span wicket:id="privilege"></span> permission-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 688fa6fd00..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java+++ /dev/null@@ -1,36 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.UserAuthorization;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;--@SuppressWarnings("serial")-public class IsDepotCollaboratorPanel extends Panel {-- private final IModel<UserAuthorization> authorizationModel;-- public IsDepotCollaboratorPanel(String id, IModel<UserAuthorization> authorizationModel) {- super(id);- this.authorizationModel = authorizationModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ViewStateAwarePageLink<Void>("collaborator", DepotCollaboratorListPage.class,- DepotCollaboratorListPage.paramsOf(authorizationModel.getObject().getDepot())));- add(new Label("privilege", authorizationModel.getObject().getPrivilege()));- }-- @Override- protected void onDetach() {- authorizationModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.javadeleted file mode 100644index e44d6eea5a..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;--import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsDepotOwner implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- @Override- public DepotPrivilege getPrivilege() {- return DepotPrivilege.ADMIN;- }-- @Override- public Component render(String componentId) {- return new Label(componentId, "This user is owner of this repository");- }--}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.javadeleted file mode 100644index 21959f1365..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java+++ /dev/null@@ -1,40 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.model.LoadableDetachableModel;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.OrganizationMembershipManager;-import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsOrganizationAdmin implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- private final Long membershipId;-- public IsOrganizationAdmin(OrganizationMembership membership) {- this.membershipId = membership.getId();- }-- @Override- public DepotPrivilege getPrivilege() {- return DepotPrivilege.ADMIN;- }-- @Override- public Component render(String componentId) {- return new IsOrganizationAdminPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {-- private static final long serialVersionUID = 1L;-- @Override- protected OrganizationMembership load() {- return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);- }-- });- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.htmldeleted file mode 100644index f68c8645a0..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- This user is <a wicket:id="member">admin</a> of organization <span wicket:id="organizationName"></span>-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 12d55e1711..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java+++ /dev/null@@ -1,37 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.members.MemberTeamListPage;--@SuppressWarnings("serial")-public class IsOrganizationAdminPanel extends Panel {-- private final IModel<OrganizationMembership> membershipModel;-- public IsOrganizationAdminPanel(String id, IModel<OrganizationMembership> membershipModel) {- super(id);- this.membershipModel = membershipModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ViewStateAwarePageLink<Void>("member",- MemberTeamListPage.class, MemberTeamListPage.paramsOf(membershipModel.getObject())));- add(new Label("organizationName", membershipModel.getObject().getOrganization().getName()));- }-- @Override- protected void onDetach() {- membershipModel.detach();-- super.onDetach();- }--}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.javadeleted file mode 100644index 4b6b27456e..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java+++ /dev/null@@ -1,43 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.model.LoadableDetachableModel;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.OrganizationMembershipManager;-import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsOrganizationMember implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- private final Long membershipId;-- private final DepotPrivilege privilege;-- public IsOrganizationMember(OrganizationMembership membership) {- this.membershipId = membership.getId();- this.privilege = membership.getOrganization().getDefaultPrivilege();- }-- @Override- public DepotPrivilege getPrivilege() {- return privilege;- }-- @Override- public Component render(String componentId) {- return new IsOrganizationMemberPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {-- private static final long serialVersionUID = 1L;-- @Override- protected OrganizationMembership load() {- return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);- }-- });- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.htmldeleted file mode 100644index ca21685fdc..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:panel>- This user is a member of organization <span wicket:id="organizationName"></span>- whose default privilege is <a wicket:id="organizationSetting"><span wicket:id="privilegeName"></span></a> on all contained repositories-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 848cfa2777..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java+++ /dev/null@@ -1,44 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;--import com.gitplex.server.model.Account;-import com.gitplex.server.model.OrganizationMembership;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.setting.ProfileEditPage;--public class IsOrganizationMemberPanel extends Panel {-- private static final long serialVersionUID = 1L;-- private final IModel<OrganizationMembership> membershipModel;-- public IsOrganizationMemberPanel(String id, IModel<OrganizationMembership> membershipModel) {- super(id);- this.membershipModel = membershipModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Account organization = membershipModel.getObject().getOrganization();- add(new Label("organizationName", organization.getDisplayName()));-- ViewStateAwarePageLink<Void> link = new ViewStateAwarePageLink<Void>("organizationSetting",- ProfileEditPage.class, ProfileEditPage.paramsOf(organization));- link.add(new Label("privilegeName", organization.getDefaultPrivilege()));- link.setEnabled(SecurityUtils.canManage(organization));- add(link);- }-- @Override- protected void onDetach() {- membershipModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.javadeleted file mode 100644index 7efbaaf3b0..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;--import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsPublicDepot implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- @Override- public DepotPrivilege getPrivilege() {- return DepotPrivilege.READ;- }-- @Override- public Component render(String componentId) {- return new Label(componentId, "This repository is public");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.javadeleted file mode 100644index f1698c2e2e..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;--import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsSystemAdministrator implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- @Override- public DepotPrivilege getPrivilege() {- return DepotPrivilege.ADMIN;- }-- @Override- public Component render(String componentId) {- return new Label(componentId, "This user is system administrator");- }--}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.javadeleted file mode 100644index a843048bee..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java+++ /dev/null@@ -1,43 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.Component;-import org.apache.wicket.model.LoadableDetachableModel;--import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.TeamMembershipManager;-import com.gitplex.server.model.TeamMembership;-import com.gitplex.server.security.privilege.DepotPrivilege;--public class IsTeamMember implements PrivilegeSource {-- private static final long serialVersionUID = 1L;-- private final Long membershipId;-- private final DepotPrivilege privilege;-- public IsTeamMember(TeamMembership membership, DepotPrivilege privilege) {- this.membershipId = membership.getId();- this.privilege = privilege;- }-- @Override- public DepotPrivilege getPrivilege() {- return privilege;- }-- @Override- public Component render(String componentId) {- return new IsTeamMemberPanel(componentId, new LoadableDetachableModel<TeamMembership>() {-- private static final long serialVersionUID = 1L;-- @Override- protected TeamMembership load() {- return GitPlex.getInstance(TeamMembershipManager.class).load(membershipId);- }-- }, privilege);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.htmldeleted file mode 100644index 69f087d73c..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:panel>- This user is a member of team <a wicket:id="memberListLink"><span wicket:id="name"></span></a>- which is authorized to <a wicket:id="depotListLink"><span wicket:id="privilege"></span></a> this repository-</wicket:panel>\ No newline at end of filediff --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.javadeleted file mode 100644index 81ae47af7f..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java+++ /dev/null@@ -1,52 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import org.apache.wicket.markup.html.basic.Label;-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.model.TeamMembership;-import com.gitplex.server.security.privilege.DepotPrivilege;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.account.teams.TeamDepotListPage;-import com.gitplex.server.web.page.account.teams.TeamMemberListPage;--@SuppressWarnings("serial")-public class IsTeamMemberPanel extends Panel {-- private final IModel<TeamMembership> membershipModel;-- private final DepotPrivilege privilege;-- public IsTeamMemberPanel(String id, IModel<TeamMembership> membershipModel, DepotPrivilege privilege) {- super(id);- this.membershipModel = membershipModel;- this.privilege = privilege;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Link<Void> memberListLink = new ViewStateAwarePageLink<Void>(- "memberListLink",- TeamMemberListPage.class,- TeamMemberListPage.paramsOf(membershipModel.getObject().getTeam()));- memberListLink.add(new Label("name", membershipModel.getObject().getTeam().getName()));- add(memberListLink);-- Link<Void> depotListLink = new ViewStateAwarePageLink<Void>(- "depotListLink",- TeamDepotListPage.class,- TeamDepotListPage.paramsOf(membershipModel.getObject().getTeam()));- depotListLink.add(new Label("privilege", privilege));- add(depotListLink);- }-- @Override- protected void onDetach() {- membershipModel.detach();- super.onDetach();- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.javadeleted file mode 100644index 796ecd3981..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.java+++ /dev/null@@ -1,14 +0,0 @@-package com.gitplex.server.web.util.depotaccess;--import java.io.Serializable;--import org.apache.wicket.Component;--import com.gitplex.server.security.privilege.DepotPrivilege;--public interface PrivilegeSource extends Serializable {-- DepotPrivilege getPrivilege();-- Component render(String componentId);-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.javadeleted file mode 100644index cb8b68a448..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.java+++ /dev/null@@ -1,21 +0,0 @@-package com.gitplex.server.web.util.mapper;--import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Request;-import org.apache.wicket.request.component.IRequestablePage;--public class AccountMapper extends WebPageMapper {-- public AccountMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {- super(mountPath, pageClass);- }-- @Override- public IRequestHandler mapRequest(Request request) {- if (MapperUtils.getAccountSegments(request.getUrl()) > 1)- return super.mapRequest(request);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.javadeleted file mode 100644index f7f3436a7f..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.java+++ /dev/null@@ -1,21 +0,0 @@-package com.gitplex.server.web.util.mapper;--import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Request;-import org.apache.wicket.request.component.IRequestablePage;--public class DepotMapper extends WebPageMapper {-- public DepotMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {- super(mountPath, pageClass);- }-- @Override- public IRequestHandler mapRequest(Request request) {- if (MapperUtils.getDepotSegments(request.getUrl()) > 2)- return super.mapRequest(request);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.javadeleted file mode 100644index 2e7e0849a8..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.java+++ /dev/null@@ -1,21 +0,0 @@-package com.gitplex.server.web.util.mapper;--import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Request;-import org.apache.wicket.request.resource.ResourceReference;--public class DepotResourceMapper extends WebResourceMapper {-- public DepotResourceMapper(String path, ResourceReference resourceReference) {- super(path, resourceReference);- }-- @Override- public IRequestHandler mapRequest(Request request) {- if (MapperUtils.getDepotSegments(request.getUrl()) > 2)- return super.mapRequest(request);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.java b/web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.javadeleted file mode 100644index 11e164312b..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.java+++ /dev/null@@ -1,52 +0,0 @@-package com.gitplex.server.web.util.mapper;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.request.Url;--import com.gitplex.server.util.StringUtils;-import com.gitplex.server.util.validation.AccountNameValidator;-import com.gitplex.server.util.validation.DepotNameValidator;--public class MapperUtils {-- public static List<String> normalize(List<String> urlSegments) {- List<String> normalized = new ArrayList<String>();- for (String each: urlSegments) {- each = StringUtils.remove(each, '/');- if (each.length() != 0)- normalized.add(each);- }- return normalized;- }-- public static int getAccountSegments(Url url) {- List<String> urlSegments = normalize(url.getSegments());- if (urlSegments.size() < 1)- return 0;- String accountName = urlSegments.get(0);-- if (AccountNameValidator.getReservedNames().contains(accountName))- return 0;- else- return urlSegments.size();- }-- public static int getDepotSegments(Url url) {- List<String> urlSegments = normalize(url.getSegments());- if (urlSegments.size() < 2)- return 0;-- String accountName = urlSegments.get(0);- if (AccountNameValidator.getReservedNames().contains(accountName))- return 0;-- String depotName = urlSegments.get(1);- if (DepotNameValidator.getReservedNames().contains(depotName))- return 0;- else- return urlSegments.size();- }--}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.javadeleted file mode 100644index fe9b61e7ec..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java+++ /dev/null@@ -1,47 +0,0 @@-package com.gitplex.server.web.util.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.model.LoadableDetachableModel;--import com.gitplex.server.GitPlex;-import com.gitplex.server.model.Depot;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.security.SecurityUtils;--@SuppressWarnings("serial")-public class AffinalDepotsModel extends LoadableDetachableModel<Collection<Depot>> {-- private final Long repoId;-- public AffinalDepotsModel(Long repoId) {- this.repoId = repoId;- }-- @Override- protected Collection<Depot> load() {- Depot depot = GitPlex.getInstance(Dao.class).load(Depot.class, repoId);;- List<Depot> affinals = new ArrayList<>(depot.getForkDescendants());- affinals.remove(depot);- if (depot.getForkedFrom() != null)- affinals.remove(depot.getForkedFrom());- affinals.sort((repo1, repo2) -> {- if (repo1.getAccount().equals(repo2.getAccount()))- return repo1.getName().compareTo(repo2.getName());- else- return repo1.getAccount().getName().compareTo(repo2.getAccount().getName());- });- if (depot.getForkedFrom() != null)- affinals.add(0, depot.getForkedFrom());- affinals.add(0, depot);- for (Iterator<Depot> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canRead(it.next()))- it.remove();- }- return affinals;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/util/model/AffinalProjectsModel.java b/web/src/main/java/com/gitplex/server/web/util/model/AffinalProjectsModel.javanew file mode 100644index 0000000000..15497deea4--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/model/AffinalProjectsModel.java@@ -0,0 +1,44 @@+package com.gitplex.server.web.util.model;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.model.LoadableDetachableModel;++import com.gitplex.server.GitPlex;+import com.gitplex.server.model.Project;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.security.SecurityUtils;++@SuppressWarnings("serial")+public class AffinalProjectsModel extends LoadableDetachableModel<Collection<Project>> {++ private final Long repoId;++ public AffinalProjectsModel(Long repoId) {+ this.repoId = repoId;+ }++ @Override+ protected Collection<Project> load() {+ Project project = GitPlex.getInstance(Dao.class).load(Project.class, repoId);;+ List<Project> affinals = new ArrayList<>(project.getForkDescendants());+ affinals.remove(project);+ if (project.getForkedFrom() != null)+ affinals.remove(project.getForkedFrom());+ affinals.sort((repo1, repo2) -> {+ return repo1.getName().compareTo(repo2.getName());+ });+ if (project.getForkedFrom() != null)+ affinals.add(0, project.getForkedFrom());+ affinals.add(0, project);+ for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {+ if (!SecurityUtils.canRead(it.next()))+ it.remove();+ }+ return affinals;+ }++}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 d6a5d308a4..2adeea6fc8 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@@ -11,24 +11,24 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.git.RefInfo;-import com.gitplex.server.model.Depot;+import com.gitplex.server.model.Project;public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {private static final long serialVersionUID = 1L;- private final IModel<Depot> depotModel;+ private final IModel<Project> projectModel;- public CommitRefsModel(IModel<Depot> depotModel) {- this.depotModel = depotModel;+ public CommitRefsModel(IModel<Project> projectModel) {+ this.projectModel = projectModel;}@Overrideprotected Map<String, List<String>> load() {- Depot depot = depotModel.getObject();+ Project project = projectModel.getObject();Map<String, List<String>> labels = new HashMap<>();- List<RefInfo> refInfos = depot.getBranches();- refInfos.addAll(depot.getTags());+ List<RefInfo> refInfos = project.getBranches();+ refInfos.addAll(project.getTags());for (RefInfo refInfo: refInfos) {if (refInfo.getPeeledObj() instanceof RevCommit) {RevCommit commit = (RevCommit) refInfo.getPeeledObj();@@ -45,7 +45,7 @@ public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<St@Overrideprotected void onDetach() {- depotModel.detach();+ projectModel.detach();super.onDetach();}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.javadeleted file mode 100644index 0cef3cec4b..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.util.model;--import com.gitplex.server.model.Depot;--/** Shortcut for {@link EntityModel}<Repository> */-public class DepotModel extends EntityModel<Depot> {- private static final long serialVersionUID = 1L;-- public DepotModel(Depot entity) {- super(entity);- }--}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.javadeleted file mode 100644index 36eb3472c9..0000000000--- a/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.util.model;--import com.gitplex.server.model.Account;--public class UserModel extends EntityModel<Account> {-- private static final long serialVersionUID = 1L;-- public UserModel(Account entity) {- super(entity);- }--}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 8b97ca85ec..7097e49cb1 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.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;@@ -29,9 +29,7 @@ public class ArchiveResource extends AbstractResource {private static final long serialVersionUID = 1L;- private static final String PARAM_ACCOUNT = "account";-- private static final String PARAM_DEPOT = "depot";+ private static final String PARAM_DEPOT = "project";private static final String PARAM_REVISION = "revision";@@ -45,21 +43,17 @@ public class ArchiveResource extends AbstractResource {protected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- String userName = params.get(PARAM_ACCOUNT).toString();- if (StringUtils.isBlank(userName))- throw new IllegalArgumentException("account name has to be specified");-String repoName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());if (StringUtils.isBlank(repoName))- throw new IllegalArgumentException("repository name has to be specified");+ throw new IllegalArgumentException("project name has to be specified");if (repoName.endsWith(Constants.DOT_GIT_EXT))repoName = repoName.substring(0, repoName.length() - Constants.DOT_GIT_EXT.length());- Depot depot = GitPlex.getInstance(DepotManager.class).find(userName, repoName);+ Project project = GitPlex.getInstance(ProjectManager.class).find(repoName);- if (depot == null)- throw new EntityNotFoundException("Unable to find repository " + userName + "/" + repoName);+ if (project == null)+ throw new EntityNotFoundException("Unable to find project " + repoName);String revision = params.get(PARAM_REVISION).toString();if (StringUtils.isBlank(revision))@@ -70,7 +64,7 @@ public class ArchiveResource extends AbstractResource {throw new IllegalArgumentException("format parameter should be specified either zip or tar.gz");}- if (!SecurityUtils.canRead(depot))+ if (!SecurityUtils.canRead(project))throw new UnauthorizedException();ResourceResponse response = new ResourceResponse();@@ -97,9 +91,9 @@ public class ArchiveResource extends AbstractResource {elseArchiveCommand.registerFormat(format, new TgzFormat());try {- ArchiveCommand archive = Git.wrap(depot.getRepository()).archive();+ ArchiveCommand archive = Git.wrap(project.getRepository()).archive();archive.setFormat(format);- archive.setTree(depot.getRevCommit(revision).getId());+ archive.setTree(project.getRevCommit(revision).getId());archive.setOutputStream(attributes.getResponse().getOutputStream());archive.call();} catch (GitAPIException e) {@@ -113,10 +107,9 @@ public class ArchiveResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Depot depot, String revision, String format) {+ public static PageParameters paramsOf(Project project, String revision, String format) {PageParameters params = new PageParameters();- params.add(PARAM_ACCOUNT, depot.getAccount().getName());- params.set(PARAM_DEPOT, depot.getName());+ params.set(PARAM_DEPOT, project.getName());params.set(PARAM_REVISION, revision);params.set(PARAM_FORMAT, format);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 13e6e324f9..3b50b75a38 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@@ -19,8 +19,8 @@ import org.eclipse.jgit.lib.Constants;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.AttachmentManager;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.model.Depot;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;@@ -29,9 +29,7 @@ public class AttachmentResource extends AbstractResource {private static final long serialVersionUID = 1L;- private static final String PARAM_ACCOUNT = "account";-- private static final String PARAM_DEPOT = "depot";+ private static final String PARAM_DEPOT = "project";private static final String PARAM_UUID = "uuid";@@ -41,23 +39,19 @@ public class AttachmentResource extends AbstractResource {protected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- String userName = params.get(PARAM_ACCOUNT).toString();- if (StringUtils.isBlank(userName))- throw new IllegalArgumentException("account name has to be specified");-String repoName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());if (StringUtils.isBlank(repoName))- throw new IllegalArgumentException("repository name has to be specified");+ throw new IllegalArgumentException("project name has to be specified");if (repoName.endsWith(Constants.DOT_GIT_EXT))repoName = repoName.substring(0, repoName.length() - Constants.DOT_GIT_EXT.length());- Depot depot = GitPlex.getInstance(DepotManager.class).find(userName, repoName);+ Project project = GitPlex.getInstance(ProjectManager.class).find(repoName);- if (depot == null)- throw new EntityNotFoundException("Unable to find repository " + userName + "/" + repoName);+ if (project == null)+ throw new EntityNotFoundException("Unable to find project " + repoName);- if (!SecurityUtils.canRead(depot))+ if (!SecurityUtils.canRead(project))throw new UnauthorizedException();String storage = params.get(PARAM_UUID).toString();@@ -68,7 +62,7 @@ public class AttachmentResource extends AbstractResource {if (StringUtils.isBlank(attachment))throw new IllegalArgumentException("attachment parameter has to be specified");- File attachmentFile = new File(getAttachmentDir(depot, storage), attachment);+ File attachmentFile = new File(getAttachmentDir(project, storage), attachment);ResourceResponse response = new ResourceResponse();response.setContentLength(attachmentFile.length());@@ -97,17 +91,16 @@ public class AttachmentResource extends AbstractResource {return response;}- private static File getAttachmentDir(Depot depot, String uuid) {- return GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(depot, uuid);+ private static File getAttachmentDir(Project project, String uuid) {+ return GitPlex.getInstance(AttachmentManager.class).getAttachmentDir(project, uuid);}- public static PageParameters paramsOf(Depot depot, String attachmentDirUUID, String attachmentName) {+ public static PageParameters paramsOf(Project project, String attachmentDirUUID, String attachmentName) {PageParameters params = new PageParameters();- params.add(PARAM_ACCOUNT, depot.getAccount().getName());- params.set(PARAM_DEPOT, depot.getName());+ params.set(PARAM_DEPOT, project.getName());params.set(PARAM_UUID, attachmentDirUUID);params.set(PARAM_ATTACHMENT, attachmentName);- final File attachmentFile = new File(getAttachmentDir(depot, attachmentDirUUID), attachmentName);+ final File attachmentFile = new File(getAttachmentDir(project, attachmentDirUUID), attachmentName);params.set("v", attachmentFile.lastModified());return params;diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.javaindex 3cff77694e..16849616f8 100644--- a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java+++ b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java@@ -21,8 +21,8 @@ import com.gitplex.server.GitPlex;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.manager.ProjectManager;+import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;@@ -31,9 +31,7 @@ public class RawBlobResource extends AbstractResource {private static final long serialVersionUID = 1L;- private static final String PARAM_ACCOUNT = "account";-- private static final String PARAM_DEPOT = "depot";+ private static final String PARAM_DEPOT = "project";private static final String PARAM_REVISION = "revision";@@ -43,21 +41,17 @@ public class RawBlobResource extends AbstractResource {protected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- String userName = params.get(PARAM_ACCOUNT).toString();- if (StringUtils.isBlank(userName))- throw new IllegalArgumentException("account name has to be specified");-- String depotName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());- if (StringUtils.isBlank(depotName))- throw new IllegalArgumentException("repository name has to be specified");+ String projectName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());+ if (StringUtils.isBlank(projectName))+ throw new IllegalArgumentException("project name has to be specified");- if (depotName.endsWith(Constants.DOT_GIT_EXT))- depotName = depotName.substring(0, depotName.length() - Constants.DOT_GIT_EXT.length());+ if (projectName.endsWith(Constants.DOT_GIT_EXT))+ projectName = projectName.substring(0, projectName.length() - Constants.DOT_GIT_EXT.length());- Depot depot = GitPlex.getInstance(DepotManager.class).find(userName, depotName);+ Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);- if (depot == null)- throw new EntityNotFoundException("Unable to find repository " + userName + "/" + depotName);+ if (project == null)+ throw new EntityNotFoundException("Unable to find project " + projectName);List<String> revisionAndPathSegments = new ArrayList<>();String segment = params.get(PARAM_REVISION).toString();@@ -73,17 +67,17 @@ public class RawBlobResource extends AbstractResource {revisionAndPathSegments.add(segment);}- BlobIdent blobIdent = new BlobIdent(depot, revisionAndPathSegments);+ BlobIdent blobIdent = new BlobIdent(project, revisionAndPathSegments);String revision = blobIdent.revision;String path = blobIdent.path;if (StringUtils.isBlank(path))throw new IllegalArgumentException("path parameter has to be specified");- if (!SecurityUtils.canRead(depot))+ if (!SecurityUtils.canRead(project))throw new UnauthorizedException();- final Blob blob = depot.getBlob(new BlobIdent(revision, path, 0));+ final Blob blob = project.getBlob(new BlobIdent(revision, path, 0));ResourceResponse response = new ResourceResponse();response.setContentLength(blob.getSize());@@ -106,7 +100,7 @@ public class RawBlobResource extends AbstractResource {@Overridepublic void writeData(Attributes attributes) throws IOException {if (blob.isPartial()) {- try (InputStream is = depot.getInputStream(blob.getIdent());) {+ try (InputStream is = project.getInputStream(blob.getIdent());) {IOUtils.copy(is, attributes.getResponse().getOutputStream());}} else {@@ -119,10 +113,9 @@ public class RawBlobResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Depot depot, BlobIdent blobIdent) {+ public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {PageParameters params = new PageParameters();- params.add(PARAM_ACCOUNT, depot.getAccount().getName());- params.set(PARAM_DEPOT, depot.getName());+ params.set(PARAM_DEPOT, project.getName());params.set(PARAM_REVISION, blobIdent.revision);params.set(PARAM_PATH, blobIdent.path);diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.javaindex a09dc6fc4b..6b1589b84d 100644--- a/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.java+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.java@@ -23,7 +23,7 @@ public class ServerLogResource extends AbstractResource {@Overrideprotected ResourceResponse newResourceResponse(Attributes attributes) {- if (!SecurityUtils.canManageSystem())+ if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();ResourceResponse response = new ResourceResponse();