The Unified and Autonomous Development Platform
Rename gitplex as gitplex.server
robin shined33826669b2c
diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/EntityLocator.java b/gitplex.core/src/main/java/com/gitplex/core/entity/EntityLocator.javadeleted file mode 100644index 21283f2be7..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/entity/EntityLocator.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.core.entity;--public class EntityLocator {--}diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarted.java b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarted.javadeleted file mode 100644index efcb8bf911..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarted.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.core.event.lifecycle;--public class SystemStarted {--}diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarting.java b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarting.javadeleted file mode 100644index f7d1cdd0ee..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarting.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.core.event.lifecycle;--public class SystemStarting {--}diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopped.java b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopped.javadeleted file mode 100644index a0c8eb5aba..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopped.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.core.event.lifecycle;--public class SystemStopped {--}diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopping.java b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopping.javadeleted file mode 100644index 0da9beb0d3..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopping.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.core.event.lifecycle;--public class SystemStopping {--}diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/AccountBelonging.java b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/AccountBelonging.javadeleted file mode 100644index 4480e8e2ec..0000000000--- a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/AccountBelonging.java+++ /dev/null@@ -1,7 +0,0 @@-package com.gitplex.core.security.protectedobject;--import com.gitplex.core.entity.Account;--public interface AccountBelonging extends ProtectedObject {- Account getAccount();-}diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/resource/ResourceLocator.java b/gitplex.rest/src/main/java/com/gitplex/rest/resource/ResourceLocator.javadeleted file mode 100644index 8685e88672..0000000000--- a/gitplex.rest/src/main/java/com/gitplex/rest/resource/ResourceLocator.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.rest.resource;--public class ResourceLocator {--}diff --git a/gitplex.web/src/main/java/com/gitplex/web/assets/Assets.java b/gitplex.web/src/main/java/com/gitplex/web/assets/Assets.javadeleted file mode 100644index d12a4bbb04..0000000000--- a/gitplex.web/src/main/java/com/gitplex/web/assets/Assets.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.web.assets;--public class Assets {--}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.javadeleted file mode 100644index 3a0bb48e2c..0000000000--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.web.component.depotfile.blobview.gitlink;--import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;--public class GitLinkRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- if (context.getBlobIdent().isGitLink())- return new GitLinkPanel(panelId, context);- else- return null;- }--}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.javadeleted file mode 100644index 021079a9ee..0000000000--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.web.component.depotfile.blobview.symbollink;--import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;--public class SymbolLinkRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- if (context.getBlobIdent().isSymbolLink())- return new SymbolLinkPanel(panelId, context);- else- return null;- }--}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/DiffViewMode.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/DiffViewMode.javadeleted file mode 100644index c4170cfa8a..0000000000--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/DiffViewMode.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.web.component.diff.revision;--public enum DiffViewMode {- UNIFIED, SPLIT-}diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/EditSupportLocator.java b/gitplex.web/src/main/java/com/gitplex/web/editable/EditSupportLocator.javadeleted file mode 100644index a63bda239f..0000000000--- a/gitplex.web/src/main/java/com/gitplex/web/editable/EditSupportLocator.java+++ /dev/null@@ -1,5 +0,0 @@-package com.gitplex.web.editable;--public class EditSupportLocator {--}diff --git a/server.all/pom.xml b/server.all/pom.xmlnew file mode 100644index 0000000000..7a7a5507b8--- /dev/null+++ b/server.all/pom.xml@@ -0,0 +1,37 @@+<?xml version="1.0" encoding="UTF-8"?>++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.all</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>parent.general</artifactId>+ <version>1.0-SNAPSHOT</version>+ </parent>+ <packaging>pom</packaging>+ <modules>+ <module>../server.core</module>+ <module>../server.web</module>+ <module>../server.rest</module>+ <module>../server.http</module>+ <module>../server.product</module>+ <module>../server.search</module>+ </modules>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.gitplex.com/</url>+ </repository>+ </repositories>+</project>diff --git a/gitplex.core/.gitignore b/server.core/.gitignoresimilarity index 100%rename from gitplex.core/.gitignorerename to server.core/.gitignorediff --git a/gitplex.core/pom.xml b/server.core/pom.xmlsimilarity index 97%rename from gitplex.core/pom.xmlrename to server.core/pom.xmlindex a9851716dd..0eae47e46d 100644--- a/gitplex.core/pom.xml+++ b/server.core/pom.xml@@ -2,7 +2,7 @@<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><parent><groupId>com.gitplex</groupId><artifactId>parent.general</artifactId>@@ -112,7 +112,7 @@</repository></repositories><properties>- <moduleClass>com.gitplex.core.CoreModule</moduleClass>+ <moduleClass>com.server.core.CoreModule</moduleClass></properties><version>1.0.38</version></project>diff --git a/gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.java b/server.core/src/main/java/com/gitplex/server/core/CoreEntityValidator.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.javarename to server.core/src/main/java/com/gitplex/server/core/CoreEntityValidator.javaindex 6cf1504027..d0e07eeed1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.java+++ b/server.core/src/main/java/com/gitplex/server/core/CoreEntityValidator.java@@ -1,4 +1,4 @@-package com.gitplex.core;+package com.gitplex.server.core;import java.util.Set;@@ -7,9 +7,9 @@ import javax.inject.Singleton;import javax.validation.ConstraintViolation;import javax.validation.Validator;-import com.gitplex.core.entity.Account;import com.gitplex.commons.hibernate.AbstractEntity;import com.gitplex.commons.hibernate.DefaultEntityValidator;+import com.gitplex.server.core.entity.Account;@Singletonpublic class CoreEntityValidator extends DefaultEntityValidator {diff --git a/gitplex.core/src/main/java/com/gitplex/core/CoreModule.java b/server.core/src/main/java/com/gitplex/server/core/CoreModule.javasimilarity index 54%rename from gitplex.core/src/main/java/com/gitplex/core/CoreModule.javarename to server.core/src/main/java/com/gitplex/server/core/CoreModule.javaindex 6aa6cae3ba..a7daf95509 100644--- a/gitplex.core/src/main/java/com/gitplex/core/CoreModule.java+++ b/server.core/src/main/java/com/gitplex/server/core/CoreModule.java@@ -1,4 +1,4 @@-package com.gitplex.core;+package com.gitplex.server.core;import java.util.Collection;import java.util.HashSet;@@ -6,81 +6,6 @@ import java.util.Set;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;-import com.gitplex.core.commitmessagetransform.CommitMessageTransformer;-import com.gitplex.core.commitmessagetransform.PatternCommitMessageTransformer;-import com.gitplex.core.entity.EntityLocator;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.AttachmentManager;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.BranchWatchManager;-import com.gitplex.core.manager.CodeCommentInfoManager;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CodeCommentRelationManager;-import com.gitplex.core.manager.CodeCommentReplyManager;-import com.gitplex.core.manager.CodeCommentStatusChangeManager;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.DataManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.core.manager.PullRequestInfoManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestReferenceManager;-import com.gitplex.core.manager.PullRequestReviewInvitationManager;-import com.gitplex.core.manager.PullRequestReviewManager;-import com.gitplex.core.manager.PullRequestStatusChangeManager;-import com.gitplex.core.manager.PullRequestTaskManager;-import com.gitplex.core.manager.PullRequestUpdateManager;-import com.gitplex.core.manager.PullRequestVerificationManager;-import com.gitplex.core.manager.PullRequestWatchManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.manager.WorkExecutor;-import com.gitplex.core.manager.impl.DefaultAccountManager;-import com.gitplex.core.manager.impl.DefaultAttachmentManager;-import com.gitplex.core.manager.impl.DefaultBatchWorkManager;-import com.gitplex.core.manager.impl.DefaultBranchWatchManager;-import com.gitplex.core.manager.impl.DefaultCodeCommentInfoManager;-import com.gitplex.core.manager.impl.DefaultCodeCommentManager;-import com.gitplex.core.manager.impl.DefaultCodeCommentRelationManager;-import com.gitplex.core.manager.impl.DefaultCodeCommentReplyManager;-import com.gitplex.core.manager.impl.DefaultCodeCommentStatusChangeManager;-import com.gitplex.core.manager.impl.DefaultCommitInfoManager;-import com.gitplex.core.manager.impl.DefaultConfigManager;-import com.gitplex.core.manager.impl.DefaultDataManager;-import com.gitplex.core.manager.impl.DefaultDepotManager;-import com.gitplex.core.manager.impl.DefaultMailManager;-import com.gitplex.core.manager.impl.DefaultOrganizationMembershipManager;-import com.gitplex.core.manager.impl.DefaultPullRequestCommentManager;-import com.gitplex.core.manager.impl.DefaultPullRequestInfoManager;-import com.gitplex.core.manager.impl.DefaultPullRequestManager;-import com.gitplex.core.manager.impl.DefaultPullRequestReferenceManager;-import com.gitplex.core.manager.impl.DefaultPullRequestReviewInvitationManager;-import com.gitplex.core.manager.impl.DefaultPullRequestReviewManager;-import com.gitplex.core.manager.impl.DefaultPullRequestStatusChangeManager;-import com.gitplex.core.manager.impl.DefaultPullRequestTaskManager;-import com.gitplex.core.manager.impl.DefaultPullRequestUpdateManager;-import com.gitplex.core.manager.impl.DefaultPullRequestVerificationManager;-import com.gitplex.core.manager.impl.DefaultPullRequestWatchManager;-import com.gitplex.core.manager.impl.DefaultStorageManager;-import com.gitplex.core.manager.impl.DefaultTeamAuthorizationManager;-import com.gitplex.core.manager.impl.DefaultTeamManager;-import com.gitplex.core.manager.impl.DefaultTeamMembershipManager;-import com.gitplex.core.manager.impl.DefaultUserAuthorizationManager;-import com.gitplex.core.manager.impl.DefaultVisitInfoManager;-import com.gitplex.core.manager.impl.DefaultWorkExecutor;-import com.gitplex.core.migration.DatabaseMigrator;-import com.gitplex.core.security.SecurityRealm;-import com.gitplex.core.setting.SpecifiedGit;-import com.gitplex.core.setting.SystemGit;-import com.gitplex.core.util.validation.AccountNameReservation;-import com.gitplex.core.util.validation.DepotNameReservation;import com.google.common.collect.Sets;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.git.GitConfig;@@ -96,6 +21,81 @@ import com.gitplex.commons.loader.AbstractPluginModule;import com.gitplex.commons.loader.ImplementationProvider;import com.gitplex.commons.shiro.AbstractRealm;import com.gitplex.commons.util.ClassUtils;+import com.gitplex.server.core.commitmessagetransform.CommitMessageTransformer;+import com.gitplex.server.core.commitmessagetransform.PatternCommitMessageTransformer;+import com.gitplex.server.core.entity.EntityLocator;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.AttachmentManager;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.BranchWatchManager;+import com.gitplex.server.core.manager.CodeCommentInfoManager;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CodeCommentRelationManager;+import com.gitplex.server.core.manager.CodeCommentReplyManager;+import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.DataManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.core.manager.PullRequestInfoManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestReferenceManager;+import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.core.manager.PullRequestReviewManager;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;+import com.gitplex.server.core.manager.PullRequestTaskManager;+import com.gitplex.server.core.manager.PullRequestUpdateManager;+import com.gitplex.server.core.manager.PullRequestVerificationManager;+import com.gitplex.server.core.manager.PullRequestWatchManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.manager.WorkExecutor;+import com.gitplex.server.core.manager.impl.DefaultAccountManager;+import com.gitplex.server.core.manager.impl.DefaultAttachmentManager;+import com.gitplex.server.core.manager.impl.DefaultBatchWorkManager;+import com.gitplex.server.core.manager.impl.DefaultBranchWatchManager;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentInfoManager;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentManager;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentRelationManager;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentReplyManager;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentStatusChangeManager;+import com.gitplex.server.core.manager.impl.DefaultCommitInfoManager;+import com.gitplex.server.core.manager.impl.DefaultConfigManager;+import com.gitplex.server.core.manager.impl.DefaultDataManager;+import com.gitplex.server.core.manager.impl.DefaultDepotManager;+import com.gitplex.server.core.manager.impl.DefaultMailManager;+import com.gitplex.server.core.manager.impl.DefaultOrganizationMembershipManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestCommentManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestInfoManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestReferenceManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestReviewInvitationManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestReviewManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestStatusChangeManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestTaskManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestUpdateManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestVerificationManager;+import com.gitplex.server.core.manager.impl.DefaultPullRequestWatchManager;+import com.gitplex.server.core.manager.impl.DefaultStorageManager;+import com.gitplex.server.core.manager.impl.DefaultTeamAuthorizationManager;+import com.gitplex.server.core.manager.impl.DefaultTeamManager;+import com.gitplex.server.core.manager.impl.DefaultTeamMembershipManager;+import com.gitplex.server.core.manager.impl.DefaultUserAuthorizationManager;+import com.gitplex.server.core.manager.impl.DefaultVisitInfoManager;+import com.gitplex.server.core.manager.impl.DefaultWorkExecutor;+import com.gitplex.server.core.migration.DatabaseMigrator;+import com.gitplex.server.core.security.SecurityRealm;+import com.gitplex.server.core.setting.SpecifiedGit;+import com.gitplex.server.core.setting.SystemGit;+import com.gitplex.server.core.util.validation.AccountNameReservation;+import com.gitplex.server.core.util.validation.DepotNameReservation;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.diff --git a/gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.java b/server.core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.javarename to server.core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.javaindex 677fca59b0..c5de5604b5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.java+++ b/server.core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.java@@ -1,4 +1,4 @@-package com.gitplex.core;+package com.gitplex.server.core;import javax.inject.Inject;import javax.inject.Singleton;@@ -6,9 +6,9 @@ import javax.inject.Singleton;import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletHolder;-import com.gitplex.core.hookcallback.GitPostReceiveCallback;-import com.gitplex.core.hookcallback.GitPreReceiveCallback;import com.gitplex.commons.jetty.ServletConfigurator;+import com.gitplex.server.core.hookcallback.GitPostReceiveCallback;+import com.gitplex.server.core.hookcallback.GitPreReceiveCallback;@Singletonpublic class CoreServletConfigurator implements ServletConfigurator {diff --git a/gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.java b/server.core/src/main/java/com/gitplex/server/core/GitConfigProvider.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.javarename to server.core/src/main/java/com/gitplex/server/core/GitConfigProvider.javaindex 32cdd780ea..ac12c6d0c5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.java+++ b/server.core/src/main/java/com/gitplex/server/core/GitConfigProvider.java@@ -1,11 +1,11 @@-package com.gitplex.core;+package com.gitplex.server.core;import javax.inject.Inject;import javax.inject.Provider;import javax.inject.Singleton;-import com.gitplex.core.manager.ConfigManager;import com.gitplex.commons.git.GitConfig;+import com.gitplex.server.core.manager.ConfigManager;@Singletonpublic class GitConfigProvider implements Provider<GitConfig> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/GitPlex.java b/server.core/src/main/java/com/gitplex/server/core/GitPlex.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/GitPlex.javarename to server.core/src/main/java/com/gitplex/server/core/GitPlex.javaindex fd3ab4d250..fd13fbd712 100644--- a/gitplex.core/src/main/java/com/gitplex/core/GitPlex.java+++ b/server.core/src/main/java/com/gitplex/server/core/GitPlex.java@@ -1,4 +1,4 @@-package com.gitplex.core;+package com.gitplex.server.core;import java.io.ObjectStreamException;import java.io.Serializable;@@ -15,14 +15,6 @@ import org.apache.shiro.util.ThreadContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.event.lifecycle.SystemStarted;-import com.gitplex.core.event.lifecycle.SystemStarting;-import com.gitplex.core.event.lifecycle.SystemStopped;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.DataManager;-import com.gitplex.core.setting.ServerConfig;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.loader.AbstractPlugin;import com.gitplex.commons.loader.AppLoader;@@ -30,6 +22,14 @@ import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.loader.ManagedSerializedForm;import com.gitplex.commons.util.init.InitStage;import com.gitplex.commons.util.init.ManualConfig;+import com.gitplex.server.core.event.lifecycle.SystemStarted;+import com.gitplex.server.core.event.lifecycle.SystemStarting;+import com.gitplex.server.core.event.lifecycle.SystemStopped;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.DataManager;+import com.gitplex.server.core.setting.ServerConfig;public class GitPlex extends AbstractPlugin implements Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.java b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.javarename to server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.javaindex b4c384d560..b776a223fc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.java+++ b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java@@ -1,4 +1,4 @@-package com.gitplex.core;+package com.gitplex.server.core;import java.util.Set;@@ -11,8 +11,6 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.hibernate.DefaultPersistManager;import com.gitplex.commons.hibernate.EntityValidator;@@ -21,6 +19,8 @@ import com.gitplex.commons.hibernate.IdManager;import com.gitplex.commons.hibernate.ModelProvider;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.migration.Migrator;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;@Singletonpublic class ResetAdminPasswordCommand extends DefaultPersistManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.java b/server.core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.javaindex 56d9dc7f1c..b96fb463d2 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.java b/server.core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.javaindex d00cb15090..9cb3a6bae5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.java b/server.core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.javaindex cf6808d7c2..fa7f0fe21a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.java b/server.core/src/main/java/com/gitplex/server/core/annotation/FileChoice.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/FileChoice.javaindex 8486f2cf41..a3627aebb0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/FileChoice.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.java b/server.core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.javaindex 6b46a00396..18cf2e7c98 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.java b/server.core/src/main/java/com/gitplex/server/core/annotation/PathMatch.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/PathMatch.javaindex 7554e35d98..c61ded8b3b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/PathMatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.java b/server.core/src/main/java/com/gitplex/server/core/annotation/RefMatch.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/RefMatch.javaindex 9acd6db899..1f79153a9e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/RefMatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.java b/server.core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.javarename to server.core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.javaindex 0ee2bc4409..90a84184c6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.java+++ b/server.core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.java@@ -1,4 +1,4 @@-package com.gitplex.core.annotation;+package com.gitplex.server.core.annotation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.java b/server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.javasimilarity index 63%rename from gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.javarename to server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.javaindex 81ed825e95..badb1ff271 100644--- a/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.java+++ b/server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.java@@ -1,7 +1,7 @@-package com.gitplex.core.commitmessagetransform;+package com.gitplex.server.core.commitmessagetransform;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.loader.ExtensionPoint;+import com.gitplex.server.core.entity.Depot;@ExtensionPointpublic interface CommitMessageTransformer {diff --git a/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java b/server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.javasimilarity index 71%rename from gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.javarename to server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.javaindex f1faf06e5d..7322dfb21a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java+++ b/server.core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.java@@ -1,9 +1,9 @@-package com.gitplex.core.commitmessagetransform;+package com.gitplex.server.core.commitmessagetransform;import javax.inject.Singleton;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.CommitMessageTransformSetting;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;@Singletonpublic class PatternCommitMessageTransformer implements CommitMessageTransformer {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/Account.java b/server.core/src/main/java/com/gitplex/server/core/entity/Account.javasimilarity index 95%rename from gitplex.core/src/main/java/com/gitplex/core/entity/Account.javarename to server.core/src/main/java/com/gitplex/server/core/entity/Account.javaindex d2f4edd166..37d40647c8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/Account.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/Account.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.ArrayList;import java.util.Collection;@@ -30,14 +30,14 @@ import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.ExcludeValues;import com.gitplex.commons.wicket.editable.annotation.Password;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.core.security.protectedobject.AccountBelonging;-import com.gitplex.core.security.protectedobject.ProtectedObject;-import com.gitplex.core.util.validation.AccountName;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.protectedobject.AccountBelonging;+import com.gitplex.server.core.security.protectedobject.ProtectedObject;+import com.gitplex.server.core.util.validation.AccountName;import com.google.common.base.Objects;import com.google.common.collect.Sets;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.java b/server.core/src/main/java/com/gitplex/server/core/entity/BranchWatch.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.javarename to server.core/src/main/java/com/gitplex/server/core/entity/BranchWatch.javaindex bd3cb6aa17..e728835f20 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/BranchWatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Column;import javax.persistence.Entity;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.java b/server.core/src/main/java/com/gitplex/server/core/entity/CodeComment.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.javarename to server.core/src/main/java/com/gitplex/server/core/entity/CodeComment.javaindex 2ef455e585..b6172b9fef 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/CodeComment.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.io.Serializable;import java.util.ArrayList;@@ -23,16 +23,16 @@ import javax.persistence.Version;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.LastEvent;-import com.gitplex.core.event.codecomment.CodeCommentEvent;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.hibernate.AbstractEntity;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.support.LastEvent;+import com.gitplex.server.core.event.codecomment.CodeCommentEvent;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.SecurityUtils;/** @DynamicUpdate annotation here along with various @OptimisticLock annotationsdiff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.java b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.javarename to server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.javaindex a9d035d83b..ee73804f9f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Entity;import javax.persistence.FetchType;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.java b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.javarename to server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.javaindex 790e895368..22ce016fcb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Column;import javax.persistence.Entity;@@ -8,7 +8,7 @@ import javax.persistence.Table;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.support.CodeCommentActivity;/** @DynamicUpdate annotation here along with various @OptimisticLock annotationsdiff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.java b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.javarename to server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.javaindex 6897575dde..3e11d5bbd9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Entity;import javax.persistence.Index;@@ -6,7 +6,7 @@ import javax.persistence.Table;import org.hibernate.annotations.DynamicUpdate;-import com.gitplex.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.support.CodeCommentActivity;@Entity@Table(indexes={@Index(columnList="g_comment_id"), @Index(columnList="g_user_id")})diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/Config.java b/server.core/src/main/java/com/gitplex/server/core/entity/Config.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/Config.javarename to server.core/src/main/java/com/gitplex/server/core/entity/Config.javaindex 29520d46a6..af400e5d4e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/Config.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/Config.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/Depot.java b/server.core/src/main/java/com/gitplex/server/core/entity/Depot.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/entity/Depot.javarename to server.core/src/main/java/com/gitplex/server/core/entity/Depot.javaindex ae29272fc4..25b16ea5b1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/Depot.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/Depot.java@@ -1,985 +1,985 @@-package com.gitplex.core.entity;--import java.io.File;-import java.io.IOException;-import java.io.InputStream;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.UUID;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.stream.Collectors;--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.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;-import javax.validation.constraints.NotNull;--import org.apache.commons.lang3.SerializationUtils;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.eclipse.jgit.api.CreateBranchCommand;-import org.eclipse.jgit.api.Git;-import org.eclipse.jgit.api.TagCommand;-import org.eclipse.jgit.api.errors.GitAPIException;-import org.eclipse.jgit.diff.DiffEntry;-import org.eclipse.jgit.diff.DiffFormatter;-import org.eclipse.jgit.diff.RawTextComparator;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectLoader;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.Ref;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevTree;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.util.io.NullOutputStream;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.annotations.DynamicUpdate;-import org.hibernate.validator.constraints.NotEmpty;--import com.gitplex.commons.git.Blob;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.RefInfo;-import com.gitplex.commons.git.Submodule;-import com.gitplex.commons.git.exception.GitObjectNotFoundException;-import com.gitplex.commons.git.exception.NotGitFileException;-import com.gitplex.commons.hibernate.AbstractEntity;-import com.gitplex.commons.hibernate.UnitOfWork;-import com.gitplex.commons.loader.AppLoader;-import com.gitplex.commons.loader.ListenerRegistry;-import com.gitplex.commons.util.FileUtils;-import com.gitplex.commons.util.LockUtils;-import com.gitplex.commons.util.StringUtils;-import com.gitplex.commons.wicket.editable.annotation.Editable;-import com.gitplex.commons.wicket.editable.annotation.Markdown;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.support.CommitMessageTransformSetting;-import com.gitplex.core.entity.support.IntegrationPolicy;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.gatekeeper.AndGateKeeper;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.protectedobject.AccountBelonging;-import com.gitplex.core.security.protectedobject.ProtectedObject;-import com.gitplex.core.util.validation.DepotName;-import com.google.common.base.Objects;-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"})})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@DynamicUpdate-@Editable-public class Depot extends AbstractEntity implements AccountBelonging {-- private static final long serialVersionUID = 1L;-- public static final String FQN_SEPARATOR = "/";-- public static final String REF_FQN_SEPARATOR = ":";-- public static final String REFS_GITPLEX = "refs/gitplex/";-- private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;-- private static final int MAX_READ_BLOB_SIZE = 5*1024*1024;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Account account;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=true)- private Depot forkedFrom;-- @Column(nullable=false)- private String name;-- @Lob- @Column(length=65535)- private String description;-- private boolean publicRead;-- @Lob- @Column(length=65535, name="COMMIT_MSG_TRANSFORM")- private CommitMessageTransformSetting commitMessageTransformSetting;-- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- /*- * Optimistic lock is necessary to ensure database integrity when update- * gatekeepers and integration policies upon depot renaming/deletion- */- @Version- private long version;-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<GateKeeper> gateKeepers = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<IntegrationPolicy> integrationPolicies = new ArrayList<>();-- @Column(nullable=false)- private Date createdAt = new Date();-- @OneToMany(mappedBy="targetDepot", cascade=CascadeType.REMOVE)- private Collection<PullRequest> incomingRequests = new ArrayList<>();-- @OneToMany(mappedBy="sourceDepot")- private Collection<PullRequest> outgoingRequests = new ArrayList<>();-- @OneToMany(mappedBy="forkedFrom")- private Collection<Depot> forks = new ArrayList<>();-- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)- private Collection<TeamAuthorization> authorizedTeams = new ArrayList<>();-- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizedUsers = new ArrayList<>();-- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)- private Collection<CodeComment> comments = new ArrayList<>();-- private transient Repository repository;-- private transient Map<BlobIdent, Blob> blobCache;-- private transient Map<String, Optional<ObjectId>> objectIdCache;-- private transient Map<String, Optional<Ref>> refCache;-- private transient Optional<String> defaultBranch;-- @Override- public Account getAccount() {- return account;- }-- public void setAccount(Account account) {- this.account = account;- }-- @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 repository")- @Markdown- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-- @Editable(order=300, name="Public", description="Whether or not this repository can be read by everyone")- public boolean isPublicRead() {- return publicRead;- }-- public void setPublicRead(boolean publicRead) {- this.publicRead = publicRead;- }-- @Nullable- @Valid- public CommitMessageTransformSetting getCommitMessageTransformSetting() {- return commitMessageTransformSetting;- }-- public void setCommitMessageTransformSetting(CommitMessageTransformSetting commitMessageTransformSetting) {- this.commitMessageTransformSetting = commitMessageTransformSetting;- }-- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-- @NotNull- @Valid- public List<GateKeeper> getGateKeepers() {- return gateKeepers;- }-- public void setGateKeepers(ArrayList<GateKeeper> gateKeepers) {- this.gateKeepers = gateKeepers;- }-- @Valid- public List<IntegrationPolicy> getIntegrationPolicies() {- return integrationPolicies;- }-- public void setIntegrationPolicies(ArrayList<IntegrationPolicy> integrationPolicies) {- this.integrationPolicies = integrationPolicies;- }-- public Date getCreatedAt() {- return createdAt;- }-- public void setCreatedAt(Date createdAt) {- this.createdAt = createdAt;- }-- public Collection<PullRequest> getIncomingRequests() {- return incomingRequests;- }-- public void setIncomingRequests(Collection<PullRequest> incomingRequests) {- this.incomingRequests = incomingRequests;- }-- public Collection<PullRequest> getOutgoingRequests() {- return outgoingRequests;- }-- public void setOutgoingRequests(Collection<PullRequest> outgoingRequests) {- this.outgoingRequests = outgoingRequests;- }-- public Depot getForkedFrom() {- return forkedFrom;- }-- public void setForkedFrom(Depot forkedFrom) {- this.forkedFrom = forkedFrom;- }-- public Collection<Depot> getForks() {- return forks;- }-- public void setForks(Collection<Depot> forks) {- this.forks = forks;- }-- public List<RefInfo> getBranches() {- return getRefInfos(Constants.R_HEADS);- }-- public List<RefInfo> getTags() {- return getRefInfos(Constants.R_TAGS);- }-- public List<RefInfo> getRefInfos(String prefix) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- List<Ref> refs = new ArrayList<Ref>(getRepository().getRefDatabase().getRefs(prefix).values());- List<RefInfo> refInfos = refs.stream()- .map(ref->new RefInfo(revWalk, ref))- .filter(refInfo->refInfo.getPeeledObj() instanceof RevCommit)- .collect(Collectors.toList());- Collections.sort(refInfos);- Collections.reverse(refInfos);- return refInfos;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @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());- }-- public File getDirectory() {- return AppLoader.getInstance(StorageManager.class).getGitDir(this);- }-- /**- * Whether or not specified git represents a valid repository git. This can be used to tell- * apart a GitPlex repository git from some other Git repositories.- *- * @return- * <tt>true</tt> if valid; <tt>false</tt> otherwise- */- public boolean isValid() {- return isGitHookValid("pre-receive") && isGitHookValid("post-receive");- }-- public boolean isGitHookValid(String hookName) {- File hookFile = new File(getDirectory(), "hooks/" + hookName);- if (!hookFile.exists())- return false;-- try {- String content = FileUtils.readFileToString(hookFile);- if (!content.contains("GITPLEX_USER_ID"))- return false;- } catch (IOException e) {- throw new RuntimeException(e);- }-- if (!hookFile.canExecute())- return false;-- return true;- }-- public GateKeeper getGateKeeper() {- AndGateKeeper andGateKeeper = new AndGateKeeper();- for (GateKeeper each: getGateKeepers())- andGateKeeper.getGateKeepers().add(each);- return andGateKeeper;- }-- /**- * Find fork root of this repository.- *- * @return- * fork root of this repository, or <tt>null</tt> if the repository is not- * forked from any other repository- */- public @Nullable Depot findForkRoot() {- if (forkedFrom != null) {- Depot forkedRoot = forkedFrom.findForkRoot();- if (forkedRoot != null)- return forkedRoot;- else- return forkedFrom;- } else {- return null;- }- }-- /**- * Find all descendant repositories forking from current repository.- *- * @return- * all descendant repositories forking from current repository- */- public List<Depot> findForkDescendants() {- List<Depot> descendants = new ArrayList<>();- for (Depot fork: getForks()) {- if (fork.getDefaultBranch() != null)- descendants.add(fork);- descendants.addAll(fork.findForkDescendants());- }-- return descendants;- }-- /**- * Find all comparable repositories of current repository. Comparable repositories can- * be connected via forks, and can be compared/pulled.- *- * @return- * comparable repositories of current repository, with current repository also- * included in the collection- */- public Collection<Depot> findAffinals() {- Collection<Depot> affinals = new ArrayList<Depot>();- Depot forkRoot = findForkRoot();- if (forkRoot != null) {- affinals.add(forkRoot);- affinals.addAll(forkRoot.findForkDescendants());- } else {- affinals.add(this);- affinals.addAll(findForkDescendants());- }- return affinals;- }-- public Repository getRepository() {- if (repository == null) {- repository = GitPlex.getInstance(DepotManager.class).getRepository(this);- }- return repository;- }-- public String getUrl() {- return GitPlex.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/" + getFQN();- }-- @Nullable- public String getDefaultBranch() {- if (defaultBranch == null) {- try {- Ref headRef = getRepository().findRef("HEAD");- if (headRef.isSymbolic()- && headRef.getTarget().getName().startsWith(Constants.R_HEADS)- && headRef.getObjectId() != null) {- defaultBranch = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));- } else {- defaultBranch = Optional.absent();- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return defaultBranch.orNull();- }-- public void setDefaultBranch(String defaultBranchName) {- RefUpdate refUpdate = updateRef("HEAD");- GitUtils.linkRef(refUpdate, GitUtils.branch2ref(defaultBranchName));- defaultBranch = null;- }-- private Blob readBlob(ObjectLoader objectLoader, BlobIdent ident) {- long blobSize = objectLoader.getSize();- if (blobSize > MAX_READ_BLOB_SIZE) {- try (InputStream is = objectLoader.openStream()) {- byte[] bytes = new byte[MAX_READ_BLOB_SIZE];- is.read(bytes);- return new Blob(ident, bytes, blobSize);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- return new Blob(ident, objectLoader.getCachedBytes());- }- }-- private Map<BlobIdent, Blob> getBlobCache() {- if (blobCache == null) {- synchronized(this) {- if (blobCache == null)- blobCache = new ConcurrentHashMap<>();- }- }- return blobCache;- }-- /**- * Read blob content and cache result in repository in case the same blob- * content is requested again.- *- * We made this method thread-safe as we are using ForkJoinPool to calculate- * diffs of multiple blob changes concurrently, and this method will be- * accessed concurrently in that special case.- *- * @param blobIdent- * ident of the blob- * @return- * blob of specified blob ident- * @throws- * GitObjectNotFoundException if blob of specified ident can not be found in repository- *- */- public Blob getBlob(BlobIdent blobIdent) {- Preconditions.checkArgument(blobIdent.revision!=null && blobIdent.path!=null && blobIdent.mode!=null,- "Revision, path and mode of ident param should be specified");-- Blob blob = getBlobCache().get(blobIdent);- if (blob == null) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId revId = getObjectId(blobIdent.revision);- RevTree revTree = revWalk.parseCommit(revId).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getRepository(), blobIdent.path, revTree);- if (treeWalk != null) {- if (blobIdent.isGitLink()) {- String url = getSubmodules(blobIdent.revision).get(blobIdent.path);- if (url == null)- throw new GitObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");- String hash = treeWalk.getObjectId(0).name();- blob = new Blob(blobIdent, new Submodule(url, hash).toString().getBytes());- } else if (blobIdent.isTree()) {- throw new NotGitFileException("Path '" + blobIdent.path + "' is a tree");- } else {- ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));- blob = readBlob(objectLoader, blobIdent);- }- getBlobCache().put(blobIdent, blob);- } else {- throw new GitObjectNotFoundException("Unable to find blob path '" + blobIdent.path + "' in revision '" + blobIdent.revision + "'");- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return blob;- }-- public InputStream getInputStream(BlobIdent ident) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId commitId = getObjectId(ident.revision);- RevTree revTree = revWalk.parseCommit(commitId).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getRepository(), ident.path, revTree);- if (treeWalk != null) {- ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));- return objectLoader.openStream();- } else {- throw new GitObjectNotFoundException("Unable to find blob path '" + ident.path + "' in revision '" + ident.revision + "'");- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- /**- * Get cached object id of specified revision.- *- * @param revision- * revision to resolve object id for- * @param mustExist- * true to have the method throwing exception instead- * of returning null if the revision does not exist- * @return- * object id of specified revision, or <tt>null</tt> if revision- * does not exist and mustExist is specified as false- */- @Nullable- public ObjectId getObjectId(String revision, boolean mustExist) {- if (objectIdCache == null)- objectIdCache = new HashMap<>();-- Optional<ObjectId> optional = objectIdCache.get(revision);- if (optional == null) {- optional = Optional.fromNullable(GitUtils.resolve(getRepository(), revision));- objectIdCache.put(revision, optional);- }- if (mustExist && !optional.isPresent())- throw new GitObjectNotFoundException("Unable to find object '" + revision + "'");- return optional.orNull();- }-- public ObjectId getObjectId(String revision) {- return getObjectId(revision, true);- }-- public void cacheObjectId(String revision, @Nullable ObjectId objectId) {- if (objectIdCache == null)- objectIdCache = new HashMap<>();-- objectIdCache.put(revision, Optional.fromNullable(objectId));- }-- public List<DiffEntry> getDiffs(String oldRev, String newRev) {- List<DiffEntry> diffs = new ArrayList<>();- try (DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);) {- diffFormatter.setRepository(getRepository());- diffFormatter.setDetectRenames(true);- diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);- AnyObjectId oldRevId = getObjectId(oldRev);- AnyObjectId newRevId = getObjectId(newRev);- for (DiffEntry entry: diffFormatter.scan(oldRevId, newRevId)) {- if (!Objects.equal(entry.getOldPath(), entry.getNewPath())- || !Objects.equal(entry.getOldMode(), entry.getNewMode())- || entry.getOldId()==null || !entry.getOldId().isComplete()- || entry.getNewId()== null || !entry.getNewId().isComplete()- || !entry.getOldId().equals(entry.getNewId())) {- diffs.add(entry);- }- }- } catch (IOException e) {- throw new RuntimeException(e);- }- return diffs;- }-- public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {- if (path == null)- path = "";-- final File cacheDir = new File(- GitPlex.getInstance(StorageManager.class).getInfoDir(this),- "last_commits/" + path + "/gitplex_last_commits");-- final ReadWriteLock lock;- try {- lock = LockUtils.getReadWriteLock(cacheDir.getCanonicalPath());- } catch (IOException e) {- throw new RuntimeException(e);- }-- final Set<ObjectId> commitIds = new HashSet<>();-- lock.readLock().lock();- try {- if (cacheDir.exists()) {- for (String each: cacheDir.list())- commitIds.add(ObjectId.fromString(each));- }- } finally {- lock.readLock().unlock();- }-- org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache cache;- if (!commitIds.isEmpty()) {- cache = new org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache() {-- @SuppressWarnings("unchecked")- @Override- public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {- if (commitIds.contains(commitId)) {- lock.readLock().lock();- try {- byte[] bytes = FileUtils.readFileToByteArray(new File(cacheDir, commitId.name()));- return (Map<String, Value>) SerializationUtils.deserialize(bytes);- } catch (IOException e) {- throw new RuntimeException(e);- } finally {- lock.readLock().unlock();- }- } else {- return null;- }- }-- };- } else {- cache = null;- }-- final AnyObjectId commitId = getObjectId(revision);-- long time = System.currentTimeMillis();- LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(getRepository(), commitId, path, cache);- long elapsed = System.currentTimeMillis()-time;- if (elapsed > LAST_COMMITS_CACHE_THRESHOLD) {- lock.writeLock().lock();- try {- if (!cacheDir.exists())- FileUtils.createDir(cacheDir);- FileUtils.writeByteArrayToFile(- new File(cacheDir, commitId.name()),- SerializationUtils.serialize(lastCommits));- } catch (IOException e) {- throw new RuntimeException(e);- } finally {- lock.writeLock().unlock();- }- }- return lastCommits;- }-- @Nullable- public Ref getRef(String revision) {- if (refCache == null)- refCache = new HashMap<>();- Optional<Ref> optional = refCache.get(revision);- if (optional == null) {- try {- optional = Optional.fromNullable(getRepository().findRef(revision));- } catch (IOException e) {- throw new RuntimeException(e);- }- refCache.put(revision, optional);- }- return optional.orNull();- }-- @Nullable- public Ref getBranchRef(String revision) {- Ref ref = getRef(revision);- if (ref != null && ref.getName().startsWith(Constants.R_HEADS))- return ref;- else- return null;- }-- @Nullable- public Ref getTagRef(String revision) {- Ref ref = getRef(revision);- if (ref != null && ref.getName().startsWith(Constants.R_TAGS))- return ref;- else- return null;- }-- @Nullable- public RevCommit getRevCommit(String revision, boolean mustExist) {- RevCommit commit;- ObjectId revId = getObjectId(revision, mustExist);- if (revId != null) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- commit = GitUtils.parseCommit(revWalk, revId);- }- } else {- commit = null;- }- if (mustExist && commit == null)- throw new GitObjectNotFoundException("Unable to find commit: " + revision);- else- return commit;- }-- public RevCommit getRevCommit(String revision) {- return getRevCommit(revision, true);- }-- @Nullable- public RevCommit getRevCommit(ObjectId revId, boolean mustExist) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- RevCommit commit = GitUtils.parseCommit(revWalk, revId);- if (mustExist && commit == null)- throw new GitObjectNotFoundException("Unable to find commit: " + revId.name());- else- return commit;- }- }-- public RevCommit getRevCommit(ObjectId revId) {- return getRevCommit(revId, true);- }-- public Map<String, Ref> getRefs(String prefix) {- try {- return getRepository().getRefDatabase().getRefs(prefix);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public Map<String, String> getSubmodules(String revision) {- Map<String, String> submodules = new HashMap<>();-- Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()));- String content = new String(blob.getBytes());-- String path = null;- String url = null;-- for (String line: StringUtils.splitAndTrim(content, "\r\n")) {- if (line.startsWith("[") && line.endsWith("]")) {- if (path != null && url != null)- submodules.put(path, url);-- path = url = null;- } else if (line.startsWith("path")) {- path = StringUtils.substringAfter(line, "=").trim();- } else if (line.startsWith("url")) {- url = StringUtils.substringAfter(line, "=").trim();- }- }- if (path != null && url != null)- submodules.put(path, url);-- return submodules;- }-- public void deleteBranch(String branch) {- String refName = GitUtils.branch2ref(branch);- ObjectId commitId = getObjectId(refName);- try {- git().branchDelete().setForce(true).setBranchNames(branch).call();- } catch (Exception e) {- Throwables.propagate(e);- }-- Subject subject = SecurityUtils.getSubject();- GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());- GitPlex.getInstance(ListenerRegistry.class).post(- new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }-- public void createBranch(String branchName, String branchRevision) {- try {- CreateBranchCommand command = git().branchCreate();- command.setName(branchName);- command.setStartPoint(getRevCommit(branchRevision));- command.call();- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- }-- public void tag(String tagName, String tagRevision, PersonIdent taggerIdent, @Nullable String tagMessage) {- try {- TagCommand tag = git().tag();- tag.setName(tagName);- if (tagMessage != null)- tag.setMessage(tagMessage);- tag.setTagger(taggerIdent);- tag.setObjectId(getRevCommit(tagRevision));- tag.call();- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- }-- public void deleteTag(String tag) {- String refName = GitUtils.tag2ref(tag);- ObjectId commitId = getRevCommit(refName).getId();- try {- git().tagDelete().setTags(tag).call();- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- Subject subject = SecurityUtils.getSubject();- GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());- GitPlex.getInstance(ListenerRegistry.class).post(- new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }-- public Collection<TeamAuthorization> getAuthorizedTeams() {- return authorizedTeams;- }-- public void setAuthorizedTeams(Collection<TeamAuthorization> authorizedTeams) {- this.authorizedTeams = authorizedTeams;- }-- public Collection<UserAuthorization> getAuthorizedUsers() {- return authorizedUsers;- }-- public void setAuthorizedUsers(Collection<UserAuthorization> authorizedUsers) {- this.authorizedUsers = authorizedUsers;- }-- public long getVersion() {- return version;- }-- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- 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);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @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 static int compareLastVisit(Depot depot1, Depot depot2) {- Account user = SecurityUtils.getAccount();- if (user != null) {- Date date1 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot1);- Date date2 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot2);- if (date1 != null) {- if (date2 != null)- return date2.compareTo(date1);- else- return -1;- } else {- if (date2 != null)- return 1;- else- return depot1.compareTo(depot2);- }- } else {- return depot1.compareTo(depot2);- }- }--}+package com.gitplex.server.core.entity;++import java.io.File;+import java.io.IOException;+import java.io.InputStream;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.UUID;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.stream.Collectors;++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.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;+import javax.validation.constraints.NotNull;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.eclipse.jgit.api.CreateBranchCommand;+import org.eclipse.jgit.api.Git;+import org.eclipse.jgit.api.TagCommand;+import org.eclipse.jgit.api.errors.GitAPIException;+import org.eclipse.jgit.diff.DiffEntry;+import org.eclipse.jgit.diff.DiffFormatter;+import org.eclipse.jgit.diff.RawTextComparator;+import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectLoader;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.Ref;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.LastCommitsOfChildren;+import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevTree;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.eclipse.jgit.util.io.NullOutputStream;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.annotations.DynamicUpdate;+import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.commons.git.Blob;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.RefInfo;+import com.gitplex.commons.git.Submodule;+import com.gitplex.commons.git.exception.GitObjectNotFoundException;+import com.gitplex.commons.git.exception.NotGitFileException;+import com.gitplex.commons.hibernate.AbstractEntity;+import com.gitplex.commons.hibernate.UnitOfWork;+import com.gitplex.commons.loader.AppLoader;+import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.commons.util.FileUtils;+import com.gitplex.commons.util.LockUtils;+import com.gitplex.commons.util.StringUtils;+import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.commons.wicket.editable.annotation.Markdown;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;+import com.gitplex.server.core.entity.support.IntegrationPolicy;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.gatekeeper.AndGateKeeper;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.protectedobject.AccountBelonging;+import com.gitplex.server.core.security.protectedobject.ProtectedObject;+import com.gitplex.server.core.util.validation.DepotName;+import com.google.common.base.Objects;+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"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@DynamicUpdate+@Editable+public class Depot extends AbstractEntity implements AccountBelonging {++ private static final long serialVersionUID = 1L;++ public static final String FQN_SEPARATOR = "/";++ public static final String REF_FQN_SEPARATOR = ":";++ public static final String REFS_GITPLEX = "refs/gitplex/";++ private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;++ private static final int MAX_READ_BLOB_SIZE = 5*1024*1024;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Account account;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=true)+ private Depot forkedFrom;++ @Column(nullable=false)+ private String name;++ @Lob+ @Column(length=65535)+ private String description;++ private boolean publicRead;++ @Lob+ @Column(length=65535, name="COMMIT_MSG_TRANSFORM")+ private CommitMessageTransformSetting commitMessageTransformSetting;++ @Column(nullable=false)+ private String uuid = UUID.randomUUID().toString();++ /*+ * Optimistic lock is necessary to ensure database integrity when update+ * gatekeepers and integration policies upon depot renaming/deletion+ */+ @Version+ private long version;++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<GateKeeper> gateKeepers = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<IntegrationPolicy> integrationPolicies = new ArrayList<>();++ @Column(nullable=false)+ private Date createdAt = new Date();++ @OneToMany(mappedBy="targetDepot", cascade=CascadeType.REMOVE)+ private Collection<PullRequest> incomingRequests = new ArrayList<>();++ @OneToMany(mappedBy="sourceDepot")+ private Collection<PullRequest> outgoingRequests = new ArrayList<>();++ @OneToMany(mappedBy="forkedFrom")+ private Collection<Depot> forks = new ArrayList<>();++ @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)+ private Collection<TeamAuthorization> authorizedTeams = new ArrayList<>();++ @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> authorizedUsers = new ArrayList<>();++ @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)+ private Collection<CodeComment> comments = new ArrayList<>();++ private transient Repository repository;++ private transient Map<BlobIdent, Blob> blobCache;++ private transient Map<String, Optional<ObjectId>> objectIdCache;++ private transient Map<String, Optional<Ref>> refCache;++ private transient Optional<String> defaultBranch;++ @Override+ public Account getAccount() {+ return account;+ }++ public void setAccount(Account account) {+ this.account = account;+ }++ @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 repository")+ @Markdown+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=300, name="Public", description="Whether or not this repository can be read by everyone")+ public boolean isPublicRead() {+ return publicRead;+ }++ public void setPublicRead(boolean publicRead) {+ this.publicRead = publicRead;+ }++ @Nullable+ @Valid+ public CommitMessageTransformSetting getCommitMessageTransformSetting() {+ return commitMessageTransformSetting;+ }++ public void setCommitMessageTransformSetting(CommitMessageTransformSetting commitMessageTransformSetting) {+ this.commitMessageTransformSetting = commitMessageTransformSetting;+ }++ public String getUUID() {+ return uuid;+ }++ public void setUUID(String uuid) {+ this.uuid = uuid;+ }++ @NotNull+ @Valid+ public List<GateKeeper> getGateKeepers() {+ return gateKeepers;+ }++ public void setGateKeepers(ArrayList<GateKeeper> gateKeepers) {+ this.gateKeepers = gateKeepers;+ }++ @Valid+ public List<IntegrationPolicy> getIntegrationPolicies() {+ return integrationPolicies;+ }++ public void setIntegrationPolicies(ArrayList<IntegrationPolicy> integrationPolicies) {+ this.integrationPolicies = integrationPolicies;+ }++ public Date getCreatedAt() {+ return createdAt;+ }++ public void setCreatedAt(Date createdAt) {+ this.createdAt = createdAt;+ }++ public Collection<PullRequest> getIncomingRequests() {+ return incomingRequests;+ }++ public void setIncomingRequests(Collection<PullRequest> incomingRequests) {+ this.incomingRequests = incomingRequests;+ }++ public Collection<PullRequest> getOutgoingRequests() {+ return outgoingRequests;+ }++ public void setOutgoingRequests(Collection<PullRequest> outgoingRequests) {+ this.outgoingRequests = outgoingRequests;+ }++ public Depot getForkedFrom() {+ return forkedFrom;+ }++ public void setForkedFrom(Depot forkedFrom) {+ this.forkedFrom = forkedFrom;+ }++ public Collection<Depot> getForks() {+ return forks;+ }++ public void setForks(Collection<Depot> forks) {+ this.forks = forks;+ }++ public List<RefInfo> getBranches() {+ return getRefInfos(Constants.R_HEADS);+ }++ public List<RefInfo> getTags() {+ return getRefInfos(Constants.R_TAGS);+ }++ public List<RefInfo> getRefInfos(String prefix) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ List<Ref> refs = new ArrayList<Ref>(getRepository().getRefDatabase().getRefs(prefix).values());+ List<RefInfo> refInfos = refs.stream()+ .map(ref->new RefInfo(revWalk, ref))+ .filter(refInfo->refInfo.getPeeledObj() instanceof RevCommit)+ .collect(Collectors.toList());+ Collections.sort(refInfos);+ Collections.reverse(refInfos);+ return refInfos;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @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());+ }++ public File getDirectory() {+ return AppLoader.getInstance(StorageManager.class).getGitDir(this);+ }++ /**+ * Whether or not specified git represents a valid repository git. This can be used to tell+ * apart a GitPlex repository git from some other Git repositories.+ *+ * @return+ * <tt>true</tt> if valid; <tt>false</tt> otherwise+ */+ public boolean isValid() {+ return isGitHookValid("pre-receive") && isGitHookValid("post-receive");+ }++ public boolean isGitHookValid(String hookName) {+ File hookFile = new File(getDirectory(), "hooks/" + hookName);+ if (!hookFile.exists())+ return false;++ try {+ String content = FileUtils.readFileToString(hookFile);+ if (!content.contains("GITPLEX_USER_ID"))+ return false;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ if (!hookFile.canExecute())+ return false;++ return true;+ }++ public GateKeeper getGateKeeper() {+ AndGateKeeper andGateKeeper = new AndGateKeeper();+ for (GateKeeper each: getGateKeepers())+ andGateKeeper.getGateKeepers().add(each);+ return andGateKeeper;+ }++ /**+ * Find fork root of this repository.+ *+ * @return+ * fork root of this repository, or <tt>null</tt> if the repository is not+ * forked from any other repository+ */+ public @Nullable Depot findForkRoot() {+ if (forkedFrom != null) {+ Depot forkedRoot = forkedFrom.findForkRoot();+ if (forkedRoot != null)+ return forkedRoot;+ else+ return forkedFrom;+ } else {+ return null;+ }+ }++ /**+ * Find all descendant repositories forking from current repository.+ *+ * @return+ * all descendant repositories forking from current repository+ */+ public List<Depot> findForkDescendants() {+ List<Depot> descendants = new ArrayList<>();+ for (Depot fork: getForks()) {+ if (fork.getDefaultBranch() != null)+ descendants.add(fork);+ descendants.addAll(fork.findForkDescendants());+ }++ return descendants;+ }++ /**+ * Find all comparable repositories of current repository. Comparable repositories can+ * be connected via forks, and can be compared/pulled.+ *+ * @return+ * comparable repositories of current repository, with current repository also+ * included in the collection+ */+ public Collection<Depot> findAffinals() {+ Collection<Depot> affinals = new ArrayList<Depot>();+ Depot forkRoot = findForkRoot();+ if (forkRoot != null) {+ affinals.add(forkRoot);+ affinals.addAll(forkRoot.findForkDescendants());+ } else {+ affinals.add(this);+ affinals.addAll(findForkDescendants());+ }+ return affinals;+ }++ public Repository getRepository() {+ if (repository == null) {+ repository = GitPlex.getInstance(DepotManager.class).getRepository(this);+ }+ return repository;+ }++ public String getUrl() {+ return GitPlex.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/" + getFQN();+ }++ @Nullable+ public String getDefaultBranch() {+ if (defaultBranch == null) {+ try {+ Ref headRef = getRepository().findRef("HEAD");+ if (headRef.isSymbolic()+ && headRef.getTarget().getName().startsWith(Constants.R_HEADS)+ && headRef.getObjectId() != null) {+ defaultBranch = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));+ } else {+ defaultBranch = Optional.absent();+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ return defaultBranch.orNull();+ }++ public void setDefaultBranch(String defaultBranchName) {+ RefUpdate refUpdate = updateRef("HEAD");+ GitUtils.linkRef(refUpdate, GitUtils.branch2ref(defaultBranchName));+ defaultBranch = null;+ }++ private Blob readBlob(ObjectLoader objectLoader, BlobIdent ident) {+ long blobSize = objectLoader.getSize();+ if (blobSize > MAX_READ_BLOB_SIZE) {+ try (InputStream is = objectLoader.openStream()) {+ byte[] bytes = new byte[MAX_READ_BLOB_SIZE];+ is.read(bytes);+ return new Blob(ident, bytes, blobSize);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return new Blob(ident, objectLoader.getCachedBytes());+ }+ }++ private Map<BlobIdent, Blob> getBlobCache() {+ if (blobCache == null) {+ synchronized(this) {+ if (blobCache == null)+ blobCache = new ConcurrentHashMap<>();+ }+ }+ return blobCache;+ }++ /**+ * Read blob content and cache result in repository in case the same blob+ * content is requested again.+ *+ * We made this method thread-safe as we are using ForkJoinPool to calculate+ * diffs of multiple blob changes concurrently, and this method will be+ * accessed concurrently in that special case.+ *+ * @param blobIdent+ * ident of the blob+ * @return+ * blob of specified blob ident+ * @throws+ * GitObjectNotFoundException if blob of specified ident can not be found in repository+ *+ */+ public Blob getBlob(BlobIdent blobIdent) {+ Preconditions.checkArgument(blobIdent.revision!=null && blobIdent.path!=null && blobIdent.mode!=null,+ "Revision, path and mode of ident param should be specified");++ Blob blob = getBlobCache().get(blobIdent);+ if (blob == null) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ ObjectId revId = getObjectId(blobIdent.revision);+ RevTree revTree = revWalk.parseCommit(revId).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), blobIdent.path, revTree);+ if (treeWalk != null) {+ if (blobIdent.isGitLink()) {+ String url = getSubmodules(blobIdent.revision).get(blobIdent.path);+ if (url == null)+ throw new GitObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");+ String hash = treeWalk.getObjectId(0).name();+ blob = new Blob(blobIdent, new Submodule(url, hash).toString().getBytes());+ } else if (blobIdent.isTree()) {+ throw new NotGitFileException("Path '" + blobIdent.path + "' is a tree");+ } else {+ ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));+ blob = readBlob(objectLoader, blobIdent);+ }+ getBlobCache().put(blobIdent, blob);+ } else {+ throw new GitObjectNotFoundException("Unable to find blob path '" + blobIdent.path + "' in revision '" + blobIdent.revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ return blob;+ }++ public InputStream getInputStream(BlobIdent ident) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ ObjectId commitId = getObjectId(ident.revision);+ RevTree revTree = revWalk.parseCommit(commitId).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), ident.path, revTree);+ if (treeWalk != null) {+ ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));+ return objectLoader.openStream();+ } else {+ throw new GitObjectNotFoundException("Unable to find blob path '" + ident.path + "' in revision '" + ident.revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ /**+ * Get cached object id of specified revision.+ *+ * @param revision+ * revision to resolve object id for+ * @param mustExist+ * true to have the method throwing exception instead+ * of returning null if the revision does not exist+ * @return+ * object id of specified revision, or <tt>null</tt> if revision+ * does not exist and mustExist is specified as false+ */+ @Nullable+ public ObjectId getObjectId(String revision, boolean mustExist) {+ if (objectIdCache == null)+ objectIdCache = new HashMap<>();++ Optional<ObjectId> optional = objectIdCache.get(revision);+ if (optional == null) {+ optional = Optional.fromNullable(GitUtils.resolve(getRepository(), revision));+ objectIdCache.put(revision, optional);+ }+ if (mustExist && !optional.isPresent())+ throw new GitObjectNotFoundException("Unable to find object '" + revision + "'");+ return optional.orNull();+ }++ public ObjectId getObjectId(String revision) {+ return getObjectId(revision, true);+ }++ public void cacheObjectId(String revision, @Nullable ObjectId objectId) {+ if (objectIdCache == null)+ objectIdCache = new HashMap<>();++ objectIdCache.put(revision, Optional.fromNullable(objectId));+ }++ public List<DiffEntry> getDiffs(String oldRev, String newRev) {+ List<DiffEntry> diffs = new ArrayList<>();+ try (DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);) {+ diffFormatter.setRepository(getRepository());+ diffFormatter.setDetectRenames(true);+ diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);+ AnyObjectId oldRevId = getObjectId(oldRev);+ AnyObjectId newRevId = getObjectId(newRev);+ for (DiffEntry entry: diffFormatter.scan(oldRevId, newRevId)) {+ if (!Objects.equal(entry.getOldPath(), entry.getNewPath())+ || !Objects.equal(entry.getOldMode(), entry.getNewMode())+ || entry.getOldId()==null || !entry.getOldId().isComplete()+ || entry.getNewId()== null || !entry.getNewId().isComplete()+ || !entry.getOldId().equals(entry.getNewId())) {+ diffs.add(entry);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return diffs;+ }++ public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {+ if (path == null)+ path = "";++ final File cacheDir = new File(+ GitPlex.getInstance(StorageManager.class).getInfoDir(this),+ "last_commits/" + path + "/gitplex_last_commits");++ final ReadWriteLock lock;+ try {+ lock = LockUtils.getReadWriteLock(cacheDir.getCanonicalPath());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ final Set<ObjectId> commitIds = new HashSet<>();++ lock.readLock().lock();+ try {+ if (cacheDir.exists()) {+ for (String each: cacheDir.list())+ commitIds.add(ObjectId.fromString(each));+ }+ } finally {+ lock.readLock().unlock();+ }++ org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache cache;+ if (!commitIds.isEmpty()) {+ cache = new org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache() {++ @SuppressWarnings("unchecked")+ @Override+ public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {+ if (commitIds.contains(commitId)) {+ lock.readLock().lock();+ try {+ byte[] bytes = FileUtils.readFileToByteArray(new File(cacheDir, commitId.name()));+ return (Map<String, Value>) SerializationUtils.deserialize(bytes);+ } catch (IOException e) {+ throw new RuntimeException(e);+ } finally {+ lock.readLock().unlock();+ }+ } else {+ return null;+ }+ }++ };+ } else {+ cache = null;+ }++ final AnyObjectId commitId = getObjectId(revision);++ long time = System.currentTimeMillis();+ LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(getRepository(), commitId, path, cache);+ long elapsed = System.currentTimeMillis()-time;+ if (elapsed > LAST_COMMITS_CACHE_THRESHOLD) {+ lock.writeLock().lock();+ try {+ if (!cacheDir.exists())+ FileUtils.createDir(cacheDir);+ FileUtils.writeByteArrayToFile(+ new File(cacheDir, commitId.name()),+ SerializationUtils.serialize(lastCommits));+ } catch (IOException e) {+ throw new RuntimeException(e);+ } finally {+ lock.writeLock().unlock();+ }+ }+ return lastCommits;+ }++ @Nullable+ public Ref getRef(String revision) {+ if (refCache == null)+ refCache = new HashMap<>();+ Optional<Ref> optional = refCache.get(revision);+ if (optional == null) {+ try {+ optional = Optional.fromNullable(getRepository().findRef(revision));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ refCache.put(revision, optional);+ }+ return optional.orNull();+ }++ @Nullable+ public Ref getBranchRef(String revision) {+ Ref ref = getRef(revision);+ if (ref != null && ref.getName().startsWith(Constants.R_HEADS))+ return ref;+ else+ return null;+ }++ @Nullable+ public Ref getTagRef(String revision) {+ Ref ref = getRef(revision);+ if (ref != null && ref.getName().startsWith(Constants.R_TAGS))+ return ref;+ else+ return null;+ }++ @Nullable+ public RevCommit getRevCommit(String revision, boolean mustExist) {+ RevCommit commit;+ ObjectId revId = getObjectId(revision, mustExist);+ if (revId != null) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ commit = GitUtils.parseCommit(revWalk, revId);+ }+ } else {+ commit = null;+ }+ if (mustExist && commit == null)+ throw new GitObjectNotFoundException("Unable to find commit: " + revision);+ else+ return commit;+ }++ public RevCommit getRevCommit(String revision) {+ return getRevCommit(revision, true);+ }++ @Nullable+ public RevCommit getRevCommit(ObjectId revId, boolean mustExist) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ RevCommit commit = GitUtils.parseCommit(revWalk, revId);+ if (mustExist && commit == null)+ throw new GitObjectNotFoundException("Unable to find commit: " + revId.name());+ else+ return commit;+ }+ }++ public RevCommit getRevCommit(ObjectId revId) {+ return getRevCommit(revId, true);+ }++ public Map<String, Ref> getRefs(String prefix) {+ try {+ return getRepository().getRefDatabase().getRefs(prefix);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public Map<String, String> getSubmodules(String revision) {+ Map<String, String> submodules = new HashMap<>();++ Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()));+ String content = new String(blob.getBytes());++ String path = null;+ String url = null;++ for (String line: StringUtils.splitAndTrim(content, "\r\n")) {+ if (line.startsWith("[") && line.endsWith("]")) {+ if (path != null && url != null)+ submodules.put(path, url);++ path = url = null;+ } else if (line.startsWith("path")) {+ path = StringUtils.substringAfter(line, "=").trim();+ } else if (line.startsWith("url")) {+ url = StringUtils.substringAfter(line, "=").trim();+ }+ }+ if (path != null && url != null)+ submodules.put(path, url);++ return submodules;+ }++ public void deleteBranch(String branch) {+ String refName = GitUtils.branch2ref(branch);+ ObjectId commitId = getObjectId(refName);+ try {+ git().branchDelete().setForce(true).setBranchNames(branch).call();+ } catch (Exception e) {+ Throwables.propagate(e);+ }++ Subject subject = SecurityUtils.getSubject();+ GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());+ GitPlex.getInstance(ListenerRegistry.class).post(+ new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ public void createBranch(String branchName, String branchRevision) {+ try {+ CreateBranchCommand command = git().branchCreate();+ command.setName(branchName);+ command.setStartPoint(getRevCommit(branchRevision));+ command.call();+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }+ }++ public void tag(String tagName, String tagRevision, PersonIdent taggerIdent, @Nullable String tagMessage) {+ try {+ TagCommand tag = git().tag();+ tag.setName(tagName);+ if (tagMessage != null)+ tag.setMessage(tagMessage);+ tag.setTagger(taggerIdent);+ tag.setObjectId(getRevCommit(tagRevision));+ tag.call();+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }+ }++ public void deleteTag(String tag) {+ String refName = GitUtils.tag2ref(tag);+ ObjectId commitId = getRevCommit(refName).getId();+ try {+ git().tagDelete().setTags(tag).call();+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }+ Subject subject = SecurityUtils.getSubject();+ GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Depot depot = GitPlex.getInstance(DepotManager.class).load(getId());+ GitPlex.getInstance(ListenerRegistry.class).post(+ new RefUpdated(depot, refName, commitId, ObjectId.zeroId()));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ public Collection<TeamAuthorization> getAuthorizedTeams() {+ return authorizedTeams;+ }++ public void setAuthorizedTeams(Collection<TeamAuthorization> authorizedTeams) {+ this.authorizedTeams = authorizedTeams;+ }++ public Collection<UserAuthorization> getAuthorizedUsers() {+ return authorizedUsers;+ }++ public void setAuthorizedUsers(Collection<UserAuthorization> authorizedUsers) {+ this.authorizedUsers = authorizedUsers;+ }++ public long getVersion() {+ return version;+ }++ public boolean matches(@Nullable String searchTerm) {+ if (searchTerm == null)+ searchTerm = "";+ else+ searchTerm = searchTerm.toLowerCase().trim();++ 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);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @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 static int compareLastVisit(Depot depot1, Depot depot2) {+ Account user = SecurityUtils.getAccount();+ if (user != null) {+ Date date1 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot1);+ Date date2 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, depot2);+ if (date1 != null) {+ if (date2 != null)+ return date2.compareTo(date1);+ else+ return -1;+ } else {+ if (date2 != null)+ return 1;+ else+ return depot1.compareTo(depot2);+ }+ } else {+ return depot1.compareTo(depot2);+ }+ }++}diff --git a/server.core/src/main/java/com/gitplex/server/core/entity/EntityLocator.java b/server.core/src/main/java/com/gitplex/server/core/entity/EntityLocator.javanew file mode 100644index 0000000000..b9260d9ea9--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/entity/EntityLocator.java@@ -0,0 +1,5 @@+package com.gitplex.server.core.entity;++public class EntityLocator {++}diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.java b/server.core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.javarename to server.core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.javaindex d5d4deafe8..1dd93654f5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Entity;import javax.persistence.FetchType;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequest.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequest.javaindex e860fe2310..c19be3292b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequest.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.io.IOException;import java.io.Serializable;@@ -38,22 +38,6 @@ import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Restrictions;import com.fasterxml.jackson.annotation.JsonView;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.support.CloseInfo;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.entity.support.LastEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentEvent;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Pending;-import com.gitplex.core.manager.CodeCommentRelationManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestReviewManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.ObjectPermission;-import com.gitplex.core.security.SecurityUtils;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.exception.GitObjectNotFoundException;@@ -63,6 +47,22 @@ import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.jackson.ExternalView;import com.gitplex.commons.lang.diff.WhitespaceOption;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.support.CloseInfo;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.entity.support.LastEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentEvent;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;+import com.gitplex.server.core.manager.CodeCommentRelationManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestReviewManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.ObjectPermission;+import com.gitplex.server.core.security.SecurityUtils;@Entity/*diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.javaindex a40db2ddac..d7820a8689 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.javaindex d70abc1e84..f33b64cad0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.javaindex b5b20b89aa..78baae13db 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.javaindex b140a68bd2..18359173cc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.javaindex b986a993cb..a52dd953aa 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.javaindex 9575080b48..17c75f7bc3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.javaindex a4934b6990..36a25fddb9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.io.IOException;import java.util.ArrayList;@@ -31,10 +31,10 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.treewalk.filter.TreeFilter;import com.fasterxml.jackson.annotation.JsonProperty;-import com.gitplex.core.manager.impl.DefaultCodeCommentRelationManager;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.AbstractEntity;+import com.gitplex.server.core.manager.impl.DefaultCodeCommentRelationManager;@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="uuid"), @Index(columnList="date")})diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.javaindex 5427cd1255..88ed0769cc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.Date;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.java b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.javarename to server.core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.javaindex 1fa45739e5..77b71243e1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.annotation.Nullable;import javax.persistence.Entity;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/Team.java b/server.core/src/main/java/com/gitplex/server/core/entity/Team.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/Team.javarename to server.core/src/main/java/com/gitplex/server/core/entity/Team.javaindex 62b779fdd2..36b4900eeb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/Team.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/Team.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import java.util.ArrayList;import java.util.Collection;@@ -20,10 +20,10 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.util.validation.DepotName;import com.gitplex.commons.hibernate.AbstractEntity;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Markdown;+import com.gitplex.server.core.util.validation.DepotName;@Entity@Table(diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.java b/server.core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.javarename to server.core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.javaindex 3dc06cdbd4..99aa113807 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Column;import javax.persistence.Entity;@@ -9,8 +9,8 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.gitplex.commons.hibernate.AbstractEntity;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Entity@Table(diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.java b/server.core/src/main/java/com/gitplex/server/core/entity/TeamMembership.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.javarename to server.core/src/main/java/com/gitplex/server/core/entity/TeamMembership.javaindex 5ab05bc083..47fb7a082d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/TeamMembership.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Entity;import javax.persistence.FetchType;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.java b/server.core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.javarename to server.core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.javaindex 1b649b4f9a..cc3148754f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity;+package com.gitplex.server.core.entity;import javax.persistence.Column;import javax.persistence.Entity;@@ -9,8 +9,8 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.gitplex.commons.hibernate.AbstractEntity;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Entity@Table(diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.javaindex 3e96f28daa..23901d3161 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;import java.util.Date;@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;import org.hibernate.annotations.OptimisticLock;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;@Embeddablepublic class CloseInfo implements Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.javaindex f99516a272..bd11855ae7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.util.Date;@@ -10,10 +10,10 @@ import javax.persistence.ManyToOne;import javax.persistence.MappedSuperclass;import javax.persistence.Version;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeComment.ComparingInfo;import com.gitplex.commons.hibernate.AbstractEntity;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeComment.ComparingInfo;@MappedSuperclasspublic abstract class CodeCommentActivity extends AbstractEntity {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.javaindex 98c912ffc4..d0e34b2e5d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.javaindex 7047003282..4b0c6f50bb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.javaindex 1e5a2cf8e7..340b00b6dc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.javaindex 7d49ad1555..004c971e97 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.java@@ -1,7 +1,7 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.entity.Depot;public class DepotAndBranch extends DepotAndRevision {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.javaindex e845116fb4..7d50a54fa6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;@@ -11,10 +11,10 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;public class DepotAndRevision implements Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.javaindex cca2acdf7a..b706be5612 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;import java.util.ArrayList;@@ -9,16 +9,16 @@ import javax.validation.constraints.Size;import org.apache.commons.lang3.StringUtils;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.annotation.BranchMatch;-import com.gitplex.core.annotation.FullBranchMatch;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Horizontal;import com.gitplex.core.util.includeexclude.IncludeExcludeParser;+import com.gitplex.server.core.annotation.BranchMatch;+import com.gitplex.server.core.annotation.FullBranchMatch;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.javaindex 3961988cc8..282c18198e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;@@ -8,8 +8,8 @@ import javax.persistence.Embeddable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;@SuppressWarnings("serial")@Embeddablediff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.javasimilarity index 90%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.javaindex 183c5ecff2..254dc088e5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;import java.util.Date;@@ -9,7 +9,7 @@ import javax.persistence.FetchType;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;@Embeddablepublic class LastEvent implements Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.javarename to server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.javaindex 25966edf2a..0fd94bdc06 100644--- a/gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.java+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java@@ -1,4 +1,4 @@-package com.gitplex.core.entity.support;+package com.gitplex.server.core.entity.support;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.java b/server.core/src/main/java/com/gitplex/server/core/event/MarkdownAware.javasimilarity index 72%rename from gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.javarename to server.core/src/main/java/com/gitplex/server/core/event/MarkdownAware.javaindex f7a3624e09..0512a65187 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/MarkdownAware.java@@ -1,4 +1,4 @@-package com.gitplex.core.event;+package com.gitplex.server.core.event;import javax.annotation.Nullable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java b/server.core/src/main/java/com/gitplex/server/core/event/RefUpdated.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.javarename to server.core/src/main/java/com/gitplex/server/core/event/RefUpdated.javaindex eab07294de..dcea89a1f6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/RefUpdated.java@@ -1,8 +1,8 @@-package com.gitplex.core.event;+package com.gitplex.server.core.event;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public class RefUpdated {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.javasimilarity index 67%rename from gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.javaindex 93afdd3c3a..4de96148bc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.java@@ -1,6 +1,6 @@-package com.gitplex.core.event;+package com.gitplex.server.core.event;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;public class TaskChangeEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.javasimilarity index 69%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.javaindex bf4e1dde93..0cac98dab7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.java@@ -1,11 +1,11 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;public abstract class CodeCommentActivityEvent extends CodeCommentEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.javaindex 02bff3ee30..ad8c092c15 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;@Editable(name="created")public class CodeCommentCreated extends CodeCommentEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.javasimilarity index 70%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.javaindex af5d03bdf2..0e9af02495 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.event.MarkdownAware;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.event.MarkdownAware;public abstract class CodeCommentEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.javaindex 1e4d44c5dc..c8904e3604 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;-import com.gitplex.core.entity.CodeCommentReply;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentReplied;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentReply;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentReplied;@Editable(name="replied")public class CodeCommentReplied extends CodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.javasimilarity index 62%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.javaindex a6597c7035..7190ba9ec0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentResolved;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentResolved;@Editable(name="resolved")public class CodeCommentResolved extends CodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.java b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.javasimilarity index 62%rename from gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.javarename to server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.javaindex 8ad52a95e0..15fa5d6395 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.codecomment;+package com.gitplex.server.core.event.codecomment;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentUnresolved;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentUnresolved;@Editable(name="unresolved")public class CodeCommentUnresolved extends CodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.java b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.javasimilarity index 65%rename from gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.javarename to server.core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.javaindex 3fb8834b33..016d697616 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.depot;+package com.gitplex.server.core.event.depot;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public class DepotDeleted {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.java b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.javarename to server.core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.javaindex 5b62c2362f..83776c8ebb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.depot;+package com.gitplex.server.core.event.depot;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public class DepotRenamed {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.java b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.javasimilarity index 70%rename from gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.javarename to server.core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.javaindex 49e5902abd..daaa8a6db1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.java@@ -1,7 +1,7 @@-package com.gitplex.core.event.depot;+package com.gitplex.server.core.event.depot;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;public class DepotTransferred {diff --git a/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.java b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.javanew file mode 100644index 0000000000..ce5ac0c55e--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.java@@ -0,0 +1,5 @@+package com.gitplex.server.core.event.lifecycle;++public class SystemStarted {++}diff --git a/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.java b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.javanew file mode 100644index 0000000000..f88e19c430--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.java@@ -0,0 +1,5 @@+package com.gitplex.server.core.event.lifecycle;++public class SystemStarting {++}diff --git a/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.java b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.javanew file mode 100644index 0000000000..fbb18280f7--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.java@@ -0,0 +1,5 @@+package com.gitplex.server.core.event.lifecycle;++public class SystemStopped {++}diff --git a/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.java b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.javanew file mode 100644index 0000000000..ac756f25dd--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.java@@ -0,0 +1,5 @@+package com.gitplex.server.core.event.lifecycle;++public class SystemStopping {++}diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.javasimilarity index 69%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.javaindex 702b8a7a03..0bde0007ba 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.java@@ -1,9 +1,9 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;public class IntegrationPreviewCalculated extends PullRequestChangeEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.javasimilarity index 66%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.javaindex f57c9d2ba6..b96023e703 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.java@@ -1,11 +1,11 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;public abstract class PullRequestChangeEvent extends PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.javasimilarity index 74%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.javaindex 3a73a8e94b..9251d735d3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CodeCommentActivity;public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.javasimilarity index 69%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.javaindex 005b29eb6c..53cd84730b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.java@@ -1,12 +1,12 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.MarkdownAware;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.MarkdownAware;@Editable(name="commented code")public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.javasimilarity index 62%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.javaindex 35379ac88c..468d6fb36b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.java@@ -1,8 +1,8 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.MarkdownAware;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.MarkdownAware;public abstract class PullRequestCodeCommentEvent extends PullRequestChangeEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.javasimilarity index 71%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.javaindex ea3fff0f40..7ca1848b73 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.java@@ -1,8 +1,8 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.CodeCommentReply;-import com.gitplex.core.entity.PullRequest;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentReply;+import com.gitplex.server.core.entity.PullRequest;@Editable(name="replied code comment")public class PullRequestCodeCommentReplied extends PullRequestCodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.javasimilarity index 72%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.javaindex eb9647b799..323fc8f9f6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.java@@ -1,8 +1,8 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.PullRequest;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.PullRequest;@Editable(name="resolved code comment")public class PullRequestCodeCommentResolved extends PullRequestCodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.javasimilarity index 73%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.javaindex 7825ce30cc..f221efab15 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.java@@ -1,8 +1,8 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.PullRequest;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.PullRequest;@Editable(name="Unresolved code comment")public class PullRequestCodeCommentUnresolved extends PullRequestCodeCommentActivityEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.javaindex 60dfbd8d39..67d9e84009 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.java@@ -1,11 +1,11 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.event.MarkdownAware;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.event.MarkdownAware;@Editable(name="commented")public class PullRequestCommentCreated extends PullRequestChangeEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.javasimilarity index 68%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.javaindex fdc62092f8..00081382d2 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest;public abstract class PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.javasimilarity index 72%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.javaindex 3eebe53fd8..2c79fe0a5c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.java@@ -1,11 +1,11 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.MarkdownAware;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.MarkdownAware;@Editable(name="opened")public class PullRequestOpened extends PullRequestChangeEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.javasimilarity index 59%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.javaindex 87a791dadd..32f37b4837 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest;public class PullRequestPendingApproval extends PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.javaindex dc54800348..bb8237c558 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest;public class PullRequestPendingIntegration extends PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.javasimilarity index 59%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.javaindex ae18f6354a..262416d2a9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest;public class PullRequestPendingUpdate extends PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.javasimilarity index 75%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.javaindex 65a098deaf..b18e425e22 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.java@@ -1,6 +1,6 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;public class PullRequestReviewInvitationChanged extends PullRequestEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.javasimilarity index 75%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.javaindex 7f752d9581..c94edd3f3d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.event.MarkdownAware;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.event.MarkdownAware;public class PullRequestStatusChangeEvent extends PullRequestChangeEvent implements MarkdownAware {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.javasimilarity index 77%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.javaindex 6d3900426b..68a4c77ca0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequestUpdate;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequestUpdate;@Editable(name="has new commits")public class PullRequestUpdated extends PullRequestChangeEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.javasimilarity index 80%rename from gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.javarename to server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.javaindex 770f1c0bd4..63ad028ae9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java+++ b/server.core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.java@@ -1,10 +1,10 @@-package com.gitplex.core.event.pullrequest;+package com.gitplex.server.core.event.pullrequest;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequestVerification;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequestVerification;@Editable(name="ran verification", icon="fa fa-cog")public class PullRequestVerificationRunning extends PullRequestChangeEvent {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.javaindex 03d634cad0..d5fbc223e9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.List;@@ -6,15 +6,15 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Ignored;-import com.gitplex.core.gatekeeper.checkresult.Passed;-import com.gitplex.core.gatekeeper.checkresult.Pending;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Ignored;+import com.gitplex.server.core.gatekeeper.checkresult.Passed;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;@Editablepublic abstract class AbstractGateKeeper implements GateKeeper {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.javasimilarity index 79%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.javaindex e4fe607b14..0313967a0b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.java@@ -1,14 +1,14 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.ArrayList;import java.util.List;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Passed;-import com.gitplex.core.gatekeeper.checkresult.Pending;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Horizontal;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Passed;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;@Editable(name="And Composition", icon="fa-object-group", order=100,category=GateKeeper.CATEGORY_COMPOSITION,diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.javaindex 2ae2059fe8..eeee92463f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.ArrayList;import java.util.Iterator;@@ -7,8 +7,8 @@ import java.util.List;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;public abstract class AndOrGateKeeper extends CompositeGateKeeper {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.javaindex 9872a70177..4ad7a59ded 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.Collection;@@ -6,13 +6,13 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=100, icon="fa-group", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit is approved by specified number of users "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.javaindex a3396475db..b65c241e7f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.java@@ -1,20 +1,20 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.GitPlex;-import com.gitplex.core.annotation.AccountChoice;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.manager.AccountManager;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.annotation.AccountChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.manager.AccountManager;@Editable(order=200, icon="fa-user", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit is approved by specified user")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.javasimilarity index 83%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.javaindex 01b8aa2a6d..f4822f653d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.java@@ -1,11 +1,11 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;public abstract class CompositeGateKeeper extends AbstractGateKeeper {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.javaindex 9734935837..9b88f85998 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.java@@ -1,16 +1,16 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Passed;-import com.gitplex.core.gatekeeper.checkresult.Pending;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Horizontal;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Passed;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;@Editable(name="Conditional Composition", order=300, icon="fa-object-group",category=GateKeeper.CATEGORY_COMPOSITION,diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.javasimilarity index 70%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.javaindex d1d6129992..ee17d17493 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.java@@ -1,12 +1,12 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editablepublic class DefaultGateKeeper extends AbstractGateKeeper {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.javaindex 4f382531d3..0ac0adf348 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.Collection;@@ -6,13 +6,13 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=300, icon="fa-group", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit gets specified number "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.javasimilarity index 81%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.javaindex deb7d6c840..a791f7f3f3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.java@@ -1,19 +1,19 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.GitPlex;-import com.gitplex.core.annotation.AccountChoice;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.manager.AccountManager;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.annotation.AccountChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.manager.AccountManager;@Editable(order=300, icon="fa-group", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit is disapproved by specified user. "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.javaindex a34677e21b..a003deb904 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.io.Serializable;@@ -6,11 +6,11 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(name="Misc")public interface GateKeeper extends Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.javaindex b36598a50c..6db837bdbf 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.java@@ -1,15 +1,15 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Passed;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Horizontal;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Passed;@Editable(name="Not Composition", order=400, icon="fa-object-group", category=GateKeeper.CATEGORY_COMPOSITION,description="This gatekeeper will be passed if contained gatekeeper is not passed")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.javasimilarity index 79%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.javaindex 841e778acc..04b46b56d4 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.java@@ -1,14 +1,14 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.ArrayList;import java.util.List;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Passed;-import com.gitplex.core.gatekeeper.checkresult.Pending;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.commons.wicket.editable.annotation.Horizontal;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Passed;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;@Editable(name="Or Composition", order=200, icon="fa-object-group", category=GateKeeper.CATEGORY_COMPOSITION,description="This gatekeeper will be passed if any of the contained gatekeepers is passed")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.javaindex 05eb43d016..d0c51c105d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.ArrayList;import java.util.List;@@ -7,14 +7,14 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.validation.ClassValidating;import com.gitplex.commons.validation.Validatable;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=200, icon="fa-wrench", description="This gatekeeper will be passed if one of specified operations is performed")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.javaindex ab92aab7f1..860b562a0c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.java@@ -1,17 +1,17 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.errors.IncorrectObjectTypeException;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.util.ExceptionUtils;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=2000, icon="fa-ext fa-repo-lock", description="This gatekeeper will be passed if the push "+ "operation does not rewrite history of target branch. Rewriting history of public branches "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.javaindex 45c0e89860..4b84678588 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.io.IOException;@@ -7,12 +7,12 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.revwalk.RevWalkUtils;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=3000, icon="fa-ext fa-file-diff", description="This gatekeeper will be passed if the pull request "+ "is submitted with gerrit style patch, that is, only one commit is submitted for review at "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.javaindex 7bde5eff77..e3ca252738 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.java@@ -1,15 +1,15 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=500, icon="fa-group", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit is submitted by a member of specified team")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.javasimilarity index 82%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.javaindex 026244dab1..3e987b346c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.java@@ -1,18 +1,18 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.GitPlex;-import com.gitplex.core.annotation.AccountChoice;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.manager.AccountManager;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.annotation.AccountChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.manager.AccountManager;@Editable(order=600, icon="fa-user", category=GateKeeper.CATEGORY_USER, description="This gatekeeper will be passed if the commit is submitted by specified user")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.javasimilarity index 83%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.javaindex c58baf0285..0369b52425 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.java@@ -1,15 +1,15 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;import com.google.common.collect.Lists;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;@Editable(order=3100, icon="fa-ext fa-branch-merge", description="This gatekeeper will be passed if "+ "head commit of target branch is merged into source branch of the pull request")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.javasimilarity index 79%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.javaindex 4d802a538f..8e47af6db3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.java@@ -1,19 +1,19 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.Collection;import java.util.HashSet;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.GitPlex;-import com.gitplex.core.annotation.TeamChoice;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.TeamManager;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.annotation.TeamChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.TeamManager;public abstract class TeamAwareGateKeeper extends AbstractGateKeeper {diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.javaindex abc5bb6352..02c6460b72 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.io.IOException;@@ -8,18 +8,18 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.treewalk.filter.TreeFilter;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.annotation.PathMatch;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.util.ChildAwareMatcher;-import com.gitplex.core.util.ParentAwareMatcher;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;import com.google.common.collect.Lists;import com.gitplex.commons.util.match.PatternMatcher;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.annotation.PathMatch;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.util.ChildAwareMatcher;+import com.gitplex.server.core.util.ParentAwareMatcher;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@Editable(order=300, icon="fa-file-text", description="This gatekeeper will be passed if specified files are modified")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.javasimilarity index 83%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.javaindex 39b9240920..e1b3644187 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.java@@ -1,21 +1,21 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.core.annotation.RefMatch;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.util.ChildAwareMatcher;-import com.gitplex.core.util.ParentAwareMatcher;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;import com.google.common.collect.Lists;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.util.match.PatternMatcher;import com.gitplex.commons.wicket.editable.annotation.Editable;import com.gitplex.core.util.includeexclude.IncludeExcludeParser;+import com.gitplex.server.core.annotation.RefMatch;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.util.ChildAwareMatcher;+import com.gitplex.server.core.util.ParentAwareMatcher;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@Editable(order=100, icon="fa-code-fork", description="This gatekeeper will be passed if specified refs is being touched")diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.javaindex 9f3d2130a5..adb4e277af 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper;+package com.gitplex.server.core.gatekeeper;import java.util.Collection;@@ -6,16 +6,16 @@ import javax.validation.constraints.Min;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestVerification;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.manager.PullRequestVerificationManager;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestVerification;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.manager.PullRequestVerificationManager;@Editable(icon="fa-check-circle", order=1000,description="This gatekeeper will be satisfied if commit is verified successfully "diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.javasimilarity index 82%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.javaindex 8b2c076cc2..e5cfc8a62f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper.checkresult;+package com.gitplex.server.core.gatekeeper.checkresult;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.javaindex 9b243075f3..1b6c874f00 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper.checkresult;+package com.gitplex.server.core.gatekeeper.checkresult;import java.io.Serializable;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.javaindex 0b019ad3db..ca36f6f440 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper.checkresult;+package com.gitplex.server.core.gatekeeper.checkresult;import java.util.ArrayList;diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.javasimilarity index 82%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.javaindex 2b2b18da9f..6692b695ae 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper.checkresult;+package com.gitplex.server.core.gatekeeper.checkresult;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.java b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.javarename to server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.javaindex 592c3fea74..8605de8bee 100644--- a/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.java+++ b/server.core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.java@@ -1,4 +1,4 @@-package com.gitplex.core.gatekeeper.checkresult;+package com.gitplex.server.core.gatekeeper.checkresult;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java b/server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.javasimilarity index 95%rename from gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.javarename to server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.javaindex 880ccc9446..23d84ccf1a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java+++ b/server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.java@@ -1,4 +1,4 @@-package com.gitplex.core.hookcallback;+package com.gitplex.server.core.hookcallback;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -19,15 +19,15 @@ import org.eclipse.jgit.lib.RefUpdate;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.manager.DepotManager;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.UnitOfWork;import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.manager.DepotManager;@SuppressWarnings("serial")@Singletondiff --git a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java b/server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.javarename to server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.javaindex 2da077d786..fd8dac7cc2 100644--- a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java+++ b/server.core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.java@@ -1,4 +1,4 @@-package com.gitplex.core.hookcallback;+package com.gitplex.server.core.hookcallback;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -17,18 +17,18 @@ import org.apache.commons.io.IOUtils;import org.apache.shiro.SecurityUtils;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.ObjectPermission;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.ObjectPermission;@SuppressWarnings("serial")@Singletondiff --git a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.java b/server.core/src/main/java/com/gitplex/server/core/hookcallback/Output.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.javarename to server.core/src/main/java/com/gitplex/server/core/hookcallback/Output.javaindex 83cb56b71d..96088fc79c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.java+++ b/server.core/src/main/java/com/gitplex/server/core/hookcallback/Output.java@@ -1,4 +1,4 @@-package com.gitplex.core.hookcallback;+package com.gitplex.server.core.hookcallback;import java.io.IOException;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/AccountManager.javasimilarity index 95%rename from gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/AccountManager.javaindex aa014d8ec8..2cd1cc12e5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/AccountManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;@@ -6,8 +6,8 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.core.entity.Account;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;public interface AccountManager extends EntityManager<Account> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.javasimilarity index 80%rename from gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.javaindex ed1561bfca..a02317a24a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.java@@ -1,8 +1,8 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.io.File;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public interface AttachmentManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.javasimilarity index 59%rename from gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.javaindex 193dce612a..82b3f75710 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.manager.support.BatchWorker;import com.gitplex.commons.util.concurrent.Prioritized;+import com.gitplex.server.core.manager.support.BatchWorker;public interface BatchWorkManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.javaindex a48f74d72c..6784b7eca7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.java@@ -1,11 +1,11 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.BranchWatch;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.BranchWatch;+import com.gitplex.server.core.entity.Depot;public interface BranchWatchManager extends EntityManager<BranchWatch> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.javaindex dfb9dc4019..b60e120cf3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.java@@ -1,12 +1,12 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;import java.util.Map;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.CompareContext;public interface CodeCommentInfoManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.javasimilarity index 72%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.javaindex feffab7a53..dab93cb766 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import java.util.List;@@ -7,11 +7,11 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.codecomment.CodeCommentEvent;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.codecomment.CodeCommentEvent;public interface CodeCommentManager extends EntityManager<CodeComment> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.javasimilarity index 61%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.javaindex dd65a95780..cb3851003e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.java@@ -1,11 +1,11 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentRelation;-import com.gitplex.core.entity.PullRequest;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentRelation;+import com.gitplex.server.core.entity.PullRequest;public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.javasimilarity index 67%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.javaindex 3383df1ed4..c2e56ee75e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.CodeCommentReply;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.CodeCommentReply;public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.javaindex fd0444848a..d1093a8931 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.CodeCommentStatusChange;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.CodeCommentStatusChange;public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.javaindex d9f0d92fba..99fa843948 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.java@@ -1,12 +1,12 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;import java.util.Set;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.git.NameAndEmail;+import com.gitplex.server.core.entity.Depot;public interface CommitInfoManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/ConfigManager.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/ConfigManager.javaindex 76702e969c..e87b13736f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/ConfigManager.java@@ -1,13 +1,13 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import javax.annotation.Nullable;-import com.gitplex.core.entity.Config;-import com.gitplex.core.setting.BackupSetting;-import com.gitplex.core.setting.MailSetting;-import com.gitplex.core.setting.SecuritySetting;-import com.gitplex.core.setting.SystemSetting;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Config;+import com.gitplex.server.core.setting.BackupSetting;+import com.gitplex.server.core.setting.MailSetting;+import com.gitplex.server.core.setting.SecuritySetting;+import com.gitplex.server.core.setting.SystemSetting;public interface ConfigManager extends EntityManager<Config> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/DataManager.javasimilarity index 71%rename from gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/DataManager.javaindex 10627e2610..502e4fb9f0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/DataManager.java@@ -1,11 +1,11 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;import javax.annotation.Nullable;-import com.gitplex.core.setting.BackupSetting;import com.gitplex.commons.util.init.ManualConfig;+import com.gitplex.server.core.setting.BackupSetting;public interface DataManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/DepotManager.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/DepotManager.javaindex 8218865d1d..85ec189ca9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/DepotManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;@@ -6,9 +6,9 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.Repository;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;public interface DepotManager extends EntityManager<Depot> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/MailManager.javasimilarity index 77%rename from gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/MailManager.javaindex f5d3894fe5..87e0dd5f55 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/MailManager.java@@ -1,8 +1,8 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;-import com.gitplex.core.setting.MailSetting;+import com.gitplex.server.core.setting.MailSetting;public interface MailManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.javaindex 22e5edb417..f10ebe1da0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.java@@ -1,13 +1,13 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamMembership;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.TeamMembership;public interface OrganizationMembershipManager extends EntityManager<OrganizationMembership> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.javasimilarity index 68%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.javaindex 55de1295f3..ad091a5df8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.PullRequestComment;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequestComment;public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.javasimilarity index 77%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.javaindex efc8a822c0..2be201ed8a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.java@@ -1,10 +1,10 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public interface PullRequestInfoManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.javaindex 2b18d8fe5e..5783d7dc67 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.java@@ -1,17 +1,17 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import java.util.List;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.entity.support.IntegrationPreview;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.entity.support.IntegrationPreview;public interface PullRequestManager extends EntityManager<PullRequest> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.javaindex a85adc3ac9..5f6890150e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.PullRequestReference;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequestReference;public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.javasimilarity index 64%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.javaindex c749d9ff59..d16461a4b1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.java@@ -1,12 +1,12 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import java.util.Date;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;public interface PullRequestReviewInvitationManager extends EntityManager<PullRequestReviewInvitation> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.javasimilarity index 72%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.javaindex e53ceee119..d72df6b785 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.java@@ -1,14 +1,14 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.entity.PullRequestUpdate;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.entity.PullRequestUpdate;public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.javasimilarity index 60%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.javaindex 548403c3fa..492fe70b6c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.PullRequestStatusChange;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequestStatusChange;public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.javasimilarity index 59%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.javaindex 4cb3bafd08..af3cbf786a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.PullRequestTask;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequestTask;public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.javasimilarity index 81%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.javaindex f021d439e5..7d03a7bb5a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.java@@ -1,12 +1,12 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.List;import javax.annotation.Nullable;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequestUpdate;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequestUpdate;public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdate> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.javasimilarity index 75%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.javaindex 6c9691a275..9cba1f7730 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.java@@ -1,10 +1,10 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestVerification;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestVerification;public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.javasimilarity index 59%rename from gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.javaindex 5cb7c3696a..f1d39d87d5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.java@@ -1,7 +1,7 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;-import com.gitplex.core.entity.PullRequestWatch;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.PullRequestWatch;public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/StorageManager.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/StorageManager.javaindex 7970025d3b..15042872c9 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/StorageManager.java@@ -1,8 +1,8 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.io.File;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public interface StorageManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.javasimilarity index 67%rename from gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.javaindex 40bcd40506..1c5e9b3b23 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.java@@ -1,10 +1,10 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.TeamAuthorization;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.TeamAuthorization;public interface TeamAuthorizationManager extends EntityManager<TeamAuthorization> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/TeamManager.javasimilarity index 82%rename from gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/TeamManager.javaindex 57e724f776..c5b59baddb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/TeamManager.java@@ -1,10 +1,10 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;public interface TeamManager extends EntityManager<Team> {/**diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.javasimilarity index 71%rename from gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.javaindex 9e5e0debb5..44b4727d97 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.java@@ -1,10 +1,10 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.TeamMembership;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.TeamMembership;public interface TeamMembershipManager extends EntityManager<TeamMembership> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/UrlManager.javasimilarity index 50%rename from gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/UrlManager.javaindex e96715012a..1faef4ab26 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/UrlManager.java@@ -1,14 +1,14 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.support.CodeCommentActivity;public interface UrlManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.javasimilarity index 67%rename from gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.javaindex 318bde71e9..79c32ed857 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.java@@ -1,13 +1,13 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.UserAuthorization;import com.gitplex.commons.hibernate.dao.EntityManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.UserAuthorization;public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.javasimilarity index 65%rename from gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.javaindex 14308f73aa..7de13431a6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.java@@ -1,13 +1,13 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;public interface VisitInfoManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.java b/server.core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.javarename to server.core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.javaindex b6045605ef..db88fe3dc0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager;+package com.gitplex.server.core.manager;import java.util.Collection;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.javaindex 7cf03b4f01..a21aee3ac8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Iterator;import java.util.List;@@ -13,16 +13,6 @@ import org.hibernate.Query;import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.support.IntegrationPolicy;-import com.gitplex.core.event.lifecycle.SystemStarting;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.PullRequestManager;import com.google.common.collect.BiMap;import com.google.common.collect.HashBiMap;import com.gitplex.commons.hibernate.Sessional;@@ -31,6 +21,16 @@ import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.Listen;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.support.IntegrationPolicy;+import com.gitplex.server.core.event.lifecycle.SystemStarting;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.PullRequestManager;@Singletonpublic class DefaultAccountManager extends AbstractEntityManager<Account> implements AccountManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.javaindex 9e299d100f..fd12074f55 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.IOException;@@ -11,13 +11,6 @@ import org.quartz.ScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.event.lifecycle.SystemStarted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.AttachmentManager;-import com.gitplex.core.manager.StorageManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityPersisted;@@ -26,6 +19,13 @@ import com.gitplex.commons.loader.Listen;import com.gitplex.commons.schedule.SchedulableTask;import com.gitplex.commons.schedule.TaskScheduler;import com.gitplex.commons.util.FileUtils;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.event.lifecycle.SystemStarted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.AttachmentManager;+import com.gitplex.server.core.manager.StorageManager;@Singletonpublic class DefaultAttachmentManager implements AttachmentManager, SchedulableTask {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.javaindex cda89f9a20..525ff86cfb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.ArrayList;import java.util.Collection;@@ -15,14 +15,14 @@ import javax.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.event.lifecycle.SystemStarted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.WorkExecutor;-import com.gitplex.core.manager.support.BatchWorker;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.concurrent.Prioritized;import com.gitplex.commons.util.concurrent.PrioritizedRunnable;+import com.gitplex.server.core.event.lifecycle.SystemStarted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.WorkExecutor;+import com.gitplex.server.core.manager.support.BatchWorker;@Singletonpublic class DefaultBatchWorkManager implements BatchWorkManager, Runnable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.javasimilarity index 82%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.javaindex f569a4e0b4..8233d14fbd 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;@@ -7,14 +7,14 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.BranchWatch;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.BranchWatchManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.BranchWatch;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.BranchWatchManager;@Singletonpublic class DefaultBranchWatchManager extends AbstractEntityManager<BranchWatch> implements BranchWatchManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.javaindex afebd7f8da..fea53b32a5 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.Serializable;@@ -23,24 +23,24 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.event.codecomment.CodeCommentCreated;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.CodeCommentInfoManager;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.support.BatchWorker;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.UnitOfWork;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.concurrent.Prioritized;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.event.codecomment.CodeCommentCreated;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.CodeCommentInfoManager;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.support.BatchWorker;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.javaindex 16a54710c2..4e683c9a21 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.ArrayList;import java.util.Collection;@@ -15,26 +15,6 @@ import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentRelation;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.event.codecomment.CodeCommentActivityEvent;-import com.gitplex.core.event.codecomment.CodeCommentCreated;-import com.gitplex.core.event.codecomment.CodeCommentEvent;-import com.gitplex.core.event.codecomment.CodeCommentResolved;-import com.gitplex.core.event.codecomment.CodeCommentUnresolved;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CodeCommentStatusChangeManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.UrlManager;-import com.gitplex.core.util.markdown.MentionParser;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;@@ -44,6 +24,26 @@ import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.markdown.MarkdownManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentRelation;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.event.codecomment.CodeCommentActivityEvent;+import com.gitplex.server.core.event.codecomment.CodeCommentCreated;+import com.gitplex.server.core.event.codecomment.CodeCommentEvent;+import com.gitplex.server.core.event.codecomment.CodeCommentResolved;+import com.gitplex.server.core.event.codecomment.CodeCommentUnresolved;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.UrlManager;+import com.gitplex.server.core.util.markdown.MentionParser;@Singletonpublic class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.javaindex 3dcb338fab..c86641c53a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;import java.util.Collections;@@ -14,24 +14,24 @@ import javax.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentRelation;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.event.codecomment.CodeCommentCreated;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentCreated;-import com.gitplex.core.manager.CodeCommentInfoManager;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CodeCommentRelationManager;-import com.gitplex.core.manager.PullRequestInfoManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.VisitInfoManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentRelation;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.event.codecomment.CodeCommentCreated;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentCreated;+import com.gitplex.server.core.manager.CodeCommentInfoManager;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CodeCommentRelationManager;+import com.gitplex.server.core.manager.PullRequestInfoManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.VisitInfoManager;@Singletonpublic class DefaultCodeCommentRelationManager extends AbstractEntityManager<CodeCommentRelation>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.javasimilarity index 80%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.javaindex 6a1aaf4498..ae234d9154 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.java@@ -1,16 +1,16 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.CodeCommentReply;-import com.gitplex.core.event.codecomment.CodeCommentReplied;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CodeCommentReplyManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.CodeCommentReply;+import com.gitplex.server.core.event.codecomment.CodeCommentReplied;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CodeCommentReplyManager;@Singletonpublic class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCommentReply>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.javasimilarity index 70%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.javaindex 6a323f44c4..40773de261 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.java@@ -1,12 +1,12 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.manager.CodeCommentStatusChangeManager;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;@Singletonpublic class DefaultCodeCommentStatusChangeManager extends AbstractEntityManager<CodeCommentStatusChange>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.javaindex 04da67e433..245002abe8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.IOException;@@ -33,15 +33,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.support.BatchWorker;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.NameAndEmail;import com.gitplex.commons.hibernate.UnitOfWork;@@ -49,6 +40,15 @@ import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.util.concurrent.Prioritized;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.support.BatchWorker;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.javaindex 32d4a11b54..04ef456aad 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.java@@ -1,24 +1,24 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Config;-import com.gitplex.core.entity.Config.Key;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.DataManager;-import com.gitplex.core.setting.BackupSetting;-import com.gitplex.core.setting.MailSetting;-import com.gitplex.core.setting.SecuritySetting;-import com.gitplex.core.setting.SystemSetting;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Config;+import com.gitplex.server.core.entity.Config.Key;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.DataManager;+import com.gitplex.server.core.setting.BackupSetting;+import com.gitplex.server.core.setting.MailSetting;+import com.gitplex.server.core.setting.SecuritySetting;+import com.gitplex.server.core.setting.SystemSetting;@Singletonpublic class DefaultConfigManager extends AbstractEntityManager<Config> implements ConfigManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.javasimilarity index 90%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.javaindex 1a5df225bd..5d77244ea7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.ObjectStreamException;@@ -15,19 +15,6 @@ import org.joda.time.format.DateTimeFormat;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Config;-import com.gitplex.core.entity.Config.Key;-import com.gitplex.core.event.lifecycle.SystemStarting;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.DataManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.setting.BackupSetting;-import com.gitplex.core.setting.MailSetting;-import com.gitplex.core.setting.SecuritySetting;-import com.gitplex.core.setting.SystemSetting;import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@ -44,6 +31,19 @@ import com.gitplex.commons.schedule.TaskScheduler;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.init.ManualConfig;import com.gitplex.commons.util.init.Skippable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Config;+import com.gitplex.server.core.entity.Config.Key;+import com.gitplex.server.core.event.lifecycle.SystemStarting;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.DataManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.setting.BackupSetting;+import com.gitplex.server.core.setting.MailSetting;+import com.gitplex.server.core.setting.SecuritySetting;+import com.gitplex.server.core.setting.SystemSetting;@Singletonpublic class DefaultDataManager implements DataManager, Serializable {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.javaindex eb008d3640..6dd2978eaa 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.IOException;@@ -25,27 +25,6 @@ import org.hibernate.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.entity.support.IntegrationPolicy;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.depot.DepotRenamed;-import com.gitplex.core.event.depot.DepotTransferred;-import com.gitplex.core.event.lifecycle.SystemStarted;-import com.gitplex.core.event.lifecycle.SystemStarting;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.CodeCommentInfoManager;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.PullRequestInfoManager;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;import com.google.common.collect.BiMap;@@ -61,6 +40,27 @@ import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.Pair;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.entity.support.IntegrationPolicy;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.depot.DepotRenamed;+import com.gitplex.server.core.event.depot.DepotTransferred;+import com.gitplex.server.core.event.lifecycle.SystemStarted;+import com.gitplex.server.core.event.lifecycle.SystemStarting;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.CodeCommentInfoManager;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.PullRequestInfoManager;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Singletonpublic class DefaultDepotManager extends AbstractEntityManager<Depot> implements DepotManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.javaindex 2f475304ab..aeb3ca9245 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.net.InetAddress;import java.net.UnknownHostException;@@ -18,9 +18,9 @@ import org.slf4j.LoggerFactory;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.dao.Dao;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.setting.MailSetting;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.setting.MailSetting;@Singletonpublic class DefaultMailManager implements MailManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.javaindex eaae6ba955..2e95abc5d1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;@@ -7,17 +7,17 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.manager.TeamMembershipManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.manager.TeamMembershipManager;@Singletonpublic class DefaultOrganizationMembershipManager extends AbstractEntityManager<OrganizationMembership>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.javasimilarity index 80%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.javaindex 6b59d3e520..1ff2935caf 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.java@@ -1,18 +1,18 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.entity.support.LastEvent;-import com.gitplex.core.event.pullrequest.PullRequestCommentCreated;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.core.manager.PullRequestManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.entity.support.LastEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.core.manager.PullRequestManager;@Singletonpublic class DefaultPullRequestCommentManager extends AbstractEntityManager<PullRequestComment>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.javaindex 86ef73b603..4f660da9ff 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.IOException;@@ -23,16 +23,6 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.PullRequestInfoManager;-import com.gitplex.core.manager.PullRequestUpdateManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.support.BatchWorker;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.UnitOfWork;@@ -41,6 +31,16 @@ import com.gitplex.commons.hibernate.dao.EntityPersisted;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.concurrent.Prioritized;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.PullRequestInfoManager;+import com.gitplex.server.core.manager.PullRequestUpdateManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.support.BatchWorker;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.javaindex 5542dd5e79..571e0122cf 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.java@@ -1,16 +1,16 @@-package com.gitplex.core.manager.impl;--import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofOpen;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofSource;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofSourceDepot;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofSubmitter;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofTarget;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofTargetDepot;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+package com.gitplex.server.core.manager.impl;++import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofOpen;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSource;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSourceDepot;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSubmitter;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTarget;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTargetDepot;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;import java.util.Collection;import java.util.Date;@@ -44,40 +44,6 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.entity.PullRequestStatusChange.Type;-import com.gitplex.core.entity.support.CloseInfo;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.entity.support.IntegrationPolicy;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.pullrequest.IntegrationPreviewCalculated;-import com.gitplex.core.event.pullrequest.PullRequestOpened;-import com.gitplex.core.event.pullrequest.PullRequestPendingApproval;-import com.gitplex.core.event.pullrequest.PullRequestPendingIntegration;-import com.gitplex.core.event.pullrequest.PullRequestPendingUpdate;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.gatekeeper.checkresult.Failed;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.gatekeeper.checkresult.Pending;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestReviewInvitationManager;-import com.gitplex.core.manager.PullRequestStatusChangeManager;-import com.gitplex.core.manager.PullRequestUpdateManager;-import com.gitplex.core.manager.support.BatchWorker;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.util.ChildAwareMatcher;-import com.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;import com.google.common.collect.Lists;@@ -93,6 +59,40 @@ import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.markdown.MarkdownManager;import com.gitplex.commons.util.concurrent.Prioritized;import com.gitplex.commons.util.match.PatternMatcher;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.entity.PullRequestStatusChange.Type;+import com.gitplex.server.core.entity.support.CloseInfo;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.entity.support.IntegrationPolicy;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.pullrequest.IntegrationPreviewCalculated;+import com.gitplex.server.core.event.pullrequest.PullRequestOpened;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingApproval;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingIntegration;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingUpdate;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.gatekeeper.checkresult.Failed;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.gatekeeper.checkresult.Pending;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;+import com.gitplex.server.core.manager.PullRequestUpdateManager;+import com.gitplex.server.core.manager.support.BatchWorker;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.util.ChildAwareMatcher;+import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@Singletonpublic class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.javasimilarity index 80%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.javaindex dd555c0e3b..000351e94d 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Date;@@ -7,19 +7,19 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReference;-import com.gitplex.core.event.MarkdownAware;-import com.gitplex.core.event.pullrequest.PullRequestChangeEvent;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.PullRequestReferenceManager;-import com.gitplex.core.util.markdown.PullRequestParser;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.markdown.MarkdownManager;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReference;+import com.gitplex.server.core.event.MarkdownAware;+import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.PullRequestReferenceManager;+import com.gitplex.server.core.util.markdown.PullRequestParser;@Singletonpublic class DefaultPullRequestReferenceManager extends AbstractEntityManager<PullRequestReference>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.javasimilarity index 81%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.javaindex ff40eaa127..8159654944 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;import java.util.Date;@@ -8,18 +8,18 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;-import com.gitplex.core.manager.PullRequestReviewInvitationManager;-import com.gitplex.core.manager.PullRequestReviewManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;+import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.core.manager.PullRequestReviewManager;@Singletonpublic class DefaultPullRequestReviewInvitationManager extends AbstractEntityManager<PullRequestReviewInvitation>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.javaindex 0ee708d941..b8d58d52c1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Date;import java.util.Iterator;@@ -10,21 +10,21 @@ import javax.inject.Singleton;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequestStatusChange.Type;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestReviewManager;-import com.gitplex.core.manager.PullRequestStatusChangeManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequestStatusChange.Type;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestReviewManager;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;@Singletonpublic class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.javasimilarity index 75%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.javaindex 979570b3c3..e38238f533 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.java@@ -1,14 +1,14 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.manager.PullRequestStatusChangeManager;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;@Singletonpublic class DefaultPullRequestStatusChangeManager extends AbstractEntityManager<PullRequestStatusChange>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.javaindex 4620ad8c0f..6fd9188184 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.java@@ -1,9 +1,9 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;-import static com.gitplex.core.entity.PullRequest.Status.PENDING_INTEGRATE;-import static com.gitplex.core.entity.PullRequestTask.Type.INTEGRATE;-import static com.gitplex.core.entity.PullRequestTask.Type.REVIEW;-import static com.gitplex.core.entity.PullRequestTask.Type.UPDATE;+import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_INTEGRATE;+import static com.gitplex.server.core.entity.PullRequestTask.Type.INTEGRATE;+import static com.gitplex.server.core.entity.PullRequestTask.Type.REVIEW;+import static com.gitplex.server.core.entity.PullRequestTask.Type.UPDATE;import javax.inject.Inject;import javax.inject.Singleton;@@ -11,21 +11,6 @@ import javax.inject.Singleton;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.PullRequestTask;-import com.gitplex.core.event.TaskChangeEvent;-import com.gitplex.core.event.pullrequest.PullRequestPendingApproval;-import com.gitplex.core.event.pullrequest.PullRequestPendingIntegration;-import com.gitplex.core.event.pullrequest.PullRequestPendingUpdate;-import com.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.event.pullrequest.PullRequestUpdated;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.manager.PullRequestTaskManager;-import com.gitplex.core.manager.UrlManager;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import com.gitplex.commons.hibernate.Transactional;@@ -34,6 +19,21 @@ import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.PullRequestTask;+import com.gitplex.server.core.event.TaskChangeEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingApproval;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingIntegration;+import com.gitplex.server.core.event.pullrequest.PullRequestPendingUpdate;+import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.manager.PullRequestTaskManager;+import com.gitplex.server.core.manager.UrlManager;/*** This class manages pull request tasks and send task notifications if necessary.diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.javaindex cf5a882098..d3cca308c7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.List;@@ -11,14 +11,6 @@ import org.eclipse.jgit.transport.RefSpec;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.support.LastEvent;-import com.gitplex.core.event.pullrequest.PullRequestUpdated;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestUpdateManager;import com.google.common.base.Throwables;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.Sessional;@@ -28,6 +20,14 @@ import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.support.LastEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestUpdateManager;@Singletonpublic class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.javaindex 3842abb5fe..63e94ff400 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;import java.util.Date;@@ -8,22 +8,22 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.PullRequestVerification;-import com.gitplex.core.entity.PullRequestStatusChange.Type;-import com.gitplex.core.entity.PullRequestVerification.Status;-import com.gitplex.core.event.pullrequest.PullRequestVerificationRunning;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestStatusChangeManager;-import com.gitplex.core.manager.PullRequestVerificationManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.ListenerRegistry;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.PullRequestVerification;+import com.gitplex.server.core.entity.PullRequestStatusChange.Type;+import com.gitplex.server.core.entity.PullRequestVerification.Status;+import com.gitplex.server.core.event.pullrequest.PullRequestVerificationRunning;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;+import com.gitplex.server.core.manager.PullRequestVerificationManager;@Singletonpublic class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.javaindex 59527e1839..b6fbccfac1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;import java.util.Date;@@ -12,31 +12,6 @@ import javax.inject.Singleton;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.BranchWatch;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequestWatch;-import com.gitplex.core.entity.PullRequestStatusChange.Type;-import com.gitplex.core.event.MarkdownAware;-import com.gitplex.core.event.pullrequest.IntegrationPreviewCalculated;-import com.gitplex.core.event.pullrequest.PullRequestChangeEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;-import com.gitplex.core.event.pullrequest.PullRequestCodeCommentCreated;-import com.gitplex.core.event.pullrequest.PullRequestCommentCreated;-import com.gitplex.core.event.pullrequest.PullRequestOpened;-import com.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.event.pullrequest.PullRequestUpdated;-import com.gitplex.core.event.pullrequest.PullRequestVerificationRunning;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.BranchWatchManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.core.manager.PullRequestWatchManager;-import com.gitplex.core.manager.UrlManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.util.markdown.MentionParser;import com.google.common.collect.Sets;import com.gitplex.commons.git.NameAndEmail;import com.gitplex.commons.hibernate.Transactional;@@ -45,6 +20,31 @@ import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.markdown.MarkdownManager;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.BranchWatch;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequestWatch;+import com.gitplex.server.core.entity.PullRequestStatusChange.Type;+import com.gitplex.server.core.event.MarkdownAware;+import com.gitplex.server.core.event.pullrequest.IntegrationPreviewCalculated;+import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentCreated;+import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;+import com.gitplex.server.core.event.pullrequest.PullRequestOpened;+import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;+import com.gitplex.server.core.event.pullrequest.PullRequestVerificationRunning;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.BranchWatchManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.core.manager.PullRequestWatchManager;+import com.gitplex.server.core.manager.UrlManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.util.markdown.MentionParser;@Singletonpublic class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRequestWatch>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.javaindex dbdff8f594..945f0b519a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.io.IOException;@@ -9,15 +9,15 @@ import javax.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStarting;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.StorageManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.FileUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStarting;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.StorageManager;@Singletonpublic class DefaultStorageManager implements StorageManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.javaindex 414fc0e736..3707c73d7f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;@@ -8,11 +8,6 @@ import javax.inject.Singleton;import org.hibernate.Query;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.event.depot.DepotTransferred;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;@@ -20,6 +15,11 @@ import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.loader.Listen;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.event.depot.DepotTransferred;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Singletonpublic class DefaultTeamAuthorizationManager extends AbstractEntityManager<TeamAuthorization>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.javasimilarity index 83%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.javaindex 0dc752eaa2..5b0348fcf1 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Iterator;@@ -7,16 +7,16 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.manager.TeamManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.manager.TeamManager;@Singletonpublic class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.javasimilarity index 86%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.javaindex ff7bc31775..8d2f6cd66b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;@@ -7,14 +7,14 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.TeamMembershipManager;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.TeamMembershipManager;@Singletonpublic class DefaultTeamMembershipManager extends AbstractEntityManager<TeamMembership>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.javasimilarity index 85%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.javaindex 2429bd0a8d..e72b0b655a 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;@@ -7,17 +7,17 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.Sessional;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.AbstractEntityManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Singletonpublic class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.javasimilarity index 88%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.javaindex 9960c5b5e5..abeb6b3656 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.io.File;import java.nio.ByteBuffer;@@ -11,25 +11,25 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentRelation;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.event.codecomment.CodeCommentActivityEvent;-import com.gitplex.core.event.codecomment.CodeCommentCreated;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.event.pullrequest.PullRequestCommentCreated;-import com.gitplex.core.event.pullrequest.PullRequestOpened;-import com.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.VisitInfoManager;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.FileUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentRelation;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.event.codecomment.CodeCommentActivityEvent;+import com.gitplex.server.core.event.codecomment.CodeCommentCreated;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;+import com.gitplex.server.core.event.pullrequest.PullRequestOpened;+import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.VisitInfoManager;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.java b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.javarename to server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.javaindex f260b561ca..6eac847a27 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.impl;+package com.gitplex.server.core.manager.impl;import java.util.Collection;import java.util.List;@@ -9,12 +9,12 @@ import java.util.concurrent.TimeoutException;import javax.inject.Singleton;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.WorkExecutor;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.util.concurrent.PrioritizedCallable;import com.gitplex.commons.util.concurrent.PrioritizedExecutor;import com.gitplex.commons.util.concurrent.PrioritizedRunnable;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.WorkExecutor;@Singletonpublic class DefaultWorkExecutor implements WorkExecutor {diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.java b/server.core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.javarename to server.core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.javaindex 4df61c755a..a982b8d6be 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.support;+package com.gitplex.server.core.manager.support;import java.util.Collection;diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.java b/server.core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.javasimilarity index 89%rename from gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.javarename to server.core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.javaindex d52e5809bb..2bb8a5ca64 100644--- a/gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.java+++ b/server.core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.java@@ -1,4 +1,4 @@-package com.gitplex.core.manager.support;+package com.gitplex.server.core.manager.support;public class IndexResult {diff --git a/gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.java b/server.core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.javarename to server.core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.javaindex 3f5db0545b..941c48dc82 100644--- a/gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.java+++ b/server.core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.java@@ -1,4 +1,4 @@-package com.gitplex.core.migration;+package com.gitplex.server.core.migration;import java.io.File;import java.util.Stack;diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.java b/server.core/src/main/java/com/gitplex/server/core/security/ObjectPermission.javasimilarity index 77%rename from gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.javarename to server.core/src/main/java/com/gitplex/server/core/security/ObjectPermission.javaindex a6c57e5674..6f01b54fce 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/ObjectPermission.java@@ -1,15 +1,15 @@-package com.gitplex.core.security;+package com.gitplex.server.core.security;import org.apache.shiro.authz.Permission;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.privilege.AccountPrivilege;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.core.security.privilege.Privilege;-import com.gitplex.core.security.privilege.SystemAdmin;-import com.gitplex.core.security.protectedobject.ProtectedObject;-import com.gitplex.core.security.protectedobject.SystemObject;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.privilege.AccountPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.Privilege;+import com.gitplex.server.core.security.privilege.SystemAdmin;+import com.gitplex.server.core.security.protectedobject.ProtectedObject;+import com.gitplex.server.core.security.protectedobject.SystemObject;/*** This class represents permissions to operate an account and its belongings.diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.java b/server.core/src/main/java/com/gitplex/server/core/security/SecurityRealm.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.javarename to server.core/src/main/java/com/gitplex/server/core/security/SecurityRealm.javaindex c9fd7b676f..d62597d360 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/SecurityRealm.java@@ -1,4 +1,4 @@-package com.gitplex.core.security;+package com.gitplex.server.core.security;import java.util.ArrayList;import java.util.Collection;@@ -10,22 +10,22 @@ import javax.inject.Singleton;import org.apache.shiro.authz.Permission;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.privilege.AccountPrivilege;-import com.gitplex.core.security.privilege.DepotPrivilege;import com.gitplex.commons.shiro.AbstractRealm;import com.gitplex.commons.shiro.AbstractUser;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.privilege.AccountPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@Singletonpublic class SecurityRealm extends AbstractRealm {diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.java b/server.core/src/main/java/com/gitplex/server/core/security/SecurityUtils.javasimilarity index 84%rename from gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.javarename to server.core/src/main/java/com/gitplex/server/core/security/SecurityUtils.javaindex 454b32385c..457a98b8f0 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/SecurityUtils.java@@ -1,4 +1,4 @@-package com.gitplex.core.security;+package com.gitplex.server.core.security;import java.util.Collection;import java.util.HashSet;@@ -8,18 +8,18 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.core.security.privilege.Privilege;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.Privilege;public class SecurityUtils extends org.apache.shiro.SecurityUtils {diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.java b/server.core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.javarename to server.core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.javaindex 6a8622e375..06cf2b56e6 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.privilege;+package com.gitplex.server.core.security.privilege;public enum AccountPrivilege implements Privilege {diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.java b/server.core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.javarename to server.core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.javaindex 3f44003321..a0ee65c132 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.privilege;+package com.gitplex.server.core.security.privilege;public enum DepotPrivilege implements Privilege {diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.java b/server.core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.javasimilarity index 69%rename from gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.javarename to server.core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.javaindex 524dcca93c..55a3235128 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.privilege;+package com.gitplex.server.core.security.privilege;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.java b/server.core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.javasimilarity index 77%rename from gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.javarename to server.core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.javaindex 92a50e91f3..d5f69377ee 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.privilege;+package com.gitplex.server.core.security.privilege;public class SystemAdmin implements Privilege {diff --git a/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.java b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.javanew file mode 100644index 0000000000..e54da2e209--- /dev/null+++ b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.java@@ -0,0 +1,7 @@+package com.gitplex.server.core.security.protectedobject;++import com.gitplex.server.core.entity.Account;++public interface AccountBelonging extends ProtectedObject {+ Account getAccount();+}diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.java b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.javasimilarity index 56%rename from gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.javarename to server.core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.javaindex 6daf057278..e8457e569c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.protectedobject;+package com.gitplex.server.core.security.protectedobject;public interface ProtectedObject {boolean has(ProtectedObject object);diff --git a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.java b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.javasimilarity index 69%rename from gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.javarename to server.core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.javaindex d18dd1fb58..45468de87b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.java+++ b/server.core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.java@@ -1,4 +1,4 @@-package com.gitplex.core.security.protectedobject;+package com.gitplex.server.core.security.protectedobject;public class SystemObject implements ProtectedObject {diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.java b/server.core/src/main/java/com/gitplex/server/core/setting/BackupSetting.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.javarename to server.core/src/main/java/com/gitplex/server/core/setting/BackupSetting.javaindex 1d4de4517c..9516db53af 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/BackupSetting.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import java.io.Serializable;import java.text.ParseException;diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.java b/server.core/src/main/java/com/gitplex/server/core/setting/MailSetting.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.javarename to server.core/src/main/java/com/gitplex/server/core/setting/MailSetting.javaindex 33debc36e1..e645e10450 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/MailSetting.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.java b/server.core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.javarename to server.core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.javaindex ae40592f38..9641e54f6b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.java b/server.core/src/main/java/com/gitplex/server/core/setting/ServerConfig.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.javarename to server.core/src/main/java/com/gitplex/server/core/setting/ServerConfig.javaindex f8b9025248..e18e654d44 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/ServerConfig.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;public interface ServerConfig {diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.java b/server.core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.javarename to server.core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.javaindex afd55780a6..e58bcea9e7 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import org.hibernate.validator.constraints.NotEmpty;diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.java b/server.core/src/main/java/com/gitplex/server/core/setting/SslConfig.javasimilarity index 78%rename from gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.javarename to server.core/src/main/java/com/gitplex/server/core/setting/SslConfig.javaindex 7ad35600f9..74c105afef 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/SslConfig.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;public interface SslConfig {int getPort();diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.java b/server.core/src/main/java/com/gitplex/server/core/setting/SystemGit.javasimilarity index 87%rename from gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.javarename to server.core/src/main/java/com/gitplex/server/core/setting/SystemGit.javaindex b7fb6c17a1..da89ef23b3 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/SystemGit.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import com.gitplex.commons.git.GitConfig;import com.gitplex.commons.wicket.editable.annotation.Editable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.java b/server.core/src/main/java/com/gitplex/server/core/setting/SystemSetting.javasimilarity index 98%rename from gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.javarename to server.core/src/main/java/com/gitplex/server/core/setting/SystemSetting.javaindex e9041b3ab4..16e99baafc 100644--- a/gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.java+++ b/server.core/src/main/java/com/gitplex/server/core/setting/SystemSetting.java@@ -1,4 +1,4 @@-package com.gitplex.core.setting;+package com.gitplex.server.core.setting;import java.io.Serializable;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.java b/server.core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.javarename to server.core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.javaindex 9c928c30f8..785707c1ba 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.java@@ -1,4 +1,4 @@-package com.gitplex.core.util;+package com.gitplex.server.core.util;import com.gitplex.commons.util.match.WildcardStringMatcher;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.java b/server.core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.javarename to server.core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.javaindex be0d1923de..52857274cb 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.java@@ -1,4 +1,4 @@-package com.gitplex.core.util;+package com.gitplex.server.core.util;/*** Besides the normal child aware match, this matcher also matchesdiff --git a/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4 b/server.core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatch.g4similarity index 100%rename from gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4rename to server.core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatch.g4diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java b/server.core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.javasimilarity index 96%rename from gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.javarename to server.core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.javaindex 43a314a532..6fbfa0d157 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.fullbranchmatch;+package com.gitplex.server.core.util.fullbranchmatch;import java.util.ArrayList;import java.util.List;@@ -10,8 +10,6 @@ import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.CommonTokenStream;import org.apache.commons.lang3.StringUtils;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.DepotAndBranch;import com.gitplex.commons.util.match.IncludeExclude;import com.gitplex.commons.util.match.Matcher;import com.gitplex.commons.util.match.WildcardUtils;@@ -20,6 +18,8 @@ import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.MatchContext;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.DepotAndBranch;public class FullBranchMatchUtils {diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExclude.g4 b/server.core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExclude.g4similarity index 100%rename from gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExclude.g4rename to server.core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExclude.g4diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.java b/server.core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.javasimilarity index 97%rename from gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.javarename to server.core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.javaindex c678fb5944..d308114f2b 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.includeexclude;+package com.gitplex.server.core.util.includeexclude;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.java b/server.core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.javarename to server.core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.javaindex 1749cfda9c..0af90f9322 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.markdown;+package com.gitplex.server.core.util.markdown;import java.util.Collection;import java.util.HashSet;@@ -10,12 +10,12 @@ import org.jsoup.nodes.Element;import org.jsoup.nodes.TextNode;import org.jsoup.select.NodeTraversor;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;import com.google.common.collect.ImmutableSet;import com.gitplex.commons.util.JsoupUtils;import com.gitplex.commons.util.TextNodeVisitor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;public class MentionParser {diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.java b/server.core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.javasimilarity index 93%rename from gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.javarename to server.core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.javaindex 7b57fd8929..230dfc5354 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.markdown;+package com.gitplex.server.core.util.markdown;import java.util.Collection;import java.util.HashSet;@@ -10,12 +10,12 @@ import org.jsoup.nodes.Element;import org.jsoup.nodes.TextNode;import org.jsoup.select.NodeTraversor;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequest;import com.google.common.collect.ImmutableSet;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.util.JsoupUtils;import com.gitplex.commons.util.TextNodeVisitor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequest;public class PullRequestParser {diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountName.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/AccountName.javaindex e6760936d7..b54d5bb44f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountName.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.javaindex 09a420ea5a..ca177cb06c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.Set;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.javaindex 3c69fe1c9d..5a00f931c8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.HashSet;import java.util.Set;@@ -7,7 +7,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import com.gitplex.core.GitPlex;+import com.gitplex.server.core.GitPlex;public class AccountNameValidator implements ConstraintValidator<AccountName, String> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotName.javasimilarity index 91%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/DepotName.javaindex 4846ee2edb..7330e8284c 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotName.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.javaindex 2ab1b55203..332056d759 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.Set;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.javaindex 49fdfe95e0..c53ca969f8 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.HashSet;import java.util.Set;@@ -7,7 +7,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import com.gitplex.core.GitPlex;+import com.gitplex.server.core.GitPlex;public class DepotNameValidator implements ConstraintValidator<DepotName, String> {diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamName.javasimilarity index 92%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/TeamName.javaindex 0bfc2ffcf9..449c9d3cca 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamName.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.javasimilarity index 76%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.javaindex 327185e981..5383ffc28f 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.Set;diff --git a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.java b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.javasimilarity index 94%rename from gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.javarename to server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.javaindex ca8efacda5..fbcc554f6e 100644--- a/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.java+++ b/server.core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.java@@ -1,4 +1,4 @@-package com.gitplex.core.util.validation;+package com.gitplex.server.core.util.validation;import java.util.HashSet;import java.util.Set;@@ -7,7 +7,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import com.gitplex.core.GitPlex;+import com.gitplex.server.core.GitPlex;public class TeamNameValidator implements ConstraintValidator<TeamName, String> {diff --git a/gitplex.core/src/main/resources/META-INF/maven/archetype-metadata.xml b/server.core/src/main/resources/META-INF/maven/archetype-metadata.xmlsimilarity index 100%rename from gitplex.core/src/main/resources/META-INF/maven/archetype-metadata.xmlrename to server.core/src/main/resources/META-INF/maven/archetype-metadata.xmldiff --git a/gitplex.core/src/main/resources/archetype-resource/pom.xml b/server.core/src/main/resources/archetype-resource/pom.xmlsimilarity index 100%rename from gitplex.core/src/main/resources/archetype-resource/pom.xmlrename to server.core/src/main/resources/archetype-resource/pom.xmldiff --git a/gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.java b/server.core/src/main/resources/archetype-resource/src/main/java/Plugin.javasimilarity index 100%rename from gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.javarename to server.core/src/main/resources/archetype-resource/src/main/java/Plugin.javadiff --git a/gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/server.core/src/main/resources/archetype-resource/src/main/java/PluginModule.javasimilarity index 100%rename from gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.javarename to server.core/src/main/resources/archetype-resource/src/main/java/PluginModule.javadiff --git a/gitplex.core/src/main/resources/git-receive-hook b/server.core/src/main/resources/git-receive-hooksimilarity index 100%rename from gitplex.core/src/main/resources/git-receive-hookrename to server.core/src/main/resources/git-receive-hookdiff --git a/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.java b/server.core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.javasimilarity index 94%rename from gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.javarename to server.core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.javaindex 52e03a4281..503736e795 100644--- a/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.java+++ b/server.core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.java@@ -1,4 +1,4 @@-package com.gitplex.core.model;+package com.gitplex.server.core.entity;import java.io.File;@@ -8,12 +8,12 @@ import org.junit.Test;import org.mockito.Matchers;import org.mockito.Mockito;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.manager.DepotManager;import com.gitplex.commons.git.AbstractGitTest;import com.gitplex.commons.loader.AppLoader;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.manager.DepotManager;public class PullRequestTest extends AbstractGitTest {diff --git a/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.java b/server.core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.javasimilarity index 97%rename from gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.javarename to server.core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.javaindex ddd74a3d2d..ba14e27a0f 100644--- a/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.java+++ b/server.core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.java@@ -1,4 +1,4 @@-package com.gitplex.core.model;+package com.gitplex.server.core.entity;import java.io.File;@@ -6,12 +6,12 @@ import org.eclipse.jgit.lib.Repository;import org.junit.Assert;import org.junit.Test;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;import com.google.common.collect.Sets;import com.gitplex.commons.git.AbstractGitTest;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;public class PullRequestUpdateTest extends AbstractGitTest {diff --git a/gitplex.http/.gitignore b/server.http/.gitignoresimilarity index 100%rename from gitplex.http/.gitignorerename to server.http/.gitignorediff --git a/gitplex.http/pom.xml b/server.http/pom.xmlsimilarity index 92%rename from gitplex.http/pom.xmlrename to server.http/pom.xmlindex 756163aaa7..1656709627 100644--- a/gitplex.http/pom.xml+++ b/server.http/pom.xml@@ -2,7 +2,7 @@<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion>- <artifactId>gitplex.http</artifactId>+ <artifactId>server.http</artifactId><version>1.0.7</version><parent><groupId>com.gitplex</groupId>@@ -30,7 +30,7 @@<dependencies><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><version>1.0.38</version></dependency></dependencies>@@ -52,6 +52,6 @@</repository></repositories><properties>- <moduleClass>com.gitplex.http.HttpModule</moduleClass>+ <moduleClass>com.server.http.HttpModule</moduleClass></properties></project>diff --git a/gitplex.http/src/main/java/com/gitplex/http/GitFilter.java b/server.http/src/main/java/com/gitplex/server/http/GitFilter.javasimilarity index 95%rename from gitplex.http/src/main/java/com/gitplex/http/GitFilter.javarename to server.http/src/main/java/com/gitplex/server/http/GitFilter.javaindex 439ba643a6..fdbde0fb50 100644--- a/gitplex.http/src/main/java/com/gitplex/http/GitFilter.java+++ b/server.http/src/main/java/com/gitplex/server/http/GitFilter.java@@ -1,4 +1,4 @@-package com.gitplex.http;+package com.gitplex.server.http;import java.io.File;import java.io.IOException;@@ -26,20 +26,20 @@ import org.eclipse.jgit.transport.PacketLineOut;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.WorkExecutor;-import com.gitplex.core.security.ObjectPermission;-import com.gitplex.core.setting.ServerConfig;import com.gitplex.commons.git.command.AdvertiseReceiveRefsCommand;import com.gitplex.commons.git.command.AdvertiseUploadRefsCommand;import com.gitplex.commons.git.command.ReceiveCommand;import com.gitplex.commons.git.command.UploadCommand;import com.gitplex.commons.git.exception.GitException;import com.gitplex.commons.util.concurrent.PrioritizedRunnable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.WorkExecutor;+import com.gitplex.server.core.security.ObjectPermission;+import com.gitplex.server.core.setting.ServerConfig;@Singletonpublic class GitFilter implements Filter {diff --git a/gitplex.http/src/main/java/com/gitplex/http/HttpModule.java b/server.http/src/main/java/com/gitplex/server/http/HttpModule.javasimilarity index 97%rename from gitplex.http/src/main/java/com/gitplex/http/HttpModule.javarename to server.http/src/main/java/com/gitplex/server/http/HttpModule.javaindex 07c5c28666..123e22a0f8 100644--- a/gitplex.http/src/main/java/com/gitplex/http/HttpModule.java+++ b/server.http/src/main/java/com/gitplex/server/http/HttpModule.java@@ -1,4 +1,4 @@-package com.gitplex.http;+package com.gitplex.server.http;import org.apache.shiro.web.filter.mgt.FilterChainManager;diff --git a/gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.java b/server.http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.javasimilarity index 96%rename from gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.javarename to server.http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.javaindex 08335d4812..4ac27f00f8 100644--- a/gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.java+++ b/server.http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.java@@ -1,4 +1,4 @@-package com.gitplex.http;+package com.gitplex.server.http;import java.util.EnumSet;diff --git a/gitplex.http/src/main/resources/META-INF/maven/archetype-metadata.xml b/server.http/src/main/resources/META-INF/maven/archetype-metadata.xmlsimilarity index 100%rename from gitplex.http/src/main/resources/META-INF/maven/archetype-metadata.xmlrename to server.http/src/main/resources/META-INF/maven/archetype-metadata.xmldiff --git a/gitplex.http/src/main/resources/archetype-resource/pom.xml b/server.http/src/main/resources/archetype-resource/pom.xmlsimilarity index 100%rename from gitplex.http/src/main/resources/archetype-resource/pom.xmlrename to server.http/src/main/resources/archetype-resource/pom.xmldiff --git a/gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.java b/server.http/src/main/resources/archetype-resource/src/main/java/Plugin.javasimilarity index 100%rename from gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.javarename to server.http/src/main/resources/archetype-resource/src/main/java/Plugin.javadiff --git a/gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/server.http/src/main/resources/archetype-resource/src/main/java/PluginModule.javasimilarity index 100%rename from gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.javarename to server.http/src/main/resources/archetype-resource/src/main/java/PluginModule.javadiff --git a/gitplex.product/.gitignore b/server.product/.gitignoresimilarity index 100%rename from gitplex.product/.gitignorerename to server.product/.gitignorediff --git a/gitplex.product/build/package.gant b/server.product/build/package.gantsimilarity index 100%rename from gitplex.product/build/package.gantrename to server.product/build/package.gantdiff --git a/gitplex.product/build/prepare_package.gant b/server.product/build/prepare_package.gantsimilarity index 100%rename from gitplex.product/build/prepare_package.gantrename to server.product/build/prepare_package.gantdiff --git a/gitplex.product/pom.xml b/server.product/pom.xmlsimilarity index 95%rename from gitplex.product/pom.xmlrename to server.product/pom.xmlindex 6f07d59edc..f1b75ac4b8 100644--- a/gitplex.product/pom.xml+++ b/server.product/pom.xml@@ -100,12 +100,12 @@</dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><version>1.0.38</version></dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.web</artifactId>+ <artifactId>server.web</artifactId><version>1.0.7</version></dependency><dependency>@@ -124,17 +124,17 @@</dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.rest</artifactId>+ <artifactId>server.rest</artifactId><version>1.0.7</version></dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.http</artifactId>+ <artifactId>server.http</artifactId><version>1.0.7</version></dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.search</artifactId>+ <artifactId>server.search</artifactId><version>1.0.7</version></dependency></dependencies>@@ -158,7 +158,7 @@<properties><executables>bin/*.sh, boot/wrapper-*</executables><bootstrapClass>com.gitplex.commons.bootstrap.Bootstrap</bootstrapClass>- <moduleClass>com.gitplex.product.ProductModule</moduleClass>+ <moduleClass>com.server.product.ProductModule</moduleClass><aggregation>true</aggregation></properties><version>1.0-EAP-build4</version>diff --git a/gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.java b/server.product/src/main/java/com/gitplex/server/product/DefaultServerConfig.javasimilarity index 95%rename from gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.javarename to server.product/src/main/java/com/gitplex/server/product/DefaultServerConfig.javaindex 4feffde2c4..69b87395f2 100644--- a/gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.java+++ b/server.product/src/main/java/com/gitplex/server/product/DefaultServerConfig.java@@ -1,14 +1,14 @@-package com.gitplex.product;+package com.gitplex.server.product;import java.io.File;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.setting.ServerConfig;-import com.gitplex.core.setting.SslConfig;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.setting.ServerConfig;+import com.gitplex.server.core.setting.SslConfig;@Singletonpublic class DefaultServerConfig implements ServerConfig {diff --git a/gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.java b/server.product/src/main/java/com/gitplex/server/product/ProductConfigurator.javasimilarity index 90%rename from gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.javarename to server.product/src/main/java/com/gitplex/server/product/ProductConfigurator.javaindex 83d42922fa..ef212c8d99 100644--- a/gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.java+++ b/server.product/src/main/java/com/gitplex/server/product/ProductConfigurator.java@@ -1,4 +1,4 @@-package com.gitplex.product;+package com.gitplex.server.product;import javax.inject.Inject;@@ -7,9 +7,9 @@ import org.eclipse.jetty.server.Server;import org.eclipse.jetty.server.ServerConnector;import org.eclipse.jetty.util.ssl.SslContextFactory;-import com.gitplex.core.setting.ServerConfig;-import com.gitplex.core.setting.SslConfig;import com.gitplex.commons.jetty.ServerConfigurator;+import com.gitplex.server.core.setting.ServerConfig;+import com.gitplex.server.core.setting.SslConfig;public class ProductConfigurator implements ServerConfigurator {diff --git a/gitplex.product/src/main/java/com/gitplex/product/ProductModule.java b/server.product/src/main/java/com/gitplex/server/product/ProductModule.javasimilarity index 94%rename from gitplex.product/src/main/java/com/gitplex/product/ProductModule.javarename to server.product/src/main/java/com/gitplex/server/product/ProductModule.javaindex b0c3b352a7..912a6405b5 100644--- a/gitplex.product/src/main/java/com/gitplex/product/ProductModule.java+++ b/server.product/src/main/java/com/gitplex/server/product/ProductModule.java@@ -1,10 +1,9 @@-package com.gitplex.product;+package com.gitplex.server.product;import java.io.File;import org.hibernate.cfg.Environment;-import com.gitplex.core.setting.ServerConfig;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.hibernate.HibernateProperties;import com.gitplex.commons.jetty.ServerConfigurator;@@ -12,6 +11,7 @@ import com.gitplex.commons.jetty.ServletConfigurator;import com.gitplex.commons.loader.AbstractPluginModule;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.setting.ServerConfig;public class ProductModule extends AbstractPluginModule {diff --git a/gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.java b/server.product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.javasimilarity index 92%rename from gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.javarename to server.product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.javaindex f5cc0ca0b8..31debda48d 100644--- a/gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.java+++ b/server.product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java@@ -1,14 +1,14 @@-package com.gitplex.product;+package com.gitplex.server.product;import javax.inject.Inject;import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletHolder;-import com.gitplex.core.setting.ServerConfig;import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.jetty.FileAssetServlet;import com.gitplex.commons.jetty.ServletConfigurator;+import com.gitplex.server.core.setting.ServerConfig;public class ProductServletConfigurator implements ServletConfigurator {diff --git a/gitplex.product/src/main/java/com/gitplex/product/ServerProperties.java b/server.product/src/main/java/com/gitplex/server/product/ServerProperties.javasimilarity index 89%rename from gitplex.product/src/main/java/com/gitplex/product/ServerProperties.javarename to server.product/src/main/java/com/gitplex/server/product/ServerProperties.javaindex 10df7973ce..a351af0170 100644--- a/gitplex.product/src/main/java/com/gitplex/product/ServerProperties.java+++ b/server.product/src/main/java/com/gitplex/server/product/ServerProperties.java@@ -1,4 +1,4 @@-package com.gitplex.product;+package com.gitplex.server.product;import java.util.Map;import java.util.Properties;diff --git a/gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.java b/server.product/src/main/java/com/gitplex/server/product/SslConfigBean.javasimilarity index 90%rename from gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.javarename to server.product/src/main/java/com/gitplex/server/product/SslConfigBean.javaindex 245ce2631f..662f08cdd8 100644--- a/gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.java+++ b/server.product/src/main/java/com/gitplex/server/product/SslConfigBean.java@@ -1,6 +1,6 @@-package com.gitplex.product;+package com.gitplex.server.product;-import com.gitplex.core.setting.SslConfig;+import com.gitplex.server.core.setting.SslConfig;class SslConfigBean implements SslConfig {diff --git a/gitplex.product/src/main/resources/META-INF/maven/archetype-metadata.xml b/server.product/src/main/resources/META-INF/maven/archetype-metadata.xmlsimilarity index 100%rename from gitplex.product/src/main/resources/META-INF/maven/archetype-metadata.xmlrename to server.product/src/main/resources/META-INF/maven/archetype-metadata.xmldiff --git a/gitplex.product/src/main/resources/archetype-resource/pom.xml b/server.product/src/main/resources/archetype-resource/pom.xmlsimilarity index 100%rename from gitplex.product/src/main/resources/archetype-resource/pom.xmlrename to server.product/src/main/resources/archetype-resource/pom.xmldiff --git a/gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.java b/server.product/src/main/resources/archetype-resource/src/main/java/Plugin.javasimilarity index 100%rename from gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.javarename to server.product/src/main/resources/archetype-resource/src/main/java/Plugin.javadiff --git a/gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/server.product/src/main/resources/archetype-resource/src/main/java/PluginModule.javasimilarity index 100%rename from gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.javarename to server.product/src/main/resources/archetype-resource/src/main/java/PluginModule.javadiff --git a/gitplex.product/src/main/resources/ehcache.xml b/server.product/src/main/resources/ehcache.xmlsimilarity index 100%rename from gitplex.product/src/main/resources/ehcache.xmlrename to server.product/src/main/resources/ehcache.xmldiff --git a/gitplex.product/src/test/java/com/gitplex/product/Test.java b/server.product/src/test/java/com/gitplex/server/product/Test.javasimilarity index 75%rename from gitplex.product/src/test/java/com/gitplex/product/Test.javarename to server.product/src/test/java/com/gitplex/server/product/Test.javaindex f243cb582f..e8b9ebf116 100644--- a/gitplex.product/src/test/java/com/gitplex/product/Test.java+++ b/server.product/src/test/java/com/gitplex/server/product/Test.java@@ -1,4 +1,4 @@-package com.gitplex.product;+package com.gitplex.server.product;import java.io.IOException;diff --git a/gitplex.product/system/3rdparty-licenses/antlr-license.txt b/server.product/system/3rdparty-licenses/antlr-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/antlr-license.txtrename to server.product/system/3rdparty-licenses/antlr-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/apache-license.txt b/server.product/system/3rdparty-licenses/apache-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/apache-license.txtrename to server.product/system/3rdparty-licenses/apache-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/asm-license.txt b/server.product/system/3rdparty-licenses/asm-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/asm-license.txtrename to server.product/system/3rdparty-licenses/asm-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/jetty-license.txt b/server.product/system/3rdparty-licenses/jetty-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/jetty-license.txtrename to server.product/system/3rdparty-licenses/jetty-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/lgpl-license.txt b/server.product/system/3rdparty-licenses/lgpl-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/lgpl-license.txtrename to server.product/system/3rdparty-licenses/lgpl-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/mozilla-license.txt b/server.product/system/3rdparty-licenses/mozilla-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/mozilla-license.txtrename to server.product/system/3rdparty-licenses/mozilla-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/ojdbc-license.txt b/server.product/system/3rdparty-licenses/ojdbc-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/ojdbc-license.txtrename to server.product/system/3rdparty-licenses/ojdbc-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/slf4j-license.txt b/server.product/system/3rdparty-licenses/slf4j-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/slf4j-license.txtrename to server.product/system/3rdparty-licenses/slf4j-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/sqljdbc-license.txt b/server.product/system/3rdparty-licenses/sqljdbc-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/sqljdbc-license.txtrename to server.product/system/3rdparty-licenses/sqljdbc-license.txtdiff --git a/gitplex.product/system/3rdparty-licenses/sun-license.txt b/server.product/system/3rdparty-licenses/sun-license.txtsimilarity index 100%rename from gitplex.product/system/3rdparty-licenses/sun-license.txtrename to server.product/system/3rdparty-licenses/sun-license.txtdiff --git a/gitplex.product/system/conf/hibernate.properties b/server.product/system/conf/hibernate.propertiessimilarity index 100%rename from gitplex.product/system/conf/hibernate.propertiesrename to server.product/system/conf/hibernate.propertiesdiff --git a/gitplex.product/system/conf/logback.xml b/server.product/system/conf/logback.xmlsimilarity index 100%rename from gitplex.product/system/conf/logback.xmlrename to server.product/system/conf/logback.xmldiff --git a/gitplex.product/system/conf/sample.keystore b/server.product/system/conf/sample.keystoresimilarity index 100%rename from gitplex.product/system/conf/sample.keystorerename to server.product/system/conf/sample.keystorediff --git a/gitplex.product/system/conf/server.properties b/server.product/system/conf/server.propertiessimilarity index 100%rename from gitplex.product/system/conf/server.propertiesrename to server.product/system/conf/server.propertiesdiff --git a/gitplex.product/system/conf/wrapper-license.conf b/server.product/system/conf/wrapper-license.confsimilarity index 100%rename from gitplex.product/system/conf/wrapper-license.confrename to server.product/system/conf/wrapper-license.confdiff --git a/gitplex.product/system/lib/ojdbc6.jar b/server.product/system/lib/ojdbc6.jarsimilarity index 100%rename from gitplex.product/system/lib/ojdbc6.jarrename to server.product/system/lib/ojdbc6.jardiff --git a/gitplex.product/system/lib/sqljdbc4.jar b/server.product/system/lib/sqljdbc4.jarsimilarity index 100%rename from gitplex.product/system/lib/sqljdbc4.jarrename to server.product/system/lib/sqljdbc4.jardiff --git a/gitplex.product/system/license.txt b/server.product/system/license.txtsimilarity index 100%rename from gitplex.product/system/license.txtrename to server.product/system/license.txtdiff --git a/gitplex.product/system/logs/console.log b/server.product/system/logs/console.logsimilarity index 100%rename from gitplex.product/system/logs/console.logrename to server.product/system/logs/console.logdiff --git a/gitplex.product/system/readme.txt b/server.product/system/readme.txtsimilarity index 100%rename from gitplex.product/system/readme.txtrename to server.product/system/readme.txtdiff --git a/gitplex.product/system/site/avatars/default.png b/server.product/system/site/avatars/default.pngsimilarity index 100%rename from gitplex.product/system/site/avatars/default.pngrename to server.product/system/site/avatars/default.pngdiff --git a/gitplex.product/system/site/images/ok.gif b/server.product/system/site/images/ok.gifsimilarity index 100%rename from gitplex.product/system/site/images/ok.gifrename to server.product/system/site/images/ok.gifdiff --git a/gitplex.product/system/site/lib/put_custom_plugins_and_libs_here b/server.product/system/site/lib/put_custom_plugins_and_libs_heresimilarity index 100%rename from gitplex.product/system/site/lib/put_custom_plugins_and_libs_hererename to server.product/system/site/lib/put_custom_plugins_and_libs_herediff --git a/gitplex.product/system/site/robots.txt b/server.product/system/site/robots.txtsimilarity index 100%rename from gitplex.product/system/site/robots.txtrename to server.product/system/site/robots.txtdiff --git a/gitplex.product/system/site/scripts/viewer.js b/server.product/system/site/scripts/viewer.jssimilarity index 100%rename from gitplex.product/system/site/scripts/viewer.jsrename to server.product/system/site/scripts/viewer.jsdiff --git a/gitplex.product/system/status/do_not_remove.txt b/server.product/system/status/do_not_remove.txtsimilarity index 100%rename from gitplex.product/system/status/do_not_remove.txtrename to server.product/system/status/do_not_remove.txtdiff --git a/gitplex.rest/.gitignore b/server.rest/.gitignoresimilarity index 100%rename from gitplex.rest/.gitignorerename to server.rest/.gitignorediff --git a/gitplex.rest/pom.xml b/server.rest/pom.xmlsimilarity index 91%rename from gitplex.rest/pom.xmlrename to server.rest/pom.xmlindex baa29ec263..fcddef45b7 100644--- a/gitplex.rest/pom.xml+++ b/server.rest/pom.xml@@ -2,7 +2,7 @@<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion>- <artifactId>gitplex.rest</artifactId>+ <artifactId>server.rest</artifactId><version>1.0.7</version><parent><groupId>com.gitplex</groupId>@@ -26,7 +26,7 @@<dependencies><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><version>1.0.38</version></dependency></dependencies>@@ -48,6 +48,6 @@</repository></repositories><properties>- <moduleClass>com.gitplex.rest.RestModule</moduleClass>+ <moduleClass>com.server.rest.RestModule</moduleClass></properties></project>diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/RestModule.java b/server.rest/src/main/java/com/gitplex/server/rest/RestModule.javasimilarity index 88%rename from gitplex.rest/src/main/java/com/gitplex/rest/RestModule.javarename to server.rest/src/main/java/com/gitplex/server/rest/RestModule.javaindex 3cc0a6a591..4d78a242dd 100644--- a/gitplex.rest/src/main/java/com/gitplex/rest/RestModule.java+++ b/server.rest/src/main/java/com/gitplex/server/rest/RestModule.java@@ -1,10 +1,10 @@-package com.gitplex.rest;+package com.gitplex.server.rest;import org.glassfish.jersey.server.ResourceConfig;-import com.gitplex.rest.resource.ResourceLocator;import com.gitplex.commons.jersey.JerseyConfigurator;import com.gitplex.commons.loader.AbstractPluginModule;+import com.gitplex.server.rest.resource.ResourceLocator;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.java b/server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestResource.javasimilarity index 95%rename from gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.javarename to server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestResource.javaindex 0b7172b23e..8f42b24d35 100644--- a/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.java+++ b/server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestResource.java@@ -1,4 +1,4 @@-package com.gitplex.rest.resource;+package com.gitplex.server.rest.resource;import java.util.Collection;import java.util.Date;@@ -17,11 +17,11 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.jersey.ValidQueryParams;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.security.SecurityUtils;@Path("/pull_requests")@Consumes(MediaType.WILDCARD)diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.java b/server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestVerificationResource.javasimilarity index 92%rename from gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.javarename to server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestVerificationResource.javaindex 0e8b3e393e..5484efafe6 100644--- a/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.java+++ b/server.rest/src/main/java/com/gitplex/server/rest/resource/PullRequestVerificationResource.java@@ -1,4 +1,4 @@-package com.gitplex.rest.resource;+package com.gitplex.server.rest.resource;import java.util.Collection;import java.util.Date;@@ -21,13 +21,13 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.PullRequestVerification;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.PullRequestVerificationManager;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.jersey.ValidQueryParams;+import com.gitplex.server.core.entity.PullRequestVerification;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.PullRequestVerificationManager;+import com.gitplex.server.core.security.SecurityUtils;@Path("/pull_request_verifications")@Consumes(MediaType.WILDCARD)diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.java b/server.rest/src/main/java/com/gitplex/server/rest/resource/RepositoryResource.javasimilarity index 91%rename from gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.javarename to server.rest/src/main/java/com/gitplex/server/rest/resource/RepositoryResource.javaindex fefdb393ae..71d5db8073 100644--- a/gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.java+++ b/server.rest/src/main/java/com/gitplex/server/rest/resource/RepositoryResource.java@@ -1,4 +1,4 @@-package com.gitplex.rest.resource;+package com.gitplex.server.rest.resource;import java.util.ArrayList;import java.util.Collection;@@ -19,12 +19,12 @@ import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.ObjectPermission;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.jersey.ValidQueryParams;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.ObjectPermission;@Path("/repositories")@Consumes(MediaType.WILDCARD)diff --git a/server.rest/src/main/java/com/gitplex/server/rest/resource/ResourceLocator.java b/server.rest/src/main/java/com/gitplex/server/rest/resource/ResourceLocator.javanew file mode 100644index 0000000000..670b5e5789--- /dev/null+++ b/server.rest/src/main/java/com/gitplex/server/rest/resource/ResourceLocator.java@@ -0,0 +1,5 @@+package com.gitplex.server.rest.resource;++public class ResourceLocator {++}diff --git a/gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.java b/server.rest/src/main/java/com/gitplex/server/rest/resource/UserResource.javasimilarity index 94%rename from gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.javarename to server.rest/src/main/java/com/gitplex/server/rest/resource/UserResource.javaindex 88ceef711d..c69aceeae4 100644--- a/gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.java+++ b/server.rest/src/main/java/com/gitplex/server/rest/resource/UserResource.java@@ -1,4 +1,4 @@-package com.gitplex.rest.resource;+package com.gitplex.server.rest.resource;import java.util.Collection;@@ -15,10 +15,10 @@ import javax.ws.rs.core.MediaType;import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.Email;-import com.gitplex.core.entity.Account;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.jersey.ValidQueryParams;+import com.gitplex.server.core.entity.Account;@Path("/users")@Consumes(MediaType.WILDCARD)diff --git a/gitplex.search/.gitignore b/server.search/.gitignoresimilarity index 100%rename from gitplex.search/.gitignorerename to server.search/.gitignorediff --git a/gitplex.search/pom.xml b/server.search/pom.xmlsimilarity index 95%rename from gitplex.search/pom.xmlrename to server.search/pom.xmlindex ee2ab9a580..e1100ca683 100644--- a/gitplex.search/pom.xml+++ b/server.search/pom.xml@@ -2,7 +2,7 @@<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion>- <artifactId>gitplex.search</artifactId>+ <artifactId>server.search</artifactId><version>1.0.7</version><parent><groupId>com.gitplex</groupId>@@ -33,7 +33,7 @@<dependencies><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><version>1.0.38</version></dependency><dependency>@@ -99,7 +99,7 @@</repository></repositories><properties>- <moduleClass>com.gitplex.search.SearchModule</moduleClass>+ <moduleClass>com.server.search.SearchModule</moduleClass><luceneVersion>4.10.3</luceneVersion></properties></project>diff --git a/gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.java b/server.search/src/main/java/com/gitplex/server/search/CommitIndexed.javasimilarity index 81%rename from gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.javarename to server.search/src/main/java/com/gitplex/server/search/CommitIndexed.javaindex e9f63155db..a71430d071 100644--- a/gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.java+++ b/server.search/src/main/java/com/gitplex/server/search/CommitIndexed.java@@ -1,8 +1,8 @@-package com.gitplex.search;+package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;public class CommitIndexed {diff --git a/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javasimilarity index 90%rename from gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.javarename to server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex 26d5c312bc..8738836a6c 100644--- a/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java+++ b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -1,20 +1,20 @@-package com.gitplex.search;+package com.gitplex.server.search;-import static com.gitplex.search.FieldConstants.BLOB_HASH;-import static com.gitplex.search.FieldConstants.BLOB_INDEX_VERSION;-import static com.gitplex.search.FieldConstants.BLOB_NAME;-import static com.gitplex.search.FieldConstants.BLOB_PATH;-import static com.gitplex.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;-import static com.gitplex.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;-import static com.gitplex.search.FieldConstants.BLOB_TEXT;-import static com.gitplex.search.FieldConstants.COMMIT_HASH;-import static com.gitplex.search.FieldConstants.COMMIT_INDEX_VERSION;-import static com.gitplex.search.FieldConstants.LAST_COMMIT;-import static com.gitplex.search.FieldConstants.LAST_COMMIT_HASH;-import static com.gitplex.search.FieldConstants.LAST_COMMIT_INDEX_VERSION;-import static com.gitplex.search.FieldConstants.META;-import static com.gitplex.search.IndexConstants.MAX_INDEXABLE_SIZE;-import static com.gitplex.search.IndexConstants.NGRAM_SIZE;+import static com.gitplex.server.search.FieldConstants.BLOB_HASH;+import static com.gitplex.server.search.FieldConstants.BLOB_INDEX_VERSION;+import static com.gitplex.server.search.FieldConstants.BLOB_NAME;+import static com.gitplex.server.search.FieldConstants.BLOB_PATH;+import static com.gitplex.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;+import static com.gitplex.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;+import static com.gitplex.server.search.FieldConstants.BLOB_TEXT;+import static com.gitplex.server.search.FieldConstants.COMMIT_HASH;+import static com.gitplex.server.search.FieldConstants.COMMIT_INDEX_VERSION;+import static com.gitplex.server.search.FieldConstants.LAST_COMMIT;+import static com.gitplex.server.search.FieldConstants.LAST_COMMIT_HASH;+import static com.gitplex.server.search.FieldConstants.LAST_COMMIT_INDEX_VERSION;+import static com.gitplex.server.search.FieldConstants.META;+import static com.gitplex.server.search.IndexConstants.MAX_INDEXABLE_SIZE;+import static com.gitplex.server.search.IndexConstants.NGRAM_SIZE;import java.io.File;import java.io.IOException;@@ -59,13 +59,6 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.manager.BatchWorkManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.core.manager.support.BatchWorker;-import com.gitplex.core.manager.support.IndexResult;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;import com.gitplex.commons.hibernate.UnitOfWork;@@ -77,6 +70,13 @@ import com.gitplex.commons.loader.Listen;import com.gitplex.commons.loader.ListenerRegistry;import com.gitplex.commons.util.ContentDetector;import com.gitplex.commons.util.concurrent.Prioritized;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.manager.BatchWorkManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.core.manager.support.BatchWorker;+import com.gitplex.server.core.manager.support.IndexResult;@Singletonpublic class DefaultIndexManager implements IndexManager {diff --git a/gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.java b/server.search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javasimilarity index 94%rename from gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.javarename to server.search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javaindex 6cf281cb37..6fd8920a8b 100644--- a/gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.java+++ b/server.search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java@@ -1,4 +1,4 @@-package com.gitplex.search;+package com.gitplex.server.search;import java.io.IOException;import java.nio.channels.ClosedByInterruptException;@@ -29,12 +29,12 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.event.depot.DepotDeleted;-import com.gitplex.core.event.lifecycle.SystemStopping;-import com.gitplex.core.manager.StorageManager;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.event.depot.DepotDeleted;+import com.gitplex.server.core.event.lifecycle.SystemStopping;+import com.gitplex.server.core.manager.StorageManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;import com.google.common.base.Throwables;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.hibernate.dao.Dao;diff --git a/gitplex.search/src/main/java/com/gitplex/search/FieldConstants.java b/server.search/src/main/java/com/gitplex/server/search/FieldConstants.javasimilarity index 93%rename from gitplex.search/src/main/java/com/gitplex/search/FieldConstants.javarename to server.search/src/main/java/com/gitplex/server/search/FieldConstants.javaindex 5e696fec72..86c2b0b2bf 100644--- a/gitplex.search/src/main/java/com/gitplex/search/FieldConstants.java+++ b/server.search/src/main/java/com/gitplex/server/search/FieldConstants.java@@ -1,4 +1,4 @@-package com.gitplex.search;+package com.gitplex.server.search;import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;diff --git a/gitplex.search/src/main/java/com/gitplex/search/IndexConstants.java b/server.search/src/main/java/com/gitplex/server/search/IndexConstants.javasimilarity index 73%rename from gitplex.search/src/main/java/com/gitplex/search/IndexConstants.javarename to server.search/src/main/java/com/gitplex/server/search/IndexConstants.javaindex 10e86ef907..226a69b328 100644--- a/gitplex.search/src/main/java/com/gitplex/search/IndexConstants.java+++ b/server.search/src/main/java/com/gitplex/server/search/IndexConstants.java@@ -1,4 +1,4 @@-package com.gitplex.search;+package com.gitplex.server.search;public interface IndexConstants {diff --git a/gitplex.search/src/main/java/com/gitplex/search/IndexManager.java b/server.search/src/main/java/com/gitplex/server/search/IndexManager.javasimilarity index 62%rename from gitplex.search/src/main/java/com/gitplex/search/IndexManager.javarename to server.search/src/main/java/com/gitplex/server/search/IndexManager.javaindex 8f52ddd476..0820a00626 100644--- a/gitplex.search/src/main/java/com/gitplex/search/IndexManager.java+++ b/server.search/src/main/java/com/gitplex/server/search/IndexManager.java@@ -1,9 +1,9 @@-package com.gitplex.search;+package com.gitplex.server.search;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.support.IndexResult;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.support.IndexResult;public interface IndexManager {diff --git a/gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.java b/server.search/src/main/java/com/gitplex/server/search/NGramAnalyzer.javasimilarity index 96%rename from gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.javarename to server.search/src/main/java/com/gitplex/server/search/NGramAnalyzer.javaindex 10605996a8..8e89f10939 100644--- a/gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.java+++ b/server.search/src/main/java/com/gitplex/server/search/NGramAnalyzer.java@@ -1,4 +1,4 @@-package com.gitplex.search;+package com.gitplex.server.search;import java.io.IOException;import java.io.Reader;diff --git a/gitplex.search/src/main/java/com/gitplex/search/SearchManager.java b/server.search/src/main/java/com/gitplex/server/search/SearchManager.javasimilarity index 70%rename from gitplex.search/src/main/java/com/gitplex/search/SearchManager.javarename to server.search/src/main/java/com/gitplex/server/search/SearchManager.javaindex 2350ed884a..02231ba5f4 100644--- a/gitplex.search/src/main/java/com/gitplex/search/SearchManager.java+++ b/server.search/src/main/java/com/gitplex/server/search/SearchManager.java@@ -1,13 +1,13 @@-package com.gitplex.search;+package com.gitplex.server.search;import java.util.List;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;-import com.gitplex.search.query.TooGeneralQueryException;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.TooGeneralQueryException;public interface SearchManager {diff --git a/gitplex.search/src/main/java/com/gitplex/search/SearchModule.java b/server.search/src/main/java/com/gitplex/server/search/SearchModule.javasimilarity index 92%rename from gitplex.search/src/main/java/com/gitplex/search/SearchModule.javarename to server.search/src/main/java/com/gitplex/server/search/SearchModule.javaindex a497cfc775..da0352e0e3 100644--- a/gitplex.search/src/main/java/com/gitplex/search/SearchModule.java+++ b/server.search/src/main/java/com/gitplex/server/search/SearchModule.java@@ -1,4 +1,4 @@-package com.gitplex.search;+package com.gitplex.server.search;import com.gitplex.commons.loader.AbstractPluginModule;diff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.javasimilarity index 97%rename from gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.javarename to server.search/src/main/java/com/gitplex/server/search/hit/FileHit.javaindex 703e408ebb..3aa01c61af 100644--- a/gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.java+++ b/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.java@@ -1,4 +1,4 @@-package com.gitplex.search.hit;+package com.gitplex.server.search.hit;import javax.annotation.Nullable;diff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.javasimilarity index 96%rename from gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.javarename to server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.javaindex f0713e8d2d..19133aea49 100644--- a/gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.java+++ b/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.java@@ -1,4 +1,4 @@-package com.gitplex.search.hit;+package com.gitplex.server.search.hit;import java.io.Serializable;diff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.javasimilarity index 96%rename from gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.javarename to server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.javaindex 4b900b18f3..815c25b6c8 100644--- a/gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.java+++ b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java@@ -1,4 +1,4 @@-package com.gitplex.search.hit;+package com.gitplex.server.search.hit;import javax.annotation.Nullable;diff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.javasimilarity index 97%rename from gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.javarename to server.search/src/main/java/com/gitplex/server/search/hit/TextHit.javaindex 5444394e75..a8a46765ae 100644--- a/gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.java+++ b/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.java@@ -1,4 +1,4 @@-package com.gitplex.search.hit;+package com.gitplex.server.search.hit;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;diff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/bullet.gif b/server.search/src/main/java/com/gitplex/server/search/hit/bullet.gifsimilarity index 100%rename from gitplex.search/src/main/java/com/gitplex/search/hit/bullet.gifrename to server.search/src/main/java/com/gitplex/server/search/hit/bullet.gifdiff --git a/gitplex.search/src/main/java/com/gitplex/search/hit/file.png b/server.search/src/main/java/com/gitplex/server/search/hit/file.pngsimilarity index 100%rename from gitplex.search/src/main/java/com/gitplex/search/hit/file.pngrename to server.search/src/main/java/com/gitplex/server/search/hit/file.pngdiff --git a/gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/BlobQuery.javasimilarity index 86%rename from gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.javarename to server.search/src/main/java/com/gitplex/server/search/query/BlobQuery.javaindex 5ed6176270..a96a45506f 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/BlobQuery.java@@ -1,6 +1,6 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;-import static com.gitplex.search.FieldConstants.BLOB_PATH;+import static com.gitplex.server.search.FieldConstants.BLOB_PATH;import java.util.List;@@ -10,7 +10,7 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.search.hit.QueryHit;+import com.gitplex.server.search.hit.QueryHit;public abstract class BlobQuery {diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.javasimilarity index 93%rename from gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.javarename to server.search/src/main/java/com/gitplex/server/search/query/FileQuery.javaindex 74e3908616..957f8daaa8 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java@@ -1,6 +1,6 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;-import static com.gitplex.search.FieldConstants.BLOB_NAME;+import static com.gitplex.server.search.FieldConstants.BLOB_NAME;import java.util.List;@@ -13,11 +13,11 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.search.hit.FileHit;-import com.gitplex.search.hit.QueryHit;import com.google.common.base.Splitter;import com.gitplex.commons.util.Range;import com.gitplex.commons.util.match.WildcardUtils;+import com.gitplex.server.search.hit.FileHit;+import com.gitplex.server.search.hit.QueryHit;public class FileQuery extends BlobQuery {diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/NGramLuceneQuery.javasimilarity index 95%rename from gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.javarename to server.search/src/main/java/com/gitplex/server/search/query/NGramLuceneQuery.javaindex 472ce65b02..1b908a120d 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/NGramLuceneQuery.java@@ -1,4 +1,4 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;import java.io.IOException;import java.io.StringReader;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.javasimilarity index 90%rename from gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.javarename to server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.javaindex b458b12490..6a89203847 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java@@ -1,9 +1,9 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;-import static com.gitplex.search.FieldConstants.BLOB_NAME;-import static com.gitplex.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;-import static com.gitplex.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;-import static com.gitplex.search.IndexConstants.MAX_INDEXABLE_SIZE;+import static com.gitplex.server.search.FieldConstants.BLOB_NAME;+import static com.gitplex.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;+import static com.gitplex.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;+import static com.gitplex.server.search.IndexConstants.MAX_INDEXABLE_SIZE;import java.io.IOException;import java.util.List;@@ -20,9 +20,9 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.hit.SymbolHit;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.hit.SymbolHit;import com.google.common.base.Splitter;import com.gitplex.commons.lang.extractors.ExtractException;import com.gitplex.commons.lang.extractors.Extractor;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.javasimilarity index 92%rename from gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.javarename to server.search/src/main/java/com/gitplex/server/search/query/TextQuery.javaindex 5bfc6bff5a..520edb7078 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java@@ -1,8 +1,8 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;-import static com.gitplex.search.FieldConstants.BLOB_NAME;-import static com.gitplex.search.FieldConstants.BLOB_TEXT;-import static com.gitplex.search.IndexConstants.NGRAM_SIZE;+import static com.gitplex.server.search.FieldConstants.BLOB_NAME;+import static com.gitplex.server.search.FieldConstants.BLOB_TEXT;+import static com.gitplex.server.search.IndexConstants.NGRAM_SIZE;import java.io.IOException;import java.util.List;@@ -20,14 +20,14 @@ import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.lib.ObjectLoader;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.search.IndexConstants;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.hit.TextHit;-import com.gitplex.search.query.regex.RegexLiterals;import com.google.common.base.Splitter;import com.gitplex.commons.lang.extractors.TokenPosition;import com.gitplex.commons.util.ContentDetector;import com.gitplex.commons.util.Range;+import com.gitplex.server.search.IndexConstants;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.hit.TextHit;+import com.gitplex.server.search.query.regex.RegexLiterals;public class TextQuery extends BlobQuery {diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.java b/server.search/src/main/java/com/gitplex/server/search/query/TooGeneralQueryException.javasimilarity index 74%rename from gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.javarename to server.search/src/main/java/com/gitplex/server/search/query/TooGeneralQueryException.javaindex 9f569b0837..45acd6e0b5 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/TooGeneralQueryException.java@@ -1,4 +1,4 @@-package com.gitplex.search.query;+package com.gitplex.server.search.query;public class TooGeneralQueryException extends RuntimeException {diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/AndLiterals.javasimilarity index 98%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/AndLiterals.javaindex 734deb8462..60510b804d 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/AndLiterals.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/LeafLiterals.javasimilarity index 96%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/LeafLiterals.javaindex de2df81e5e..c363963184 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/LeafLiterals.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.javasimilarity index 99%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.javaindex bca59c9cd9..be1f4a4425 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralUtils.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.ArrayList;import java.util.HashSet;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralVisitor.javasimilarity index 98%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralVisitor.javaindex b9be3ff2df..eb5d58930d 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/LiteralVisitor.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/Literals.javasimilarity index 70%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/Literals.javaindex 3f5437f520..8e756fd61b 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/Literals.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/LogicalLiterals.javasimilarity index 93%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/LogicalLiterals.javaindex 7657d487f3..dda3e9ad3d 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/LogicalLiterals.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.Iterator;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/OrLiterals.javasimilarity index 91%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/OrLiterals.javaindex c6155e8a80..b2c7c8a551 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/OrLiterals.java@@ -1,4 +1,4 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/PCRE.g4 b/server.search/src/main/java/com/gitplex/server/search/query/regex/PCRE.g4similarity index 100%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/PCRE.g4rename to server.search/src/main/java/com/gitplex/server/search/query/regex/PCRE.g4diff --git a/gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.java b/server.search/src/main/java/com/gitplex/server/search/query/regex/RegexLiterals.javasimilarity index 92%rename from gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.javarename to server.search/src/main/java/com/gitplex/server/search/query/regex/RegexLiterals.javaindex c46fc9510e..2040795e70 100644--- a/gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/regex/RegexLiterals.java@@ -1,6 +1,6 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;-import static com.gitplex.search.IndexConstants.NGRAM_SIZE;+import static com.gitplex.server.search.IndexConstants.NGRAM_SIZE;import java.util.List;@@ -15,11 +15,11 @@ import org.apache.lucene.search.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.search.query.NGramLuceneQuery;-import com.gitplex.search.query.TooGeneralQueryException;import com.google.common.base.Strings;import com.gitplex.search.query.regex.PCRELexer;import com.gitplex.search.query.regex.PCREParser;+import com.gitplex.server.search.query.NGramLuceneQuery;+import com.gitplex.server.search.query.TooGeneralQueryException;public class RegexLiterals {diff --git a/gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.java b/server.search/src/test/java/com/gitplex/server/search/query/regex/RegexLiteralsTest.javasimilarity index 91%rename from gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.javarename to server.search/src/test/java/com/gitplex/server/search/query/regex/RegexLiteralsTest.javaindex 912b2f563b..6423ad7da4 100644--- a/gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.java+++ b/server.search/src/test/java/com/gitplex/server/search/query/regex/RegexLiteralsTest.java@@ -1,11 +1,11 @@-package com.gitplex.search.query.regex;+package com.gitplex.server.search.query.regex;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertTrue;import org.junit.Test;-import com.gitplex.search.query.regex.RegexLiterals;+import com.gitplex.server.search.query.regex.RegexLiterals;import com.google.common.base.Splitter;public class RegexLiteralsTest {diff --git a/gitplex.web/.gitignore b/server.web/.gitignoresimilarity index 100%rename from gitplex.web/.gitignorerename to server.web/.gitignorediff --git a/gitplex.web/pom.xml b/server.web/pom.xmlsimilarity index 92%rename from gitplex.web/pom.xmlrename to server.web/pom.xmlindex b21292edbf..888ec124bf 100644--- a/gitplex.web/pom.xml+++ b/server.web/pom.xml@@ -2,7 +2,7 @@<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion>- <artifactId>gitplex.web</artifactId>+ <artifactId>server.web</artifactId><version>1.0.7</version><parent><groupId>com.gitplex</groupId>@@ -30,12 +30,12 @@<dependencies><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.core</artifactId>+ <artifactId>server.core</artifactId><version>1.0.38</version></dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.rest</artifactId>+ <artifactId>server.rest</artifactId><version>1.0.7</version></dependency><!-- JERSEY CLIENT -->@@ -61,7 +61,7 @@</dependency><dependency><groupId>com.gitplex</groupId>- <artifactId>gitplex.search</artifactId>+ <artifactId>server.search</artifactId><version>1.0.7</version></dependency></dependencies>@@ -83,7 +83,7 @@</repository></repositories><properties>- <moduleClass>com.gitplex.web.WebModule</moduleClass>+ <moduleClass>com.server.web.WebModule</moduleClass><tika.version>1.4</tika.version><wikitext.version>2.0.0</wikitext.version></properties>diff --git a/gitplex.web/src/main/java/com/gitplex/web/Constants.java b/server.web/src/main/java/com/gitplex/server/web/Constants.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/Constants.javarename to server.web/src/main/java/com/gitplex/server/web/Constants.javaindex 4a9c457c6b..1caf71ac71 100644--- a/gitplex.web/src/main/java/com/gitplex/web/Constants.java+++ b/server.web/src/main/java/com/gitplex/server/web/Constants.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import org.joda.time.format.DateTimeFormat;import org.joda.time.format.DateTimeFormatter;diff --git a/gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.java b/server.web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.javarename to server.web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.javaindex 6eff87a849..96d6f12b89 100644--- a/gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.java+++ b/server.web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.util.Collection;diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.java b/server.web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.javarename to server.web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.javaindex 129fb20a85..13e63bf605 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.lang.reflect.Field;import java.util.Collections;@@ -14,11 +14,11 @@ import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.mapper.ICompoundRequestMapper;import org.eclipse.jetty.servlet.ServletMapping;-import com.gitplex.core.util.validation.AccountNameReservation;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import com.gitplex.commons.jetty.JettyPlugin;import com.gitplex.commons.util.ReflectionUtils;+import com.gitplex.server.core.util.validation.AccountNameReservation;public class WebAccountNameReservation implements AccountNameReservation {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.java b/server.web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.javasimilarity index 73%rename from gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.javarename to server.web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.javaindex d2d129818d..7b30baeab0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java@@ -1,8 +1,8 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.util.Set;-import com.gitplex.core.util.validation.DepotNameReservation;+import com.gitplex.server.core.util.validation.DepotNameReservation;import com.google.common.collect.Sets;public class WebDepotNameReservation implements DepotNameReservation {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebModule.java b/server.web/src/main/java/com/gitplex/server/web/WebModule.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/WebModule.javarename to server.web/src/main/java/com/gitplex/server/web/WebModule.javaindex 00756dbb35..0c52c4595a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebModule.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebModule.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.util.Collection;@@ -15,21 +15,6 @@ import org.hibernate.exception.ConstraintViolationException;import org.pegdown.Parser;import org.pegdown.plugins.ToHtmlSerializerPlugin;-import com.gitplex.core.manager.UrlManager;-import com.gitplex.core.util.validation.AccountNameReservation;-import com.gitplex.core.util.validation.DepotNameReservation;-import com.gitplex.core.util.validation.TeamNameReservation;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.avatar.DefaultAvatarManager;-import com.gitplex.web.component.comment.MentionTransformer;-import com.gitplex.web.component.comment.PullRequestTransformer;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.diff.DiffRenderer;-import com.gitplex.web.editable.EditSupportLocator;-import com.gitplex.web.websocket.CodeCommentChangeBroadcaster;-import com.gitplex.web.websocket.CommitIndexedBroadcaster;-import com.gitplex.web.websocket.PullRequestChangeBroadcaster;-import com.gitplex.web.websocket.TaskChangeBroadcaster;import com.google.common.collect.Lists;import com.gitplex.commons.git.exception.GitException;import com.gitplex.commons.jetty.ServletConfigurator;@@ -41,6 +26,21 @@ import com.gitplex.commons.wicket.ResourcePackScopeContribution;import com.gitplex.commons.wicket.editable.EditSupport;import com.gitplex.commons.wicket.websocket.DefaultWebSocketManager;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.core.manager.UrlManager;+import com.gitplex.server.core.util.validation.AccountNameReservation;+import com.gitplex.server.core.util.validation.DepotNameReservation;+import com.gitplex.server.core.util.validation.TeamNameReservation;+import com.gitplex.server.web.avatar.AvatarManager;+import com.gitplex.server.web.avatar.DefaultAvatarManager;+import com.gitplex.server.web.component.comment.MentionTransformer;+import com.gitplex.server.web.component.comment.PullRequestTransformer;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.diff.DiffRenderer;+import com.gitplex.server.web.editable.EditSupportLocator;+import com.gitplex.server.web.websocket.CodeCommentChangeBroadcaster;+import com.gitplex.server.web.websocket.CommitIndexedBroadcaster;+import com.gitplex.server.web.websocket.PullRequestChangeBroadcaster;+import com.gitplex.server.web.websocket.TaskChangeBroadcaster;import jersey.repackaged.com.google.common.collect.Sets;diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.java b/server.web/src/main/java/com/gitplex/server/web/WebServletConfigurator.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.javarename to server.web/src/main/java/com/gitplex/server/web/WebServletConfigurator.javaindex 3f6e5972e6..aa741aa755 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebServletConfigurator.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import javax.inject.Inject;import javax.inject.Singleton;@@ -8,10 +8,10 @@ import javax.servlet.http.HttpSessionListener;import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletHolder;-import com.gitplex.web.assets.Assets;import com.gitplex.commons.jetty.ClasspathAssetServlet;import com.gitplex.commons.jetty.ServletConfigurator;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.web.assets.Assets;@Singletonpublic class WebServletConfigurator implements ServletConfigurator {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebSession.java b/server.web/src/main/java/com/gitplex/server/web/WebSession.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/WebSession.javarename to server.web/src/main/java/com/gitplex/server/web/WebSession.javaindex 3d33199331..a8cf2e7f1d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebSession.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebSession.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import javax.servlet.http.HttpSession;@@ -8,7 +8,7 @@ import org.apache.shiro.subject.Subject;import org.apache.wicket.protocol.http.WicketServlet;import org.apache.wicket.request.Request;-import com.gitplex.core.GitPlex;+import com.gitplex.server.core.GitPlex;public class WebSession extends org.apache.wicket.protocol.http.WebSession {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.java b/server.web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.javasimilarity index 73%rename from gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.javarename to server.web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.javaindex 770f198853..7a33dcc165 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.java+++ b/server.web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java@@ -1,8 +1,8 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.util.Set;-import com.gitplex.core.util.validation.TeamNameReservation;+import com.gitplex.server.core.util.validation.TeamNameReservation;import com.google.common.collect.Sets;public class WebTeamNameReservation implements TeamNameReservation {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WicketConfig.java b/server.web/src/main/java/com/gitplex/server/web/WicketConfig.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/WicketConfig.javarename to server.web/src/main/java/com/gitplex/server/web/WicketConfig.javaindex f5e2374445..1b10bc66d3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WicketConfig.java+++ b/server.web/src/main/java/com/gitplex/server/web/WicketConfig.java@@ -1,4 +1,4 @@-package com.gitplex.web;+package com.gitplex.server.web;import java.util.Set;@@ -19,13 +19,13 @@ import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;import org.apache.wicket.request.resource.caching.version.LastModifiedResourceVersion;-import com.gitplex.web.mapper.UrlMapper;-import com.gitplex.web.page.error.BaseErrorPage;-import com.gitplex.web.page.error.ExpectedExceptionPage;-import com.gitplex.web.page.error.UnexpectedExceptionPage;-import com.gitplex.web.page.home.DashboardPage;import com.gitplex.commons.util.ExceptionUtils;import com.gitplex.commons.wicket.AbstractWicketConfig;+import com.gitplex.server.web.mapper.UrlMapper;+import com.gitplex.server.web.page.error.BaseErrorPage;+import com.gitplex.server.web.page.error.ExpectedExceptionPage;+import com.gitplex.server.web.page.error.UnexpectedExceptionPage;+import com.gitplex.server.web.page.home.DashboardPage;@Singletonpublic class WicketConfig extends AbstractWicketConfig {diff --git a/gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.java b/server.web/src/main/java/com/gitplex/server/web/WicketUrlManager.javasimilarity index 74%rename from gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.javarename to server.web/src/main/java/com/gitplex/server/web/WicketUrlManager.javaindex e5ae720935..f74cf5851c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.java+++ b/server.web/src/main/java/com/gitplex/server/web/WicketUrlManager.java@@ -1,17 +1,17 @@-package com.gitplex.web;+package com.gitplex.server.web;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.UrlManager;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.UrlManager;@Singletonpublic class WicketUrlManager implements UrlManager {diff --git a/server.web/src/main/java/com/gitplex/server/web/assets/Assets.java b/server.web/src/main/java/com/gitplex/server/web/assets/Assets.javanew file mode 100644index 0000000000..db3ddbf3b3--- /dev/null+++ b/server.web/src/main/java/com/gitplex/server/web/assets/Assets.java@@ -0,0 +1,5 @@+package com.gitplex.server.web.assets;++public class Assets {++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.java b/server.web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.javasimilarity index 99%rename from gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.javarename to server.web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.javaindex 7bb1c7c1df..b0c6211b50 100644--- a/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.java+++ b/server.web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.java@@ -1,4 +1,4 @@-package com.gitplex.web.avatar;+package com.gitplex.server.web.avatar;import java.awt.Color;import java.awt.Font;diff --git a/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.java b/server.web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.javarename to server.web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.javaindex dbaa0cfa1a..f21bec096f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.java+++ b/server.web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.java@@ -1,11 +1,11 @@-package com.gitplex.web.avatar;+package com.gitplex.server.web.avatar;import javax.annotation.Nullable;import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;public interface AvatarManager {diff --git a/gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.java b/server.web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.javarename to server.web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.javaindex 6ae5e9cac0..8109d6d03c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.java+++ b/server.web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.java@@ -1,4 +1,4 @@-package com.gitplex.web.avatar;+package com.gitplex.server.web.avatar;import java.awt.image.BufferedImage;import java.io.File;@@ -16,9 +16,6 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;import com.google.common.base.Splitter;import com.google.common.base.Throwables;import com.google.common.collect.Iterables;@@ -26,6 +23,9 @@ import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.hibernate.Transactional;import com.gitplex.commons.util.LockUtils;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;@Singletonpublic class DefaultAvatarManager implements AvatarManager {diff --git a/gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.java b/server.web/src/main/java/com/gitplex/server/web/avatar/Gravatar.javasimilarity index 99%rename from gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.javarename to server.web/src/main/java/com/gitplex/server/web/avatar/Gravatar.javaindex 36c751719c..4880a7fd61 100644--- a/gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.java+++ b/server.web/src/main/java/com/gitplex/server/web/avatar/Gravatar.java@@ -1,4 +1,4 @@-package com.gitplex.web.avatar;+package com.gitplex.server.web.avatar;import java.io.UnsupportedEncodingException;import java.math.BigInteger;diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.java b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.javaindex bf391a0754..fd166a16c1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java@@ -1,54 +1,54 @@-package com.gitplex.web.behavior.blamemessage;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.revwalk.RevCommit;-import org.unbescape.javascript.JavaScriptEscape;--import com.gitplex.core.entity.Depot;-import com.gitplex.web.util.DateUtils;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;--public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {-- private static final long serialVersionUID = 1L;-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();-- String tooltipId = params.getParameterValue("tooltip").toString();- String commitHash = params.getParameterValue("commit").toString();- RevCommit commit = getDepot().getRevCommit(commitHash);- String authoring;- if (commit.getAuthorIdent() != null) {- authoring = commit.getAuthorIdent().getName();- if (commit.getCommitterIdent() != null)- authoring += " " + DateUtils.formatAge(commit.getCommitterIdent().getWhen());- authoring = "'" + JavaScriptEscape.escapeJavaScript(authoring) + "'";- } else {- authoring = "undefined";- }- String message = JavaScriptEscape.escapeJavaScript(commit.getFullMessage());- String script = String.format("gitplex.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message);- target.appendJavaScript(script);- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);- response.render(JavaScriptHeaderItem.forReference(new BlameMessageResourceReference()));- }-- protected abstract Depot getDepot();-- public String getCallback() {- return getCallbackFunction(explicit("tooltip"), explicit("commit")).toString();- }--}+package com.gitplex.server.web.behavior.blamemessage;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.revwalk.RevCommit;+import org.unbescape.javascript.JavaScriptEscape;++import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.util.DateUtils;++public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {++ private static final long serialVersionUID = 1L;++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();++ String tooltipId = params.getParameterValue("tooltip").toString();+ String commitHash = params.getParameterValue("commit").toString();+ RevCommit commit = getDepot().getRevCommit(commitHash);+ String authoring;+ if (commit.getAuthorIdent() != null) {+ authoring = commit.getAuthorIdent().getName();+ if (commit.getCommitterIdent() != null)+ authoring += " " + DateUtils.formatAge(commit.getCommitterIdent().getWhen());+ authoring = "'" + JavaScriptEscape.escapeJavaScript(authoring) + "'";+ } else {+ authoring = "undefined";+ }+ String message = JavaScriptEscape.escapeJavaScript(commit.getFullMessage());+ String script = String.format("gitplex.server.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message);+ target.appendJavaScript(script);+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ response.render(JavaScriptHeaderItem.forReference(new BlameMessageResourceReference()));+ }++ protected abstract Depot getDepot();++ public String getCallback() {+ return getCallbackFunction(explicit("tooltip"), explicit("commit")).toString();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageCssResourceReference.javasimilarity index 67%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageCssResourceReference.javaindex 5dd5a7ae82..694e545979 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java@@ -1,13 +1,13 @@-package com.gitplex.web.behavior.blamemessage;--import com.gitplex.web.page.base.BaseDependentCssResourceReference;--public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public BlameMessageCssResourceReference() {- super(BlameMessageCssResourceReference.class, "blame-message.css");- }--}+package com.gitplex.server.web.behavior.blamemessage;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BlameMessageCssResourceReference() {+ super(BlameMessageCssResourceReference.class, "blame-message.css");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageResourceReference.javaindex 3a1ddda9b3..096eff0363 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageResourceReference.java@@ -1,25 +1,25 @@-package com.gitplex.web.behavior.blamemessage;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;--import com.gitplex.web.page.base.BaseDependentResourceReference;--public class BlameMessageResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public BlameMessageResourceReference() {- super(BlameMessageResourceReference.class, "blame-message.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new BlameMessageCssResourceReference()));- return dependencies;- }--}+package com.gitplex.server.web.behavior.blamemessage;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import com.gitplex.server.web.page.base.BaseDependentResourceReference;++public class BlameMessageResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public BlameMessageResourceReference() {+ super(BlameMessageResourceReference.class, "blame-message.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BlameMessageCssResourceReference()));+ return dependencies;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.css b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/blame-message.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.cssrename to server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/blame-message.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.js b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/blame-message.jssimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.jsrename to server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/blame-message.jsindex 551862817c..817138f95a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.js+++ b/server.web/src/main/java/com/gitplex/server/web/behavior/blamemessage/blame-message.js@@ -1,4 +1,4 @@-gitplex.blameMessage = {+gitplex.server.blameMessage = {show: function(tooltipId, authoring, message) {var $blameTooltip = $("#" + tooltipId);$blameTooltip.empty();diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.java b/server.web/src/main/java/com/gitplex/server/web/component/AccountLink.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/AccountLink.javaindex ffe4d2cf7f..9c59a1f407 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/AccountLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component;+package com.gitplex.server.web.component;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -7,11 +7,11 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.page.account.AccountPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")public class AccountLink extends BookmarkablePageLink<Void> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.java b/server.web/src/main/java/com/gitplex/server/web/component/BlobIcon.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.javarename to server.web/src/main/java/com/gitplex/server/web/component/BlobIcon.javaindex 8903a7e366..90663ed3bc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/BlobIcon.java@@ -1,4 +1,4 @@-package com.gitplex.web.component;+package com.gitplex.server.web.component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebComponent;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.java b/server.web/src/main/java/com/gitplex/server/web/component/BranchLink.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/BranchLink.javaindex 1176ba9d1d..06a371079b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/BranchLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component;+package com.gitplex.server.web.component;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class BranchLink extends BookmarkablePageLink<Void> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.java b/server.web/src/main/java/com/gitplex/server/web/component/DepotPicker.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.javarename to server.web/src/main/java/com/gitplex/server/web/component/DepotPicker.javaindex a279ee0ae7..00a0d327bc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/DepotPicker.java@@ -1,4 +1,4 @@-package com.gitplex.web.component;+package com.gitplex.server.web.component;import java.util.Collection;@@ -7,11 +7,11 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.depotselector.DepotSelector;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.depotselector.DepotSelector;@SuppressWarnings("serial")public abstract class DepotPicker extends DropdownLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.java b/server.web/src/main/java/com/gitplex/server/web/component/EmailLink.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/EmailLink.javaindex ac352ea59c..d9cdc394c0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/EmailLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component;+package com.gitplex.server.web.component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.javaindex 4c3ba41412..52fecb85c9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import java.util.Collection;import java.util.List;@@ -7,12 +7,12 @@ import org.apache.commons.lang3.StringEscapeUtils;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.avatar.AvatarManager;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.avatar.AvatarManager;public abstract class AbstractAccountChoiceProvider extends ChoiceProvider<Account> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.javaindex e298715d6e..6b805901e9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import java.util.List;@@ -7,12 +7,12 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.web.Constants;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.Constants;public class AccountChoiceProvider extends AbstractAccountChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.javaindex 716b83fc3c..80fd48eafd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class AccountChoiceResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.javasimilarity index 65%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.javaindex bac84a1d2c..4ec786ca0e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import java.util.Collection;@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;public class AccountMultiChoice extends Select2MultiChoice<Account> {@@ -23,9 +23,9 @@ public class AccountMultiChoice extends Select2MultiChoice<Account> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose accounts ...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.javaindex ba299f0ad7..b3b3d06392 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java@@ -1,11 +1,11 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;import com.gitplex.commons.wicket.component.select2.Select2Choice;+import com.gitplex.server.core.entity.Account;@SuppressWarnings("serial")public class AccountSingleChoice extends Select2Choice<Account> {@@ -19,9 +19,9 @@ public class AccountSingleChoice extends Select2Choice<Account> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose an account ...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.javaindex 616deab800..e891f55749 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.accountchoice;+package com.gitplex.server.web.component.accountchoice;import java.util.ArrayList;import java.util.Collections;@@ -9,15 +9,15 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.component.select2.Response;import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;public class AdministrativeAccountChoiceProvider extends AbstractAccountChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.css b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.cssrename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.js b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.jssimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.jsrename to server.web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.jsindex 7b69fb4883..972304a9be 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/accountchoice/account-choice.js@@ -1,21 +1,21 @@-gitplex.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;- },--};+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/gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.java b/server.web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.javaindex 977fd0b73f..59bfe9b6eb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.archivemenulink;+package com.gitplex.server.web.component.archivemenulink;import java.util.ArrayList;import java.util.List;@@ -7,11 +7,11 @@ 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.core.entity.Depot;-import com.gitplex.web.resource.ArchiveResource;-import com.gitplex.web.resource.ArchiveResourceReference;import com.gitplex.commons.wicket.component.menu.MenuItem;import com.gitplex.commons.wicket.component.menu.MenuLink;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.resource.ArchiveResource;+import com.gitplex.server.web.resource.ArchiveResourceReference;@SuppressWarnings("serial")public abstract class ArchiveMenuLink extends MenuLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.javaindex 6743a11956..d7c4268ef6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java@@ -1,113 +1,113 @@-package com.gitplex.web.component.avatar;--import javax.annotation.Nullable;--import org.apache.wicket.event.IEvent;-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.WebComponent;-import org.apache.wicket.model.Model;-import org.eclipse.jgit.lib.PersonIdent;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.commons.wicket.behavior.TooltipBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;--@SuppressWarnings("serial")-public class Avatar extends WebComponent {-- private final Long accountId;-- private String url;-- private final String name;-- private final TooltipConfig tooltipConfig;-- public Avatar(String id, @Nullable Account account) {- this(id, account, null);- }-- public Avatar(String id, @Nullable Account account, @Nullable TooltipConfig tooltipConfig) {- super(id);-- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- if (account != null) {- accountId = account.getId();- url = avatarManager.getAvatarUrl(account);- name = account.getDisplayName();- } else {- accountId = null;- url = avatarManager.getAvatarUrl(account);- name = "Unknown";- }- this.tooltipConfig = tooltipConfig;- }-- public Avatar(String id, PersonIdent person) {- this(id, person, null);- }-- public Avatar(String id, PersonIdent person, @Nullable TooltipConfig tooltipConfig) {- super(id);-- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);-- Account account = GitPlex.getInstance(AccountManager.class).find(person);- if (account != null) {- accountId = account.getId();- url = avatarManager.getAvatarUrl(account);- name = account.getDisplayName();- } else {- accountId = null;- url = avatarManager.getAvatarUrl(person);- name = person.getName();- }- this.tooltipConfig = tooltipConfig;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof AvatarChanged) {- AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();- if (avatarChanged.getAccount().getId().equals(accountId)) {- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getAccount());- avatarChanged.getPartialPageRequestHandler().add(this);- }- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- if (tooltipConfig != null)- add(new TooltipBehavior(Model.of(name), tooltipConfig));-- setOutputMarkupId(true);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- tag.setName("img");- tag.append("class", "avatar", " ");- tag.put("src", url);- }--}+package com.gitplex.server.web.component.avatar;++import javax.annotation.Nullable;++import org.apache.wicket.event.IEvent;+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.WebComponent;+import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.PersonIdent;++import com.gitplex.commons.wicket.behavior.TooltipBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.avatar.AvatarManager;++import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;++@SuppressWarnings("serial")+public class Avatar extends WebComponent {++ private final Long accountId;++ private String url;++ private final String name;++ private final TooltipConfig tooltipConfig;++ public Avatar(String id, @Nullable Account account) {+ this(id, account, null);+ }++ public Avatar(String id, @Nullable Account account, @Nullable TooltipConfig tooltipConfig) {+ super(id);++ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ if (account != null) {+ accountId = account.getId();+ url = avatarManager.getAvatarUrl(account);+ name = account.getDisplayName();+ } else {+ accountId = null;+ url = avatarManager.getAvatarUrl(account);+ name = "Unknown";+ }+ this.tooltipConfig = tooltipConfig;+ }++ public Avatar(String id, PersonIdent person) {+ this(id, person, null);+ }++ public Avatar(String id, PersonIdent person, @Nullable TooltipConfig tooltipConfig) {+ super(id);++ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);++ Account account = GitPlex.getInstance(AccountManager.class).find(person);+ if (account != null) {+ accountId = account.getId();+ url = avatarManager.getAvatarUrl(account);+ name = account.getDisplayName();+ } else {+ accountId = null;+ url = avatarManager.getAvatarUrl(person);+ name = person.getName();+ }+ this.tooltipConfig = tooltipConfig;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof AvatarChanged) {+ AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();+ if (avatarChanged.getAccount().getId().equals(accountId)) {+ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ url = avatarManager.getAvatarUrl(avatarChanged.getAccount());+ avatarChanged.getPartialPageRequestHandler().add(this);+ }+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (tooltipConfig != null)+ add(new TooltipBehavior(Model.of(name), tooltipConfig));++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ tag.setName("img");+ tag.append("class", "avatar", " ");+ tag.put("src", url);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.javaindex f285836858..6fa1e569b9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java@@ -1,22 +1,22 @@-package com.gitplex.web.component.avatar;--import org.apache.wicket.ajax.AjaxRequestTarget;--import com.gitplex.core.entity.Account;-import com.gitplex.commons.wicket.AjaxEvent;--public class AvatarChanged extends AjaxEvent {-- private final Account account;-- public AvatarChanged(AjaxRequestTarget target, Account account) {- super(target);-- this.account = account;- }-- public Account getAccount() {- return account;- }-+package com.gitplex.server.web.component.avatar;++import org.apache.wicket.ajax.AjaxRequestTarget;++import com.gitplex.commons.wicket.AjaxEvent;+import com.gitplex.server.core.entity.Account;++public class AvatarChanged extends AjaxEvent {++ private final Account account;++ public AvatarChanged(AjaxRequestTarget target, Account account) {+ super(target);++ this.account = account;+ }++ public Account getAccount() {+ return account;+ }+}\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.javaindex dcfb1f5beb..bb61912941 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java@@ -1,128 +1,128 @@-package com.gitplex.web.component.avatar;--import javax.annotation.Nullable;--import org.apache.wicket.event.IEvent;-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.link.BookmarkablePageLink;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.PersonIdent;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.commons.wicket.behavior.TooltipBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;--@SuppressWarnings("serial")-public class AvatarLink extends BookmarkablePageLink<Void> {-- private final Long accountId;-- private final PageParameters params;-- private String url;-- private final String name;-- private final TooltipConfig tooltipConfig;-- public AvatarLink(String id, Account user) {- this(id, user, null);- }-- public AvatarLink(String id, Account account, @Nullable TooltipConfig tooltipConfig) {- super(id, AccountOverviewPage.class);-- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- accountId = account.getId();- params = AccountPage.paramsOf(account);- name = account.getDisplayName();- url = avatarManager.getAvatarUrl(account);- this.tooltipConfig = tooltipConfig;- }-- public AvatarLink(String id, PersonIdent person) {- this(id, person, null);- }-- public AvatarLink(String id, PersonIdent person, @Nullable TooltipConfig tooltipConfig) {- super(id, AccountOverviewPage.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);- name = account.getDisplayName();- } else {- accountId = null;- params = new PageParameters();- url = avatarManager.getAvatarUrl(person);- name = person.getName();- }- this.tooltipConfig = tooltipConfig;- }-- @Override- public PageParameters getPageParameters() {- return params;- }-- @Override- public IModel<?> getBody() {- return Model.of("<img src='" + url + "' class='avatar'></img>");- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof AvatarChanged) {- AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();- if (avatarChanged.getAccount().getId().equals(accountId)) {- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getAccount());- avatarChanged.getPartialPageRequestHandler().add(this);- }- }- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled())- tag.setName("span");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setEnabled(!params.isEmpty());- setEscapeModelStrings(false);-- if (tooltipConfig != null)- add(new TooltipBehavior(Model.of(name), tooltipConfig));-- setOutputMarkupId(true);- }--}+package com.gitplex.server.web.component.avatar;++import javax.annotation.Nullable;++import org.apache.wicket.event.IEvent;+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.link.BookmarkablePageLink;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.PersonIdent;++import com.gitplex.commons.wicket.behavior.TooltipBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.avatar.AvatarManager;+import com.gitplex.server.web.page.account.AccountPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;++import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;++@SuppressWarnings("serial")+public class AvatarLink extends BookmarkablePageLink<Void> {++ private final Long accountId;++ private final PageParameters params;++ private String url;++ private final String name;++ private final TooltipConfig tooltipConfig;++ public AvatarLink(String id, Account user) {+ this(id, user, null);+ }++ public AvatarLink(String id, Account account, @Nullable TooltipConfig tooltipConfig) {+ super(id, AccountOverviewPage.class);++ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ accountId = account.getId();+ params = AccountPage.paramsOf(account);+ name = account.getDisplayName();+ url = avatarManager.getAvatarUrl(account);+ this.tooltipConfig = tooltipConfig;+ }++ public AvatarLink(String id, PersonIdent person) {+ this(id, person, null);+ }++ public AvatarLink(String id, PersonIdent person, @Nullable TooltipConfig tooltipConfig) {+ super(id, AccountOverviewPage.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);+ name = account.getDisplayName();+ } else {+ accountId = null;+ params = new PageParameters();+ url = avatarManager.getAvatarUrl(person);+ name = person.getName();+ }+ this.tooltipConfig = tooltipConfig;+ }++ @Override+ public PageParameters getPageParameters() {+ return params;+ }++ @Override+ public IModel<?> getBody() {+ return Model.of("<img src='" + url + "' class='avatar'></img>");+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof AvatarChanged) {+ AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();+ if (avatarChanged.getAccount().getId().equals(accountId)) {+ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ url = avatarManager.getAvatarUrl(avatarChanged.getAccount());+ avatarChanged.getPartialPageRequestHandler().add(this);+ }+ }+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled())+ tag.setName("span");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setEnabled(!params.isEmpty());+ setEscapeModelStrings(false);++ if (tooltipConfig != null)+ add(new TooltipBehavior(Model.of(name), tooltipConfig));++ setOutputMarkupId(true);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarResourceReference.javaindex 79a025cd3f..14e0738f1a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/AvatarResourceReference.java@@ -1,13 +1,13 @@-package com.gitplex.web.component.avatar;--import org.apache.wicket.request.resource.CssResourceReference;--public class AvatarResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public AvatarResourceReference() {- super(AvatarResourceReference.class, "avatar.css");- }--}+package com.gitplex.server.web.component.avatar;++import org.apache.wicket.request.resource.CssResourceReference;++public class AvatarResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public AvatarResourceReference() {+ super(AvatarResourceReference.class, "avatar.css");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.html b/server.web/src/main/java/com/gitplex/server/web/component/avatar/ContributorAvatars.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/avatar/ContributorAvatars.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/ContributorAvatars.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/ContributorAvatars.javaindex b54f35b317..be8488849b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/ContributorAvatars.java@@ -1,53 +1,53 @@-package com.gitplex.web.component.avatar;--import javax.annotation.Nullable;--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.panel.Panel;-import org.eclipse.jgit.lib.PersonIdent;--import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;--@SuppressWarnings("serial")-public class ContributorAvatars extends Panel {-- private final PersonIdent author;-- private final PersonIdent committer;-- private final TooltipConfig tooltipConfig;-- public ContributorAvatars(String id, PersonIdent author, PersonIdent committer) {- this(id, author, committer, null);- }-- public ContributorAvatars(String id, PersonIdent author, PersonIdent committer,- @Nullable TooltipConfig tooltipConfig) {- super(id);- this.author = author;- this.committer = committer;- this.tooltipConfig = tooltipConfig;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AvatarLink("author", author, tooltipConfig));- if (committer.getEmailAddress().equals(author.getEmailAddress())- && committer.getName().equals(author.getName())) {- add(new WebMarkupContainer("committer").setVisible(false));- } else {- add(new AvatarLink("committer", committer, tooltipConfig));- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));- }--}+package com.gitplex.server.web.component.avatar;++import javax.annotation.Nullable;++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.panel.Panel;+import org.eclipse.jgit.lib.PersonIdent;++import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;++@SuppressWarnings("serial")+public class ContributorAvatars extends Panel {++ private final PersonIdent author;++ private final PersonIdent committer;++ private final TooltipConfig tooltipConfig;++ public ContributorAvatars(String id, PersonIdent author, PersonIdent committer) {+ this(id, author, committer, null);+ }++ public ContributorAvatars(String id, PersonIdent author, PersonIdent committer,+ @Nullable TooltipConfig tooltipConfig) {+ super(id);+ this.author = author;+ this.committer = committer;+ this.tooltipConfig = tooltipConfig;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new AvatarLink("author", author, tooltipConfig));+ if (committer.getEmailAddress().equals(author.getEmailAddress())+ && committer.getName().equals(author.getName())) {+ add(new WebMarkupContainer("committer").setVisible(false));+ } else {+ add(new AvatarLink("committer", committer, tooltipConfig));+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.html b/server.web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.java b/server.web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.javarename to server.web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.javaindex 92681f9195..246c6461b8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java@@ -1,66 +1,66 @@-package com.gitplex.web.component.avatar;--import org.apache.commons.lang3.StringEscapeUtils;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.commons.wicket.behavior.TooltipBehavior;--@SuppressWarnings("serial")-public abstract class RemoveableAvatar extends AjaxLink<Account> {-- public RemoveableAvatar(String id, IModel<Account> model) {- super(id, model);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- configure();-- Account user = getModelObject();- String tooltip;- // Force nowrap here when display tooltip as otherwise user name will be wrapped inside- // an element with position set to relative- if (isEnabled()) {- tooltip = "Remove reviewer " + user.getDisplayName();- } else {- tooltip = user.getDisplayName();- }- add(new TooltipBehavior(Model.of("<span style='white-space: nowrap;'>"- + StringEscapeUtils.escapeHtml4(tooltip) + "</span>")));- add(AttributeAppender.append("class", "removeable-avatar"));- add(AttributeAppender.append("data-html", "true"));-- setEscapeModelStrings(false);- }-- @Override- public IModel<?> getBody() {- String url = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(getModelObject());- return Model.of("<img src='" + url + "' class='avatar'></img> <i class='fa fa-times'></i>");- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (!isEnabled())- tag.setName("span");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));- }--}+package com.gitplex.server.web.component.avatar;++import org.apache.commons.lang3.StringEscapeUtils;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import com.gitplex.commons.wicket.behavior.TooltipBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.avatar.AvatarManager;++@SuppressWarnings("serial")+public abstract class RemoveableAvatar extends AjaxLink<Account> {++ public RemoveableAvatar(String id, IModel<Account> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ configure();++ Account user = getModelObject();+ String tooltip;+ // Force nowrap here when display tooltip as otherwise user name will be wrapped inside+ // an element with position set to relative+ if (isEnabled()) {+ tooltip = "Remove reviewer " + user.getDisplayName();+ } else {+ tooltip = user.getDisplayName();+ }+ add(new TooltipBehavior(Model.of("<span style='white-space: nowrap;'>"+ + StringEscapeUtils.escapeHtml4(tooltip) + "</span>")));+ add(AttributeAppender.append("class", "removeable-avatar"));+ add(AttributeAppender.append("data-html", "true"));++ setEscapeModelStrings(false);+ }++ @Override+ public IModel<?> getBody() {+ String url = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(getModelObject());+ return Model.of("<img src='" + url + "' class='avatar'></img> <i class='fa fa-times'></i>");+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/avatar/avatar.css b/server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/avatar/avatar.cssrename to server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.javaindex f63359c11b..52fc26deda 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchchoice;+package com.gitplex.server.web.component.branchchoice;import java.util.ArrayList;import java.util.Collection;@@ -10,12 +10,12 @@ import org.apache.wicket.model.IModel;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.Constants;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.RefInfo;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.Constants;@SuppressWarnings("serial")public class BranchChoiceProvider extends ChoiceProvider<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceResourceReference.javaindex 9f2773163b..b1971bfd73 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchchoice;+package com.gitplex.server.web.component.branchchoice;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class BranchChoiceResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.javasimilarity index 74%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.javaindex 80b9a09760..aad20fc282 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchchoice;+package com.gitplex.server.web.component.branchchoice;import java.util.Collection;@@ -20,9 +20,9 @@ public class BranchMultiChoice extends Select2MultiChoice<String> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose branches ...");- getSettings().setFormatResult("gitplex.branchChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.branchChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.branchChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.branchChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.branchChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.branchChoiceFormatter.escapeMarkup");setConvertEmptyInputStringToNull(true);}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.javaindex 4329bb39b2..5846ada58c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchchoice;+package com.gitplex.server.web.component.branchchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -20,9 +20,9 @@ public class BranchSingleChoice extends Select2Choice<String> {super.onInitialize();getSettings().setPlaceholder("Choose a branch ...");- getSettings().setFormatResult("gitplex.branchChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.branchChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.branchChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.branchChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.branchChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.branchChoiceFormatter.escapeMarkup");setConvertEmptyInputStringToNull(true);}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.css b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.cssrename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.js b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.jssimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.jsrename to server.web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.jsindex 7af2b446cf..bdb08abc4f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchchoice/branch-choice.js@@ -1,4 +1,4 @@-gitplex.branchChoiceFormatter = {+gitplex.server.branchChoiceFormatter = {formatSelection: function(branch) {return branch.name;},diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.java b/server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.javaindex 72e71b63f5..c2e0005c62 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchmatch;+package com.gitplex.server.web.component.branchmatch;import java.util.ArrayList;import java.util.List;@@ -6,8 +6,6 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.util.SuggestionUtils;import com.gitplex.commons.antlr.codeassist.FenceAware;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.antlr.codeassist.ParentedElement;@@ -15,6 +13,8 @@ import com.gitplex.commons.antlr.grammar.ElementSpec;import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.core.util.includeexclude.IncludeExcludeParser;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class BranchMatchBehavior extends ANTLRAssistBehavior {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.java b/server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.javaindex 7fe98e4e96..c651631541 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchmatch;+package com.gitplex.server.web.component.branchmatch;import java.io.Serializable;@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")public class BranchMatchInput extends TextField<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.html b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.java b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.javaindex 468998d158..9ca95cf71c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchpicker;+package com.gitplex.server.web.component.branchpicker;import javax.annotation.Nullable;@@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.DepotPicker;-import com.gitplex.web.model.AffinalDepotsModel;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.DepotPicker;+import com.gitplex.server.web.model.AffinalDepotsModel;@SuppressWarnings("serial")public abstract class AffinalBranchPicker extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.java b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.javaindex 00073d040b..28446c9a92 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchpicker;+package com.gitplex.server.web.component.branchpicker;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -6,8 +6,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.entity.Depot;@SuppressWarnings("serial")public abstract class BranchPicker extends DropdownLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPickerResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPickerResourceReference.javaindex 4fbfb37b0b..935fe3e55a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPickerResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchpicker;+package com.gitplex.server.web.component.branchpicker;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.html b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.java b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.javaindex 1d27f4e5ed..cd14062d09 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchpicker;+package com.gitplex.server.web.component.branchpicker;import java.util.ArrayList;import java.util.List;@@ -24,12 +24,12 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.RefInfo;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;import com.gitplex.commons.wicket.behavior.InputChangeBehavior;+import com.gitplex.server.core.entity.Depot;@SuppressWarnings("serial")public abstract class BranchSelector extends Panel {@@ -92,7 +92,7 @@ public abstract class BranchSelector extends Panel {@Overridepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);- String script = String.format("gitplex.branchSelector.init('%s', %s);",+ String script = String.format("gitplex.server.branchSelector.init('%s', %s);",getMarkupId(true), getCallbackFunction(CallbackParameter.explicit("key")));response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.javaindex a5f8f8d486..c2239d968e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.branchpicker;+package com.gitplex.server.web.component.branchpicker;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class BranchSelectorResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-picker.css b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-picker.cssrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-picker.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.css b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-selector.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.cssrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-selector.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.js b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-selector.jssimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.jsrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-selector.jsindex f14736ca49..b115152316 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/branch-selector.js@@ -1,39 +1,39 @@-gitplex.branchSelector = {- init: function(containerId, callback) {- var $container = $("#" + containerId);- var $floating = $container.closest(".floating");- $floating.on("open click", function() {- $container.find("input").focus();- });- gitplex.branchSelector.bindInputKeys(containerId, callback);- },- bindInputKeys: function(containerId, callback) {- var $container = $("#" + containerId);- var $input = $container.find("input");- $input.bind("keydown", "return", function() {- callback("return");- });- $input.bind("keydown", "up", function(e) {- e.preventDefault();- var $active = $container.find("ul.branches li.active");- var $prev = $active.prev("li");- if ($prev.length != 0) {- $active.removeClass("active");- $prev.addClass("active");- callback("up");- }- $container.find("ul.branches").scrollIntoView("li.active", 8, 8);- });- $input.bind("keydown", "down", function(e) {- e.preventDefault();- var $active = $container.find("ul.branches li.active");- var $next = $active.next("li");- if ($next.length != 0) {- $active.removeClass("active");- $next.addClass("active");- callback("down");- }- $container.find("ul.branches").scrollIntoView("li.active", 8, 8);- });- }+gitplex.server.branchSelector = {+ init: function(containerId, callback) {+ var $container = $("#" + containerId);+ var $floating = $container.closest(".floating");+ $floating.on("open click", function() {+ $container.find("input").focus();+ });+ gitplex.server.branchSelector.bindInputKeys(containerId, callback);+ },+ bindInputKeys: function(containerId, callback) {+ var $container = $("#" + containerId);+ var $input = $container.find("input");+ $input.bind("keydown", "return", function() {+ callback("return");+ });+ $input.bind("keydown", "up", function(e) {+ e.preventDefault();+ var $active = $container.find("ul.branches li.active");+ var $prev = $active.prev("li");+ if ($prev.length != 0) {+ $active.removeClass("active");+ $prev.addClass("active");+ callback("up");+ }+ $container.find("ul.branches").scrollIntoView("li.active", 8, 8);+ });+ $input.bind("keydown", "down", function(e) {+ e.preventDefault();+ var $active = $container.find("ul.branches li.active");+ var $next = $active.next("li");+ if ($next.length != 0) {+ $active.removeClass("active");+ $next.addClass("active");+ callback("down");+ }+ $container.find("ul.branches").scrollIntoView("li.active", 8, 8);+ });+ }};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/search.gif b/server.web/src/main/java/com/gitplex/server/web/component/branchpicker/search.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/search.gifrename to server.web/src/main/java/com/gitplex/server/web/component/branchpicker/search.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.javaindex d181e698c5..26e9778fcd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import java.util.List;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.javaindex b509c73582..181cdb09c7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import java.io.Serializable;import java.util.Collection;@@ -11,12 +11,12 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.annotation.AccountChoice;-import com.gitplex.core.annotation.FileChoice;-import com.gitplex.core.entity.CodeComment;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.util.match.WildcardUtils;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.annotation.AccountChoice;+import com.gitplex.server.core.annotation.FileChoice;+import com.gitplex.server.core.entity.CodeComment;@Editablepublic class CodeCommentFilter implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javaindex fb63deeb37..fb23cbe540 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import java.util.ArrayList;import java.util.Date;@@ -31,24 +31,24 @@ import org.apache.wicket.model.Model;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.javaindex 7240139cc2..a47906d439 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.javaindex d36d3d82fb..951b455e34 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java@@ -1,799 +1,799 @@-package com.gitplex.web.component.comment;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Date;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-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.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-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.form.Form;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.StaleStateException;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentReply;-import com.gitplex.core.entity.CodeCommentStatusChange;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.DepotAndRevision;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CodeCommentReplyManager;-import com.gitplex.core.manager.CodeCommentStatusChangeManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.util.DateUtils;-import com.gitplex.commons.hibernate.dao.Dao;-import com.gitplex.commons.util.ClassUtils;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--@SuppressWarnings("serial")-public abstract class CodeCommentPanel extends Panel {-- private final Long commentId;-- private RepeatingView activitiesView;-- /**- * We pass comment id instead of comment model as we want to make sure that- * comment is always loaded upon usage as this panel is involved in websocket- * update and websocket update does not detach models at end of request which- * may result in Hibernate lazy load exception when the comment is used again- * in next request- *- * @param id- * @param commentId- */- public CodeCommentPanel(String id, Long commentId) {- super(id);- this.commentId = commentId;- }-- protected CodeComment getComment() {- return GitPlex.getInstance(CodeCommentManager.class).load(commentId);- }-- private WebMarkupContainer newCommentContainer() {- WebMarkupContainer commentContainer = new Fragment("comment", "viewFrag", this);- commentContainer.setOutputMarkupId(true);-- commentContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return getComment().isVisitedAfter(getComment().getDate())?"": "new";- }-- }));-- commentContainer.add(new AvatarLink("userAvatar", getComment().getUser()));- commentContainer.add(new AccountLink("userName", getComment().getUser()));- commentContainer.add(new Label("activityDescription", "commented"));- commentContainer.add(new Label("activityDate", DateUtils.formatAge(getComment().getDate())));- commentContainer.add(new Link<Void>("compareContext") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getCompareContext(getComment()).equals(getComment().getCompareContext())- && !getComment().getCommentPos().getCommit().equals(getComment().getCompareContext().getCompareCommit()));- }-- @Override- public void onClick() {- CodeComment comment = getComment();- CompareContext compareContext = comment.getCompareContext();- PullRequest request = getPullRequest();- if (request != null) {- RequestChangesPage.State state = new RequestChangesPage.State();- state.commentId = comment.getId();- if (compareContext.isLeftSide()) {- state.oldCommit = compareContext.getCompareCommit();- state.newCommit = comment.getCommentPos().getCommit();- } else {- state.oldCommit = comment.getCommentPos().getCommit();- state.newCommit = compareContext.getCompareCommit();- }- state.mark = comment.getCommentPos();- state.pathFilter = compareContext.getPathFilter();- state.whitespaceOption = compareContext.getWhitespaceOption();- PageParameters params = RequestChangesPage.paramsOf(request, state);- setResponsePage(RequestChangesPage.class, params);- } else {- RevisionComparePage.State state = new RevisionComparePage.State();- state.commentId = comment.getId();- state.compareWithMergeBase = false;- if (compareContext.isLeftSide()) {- state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());- state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());- } else {- state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());- state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());- }- state.mark = comment.getCommentPos();- state.pathFilter = compareContext.getPathFilter();- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;- state.whitespaceOption = compareContext.getWhitespaceOption();- PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);- setResponsePage(RevisionComparePage.class, params);- }- }-- }.add(AttributeAppender.append("title", "This comment is added in a different compare context, click to show")));-- MarkdownEditSupport editSupport;- if (SecurityUtils.canModify(getComment())) {- editSupport = new MarkdownEditSupport() {-- @Override- public void setContent(String content) {- CodeComment comment = getComment();- comment.setContent(content);- GitPlex.getInstance(CodeCommentManager.class).save(comment);- }-- @Override- public long getVersion() {- return getComment().getVersion();- }-- };- } else {- editSupport = null;- }- commentContainer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getComment().getContent();- }-- }, editSupport));-- WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModify(getComment()));- foot.add(new AjaxLink<Void>("edit") {-- @Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(commentContainer.getId(), "commentEditFrag", CodeCommentPanel.this);- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);-- CommentInput contentInput = new CommentInput("content", Model.of(getComment().getContent())) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());- }-- @Override- protected Depot getDepot() {- return getComment().getDepot();- }-- };- form.add(contentInput);- contentInput.setRequired(true);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- WebMarkupContainer commentContainer = newCommentContainer();- fragment.replaceWith(commentContainer);- target.add(commentContainer);- }-- });-- long lastVersion = getComment().getVersion();- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- try {- CodeComment comment = getComment();- if (comment.getVersion() != lastVersion)- throw new StaleStateException("");- comment.setContent(contentInput.getModelObject());- GitPlex.getInstance(CodeCommentManager.class).save(comment);- WebMarkupContainer commentContainer = newCommentContainer();- fragment.replaceWith(commentContainer);- target.add(commentContainer);- onSaveComment(target, comment);- } catch (StaleStateException e) {- error("Some one changed the content you are editing. Reload the page and try again.");- target.add(feedback);- }- }-- });-- fragment.add(form);- fragment.setOutputMarkupId(true);- commentContainer.replaceWith(fragment);- target.add(fragment);- }-- });-- foot.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- String confirmMessage;- if (getComment().getReplies().isEmpty()) {- confirmMessage = "Do you really want to delete this comment?";- } else {- confirmMessage = "Deleting this comment will also delete all replies, do you really "- + "want to continue?";- }- attributes.getAjaxCallListeners().add(new ConfirmListener(confirmMessage));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onDeleteComment(target, getComment());- GitPlex.getInstance(CodeCommentManager.class).delete(getComment());- }-- });-- commentContainer.add(foot);- return commentContainer;- }-- private WebMarkupContainer newActivityContainer(String componentId, CodeCommentActivity activity) {- ActivityIdentity identity = new ActivityIdentity(activity);- Fragment activityContainer = new Fragment(componentId, "viewFrag", this, Model.of(identity));- activityContainer.setOutputMarkupId(true);- activityContainer.setMarkupId(activity.getAnchor());-- activityContainer.add(new AvatarLink("userAvatar", activity.getUser()));- activityContainer.add(new AccountLink("userName", activity.getUser()));- String activityDescription;- if (activity instanceof CodeCommentStatusChange) {- CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;- if (statusChange.isResolved())- activityDescription = "resolved";- else- activityDescription = "unresolved";- } else {- activityDescription = "replied";- }- activityContainer.add(new Label("activityDescription", activityDescription));- activityContainer.add(new Label("activityDate", DateUtils.formatAge(activity.getDate())));- activityContainer.add(new Link<Void>("compareContext") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getCompareContext(getComment()).equals(identity.getActivity().getCompareContext())- && !getComment().getCommentPos().getCommit().equals(identity.getActivity().getCompareContext().getCompareCommit()));- }-- @Override- public void onClick() {- CodeCommentActivity activity = identity.getActivity();- CompareContext compareContext = activity.getCompareContext();- PullRequest request = getPullRequest();- if (request != null) {- RequestChangesPage.State state = new RequestChangesPage.State();- state.commentId = activity.getComment().getId();- if (compareContext.isLeftSide()) {- state.oldCommit = compareContext.getCompareCommit();- state.newCommit = activity.getComment().getCommentPos().getCommit();- } else {- state.oldCommit = activity.getComment().getCommentPos().getCommit();- state.newCommit = compareContext.getCompareCommit();- }- state.mark = activity.getComment().getCommentPos();- state.pathFilter = compareContext.getPathFilter();- state.whitespaceOption = compareContext.getWhitespaceOption();- PageParameters params = RequestChangesPage.paramsOf(request, state);- setResponsePage(RequestChangesPage.class, params);- } else {- RevisionComparePage.State state = new RevisionComparePage.State();- CodeComment comment = activity.getComment();- state.commentId = comment.getId();- state.compareWithMergeBase = false;- if (compareContext.isLeftSide()) {- state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());- state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());- } else {- state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());- state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());- }- state.mark = comment.getCommentPos();- state.pathFilter = compareContext.getPathFilter();- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;- state.whitespaceOption = compareContext.getWhitespaceOption();- PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);- setResponsePage(RevisionComparePage.class, params);- }- }-- }.add(AttributeAppender.append("title", "This reply is added in a different compare context, click to show")));-- if (StringUtils.isNotBlank(activity.getNote())) {- MarkdownEditSupport editSupport;- if (SecurityUtils.canModify(getComment())) {- editSupport = new MarkdownEditSupport() {-- @Override- public void setContent(String content) {- if (identity.clazz == CodeCommentReply.class) {- CodeCommentReply reply = (CodeCommentReply) activity;- reply.setContent(content);- GitPlex.getInstance(CodeCommentReplyManager.class).save(reply);- } else {- CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;- statusChange.setNote(content);- GitPlex.getInstance(CodeCommentStatusChangeManager.class).save(statusChange);- }- }-- @Override- public long getVersion() {- return identity.getActivity().getVersion();- }-- };- } else {- editSupport = null;- }- activityContainer.add(new MarkdownPanel("content", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return identity.getActivity().getNote();- }-- }, editSupport));-- } else {- activityContainer.add(new Label("content", "<div class='no-note'>No note</div>").setEscapeModelStrings(false));- }-- WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModify(activity));-- foot.add(new AjaxLink<Void>("edit") {-- @Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(activityContainer.getId(), "activityEditFrag",- CodeCommentPanel.this, Model.of(identity.id));- Form<?> form = new Form<Void>("form");- CommentInput contentInput = new CommentInput("content", Model.of(identity.getActivity().getNote())) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());- }-- @Override- protected Depot getDepot() {- return getComment().getDepot();- }-- };- contentInput.setRequired(identity.clazz == CodeCommentReply.class);- form.add(contentInput);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- WebMarkupContainer replyContainer = newActivityContainer(componentId, identity.getActivity());- fragment.replaceWith(replyContainer);- target.add(replyContainer);- }-- });-- long lastVersion = identity.getActivity().getVersion();- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- try {- CodeCommentActivity activity = identity.getActivity();- if (activity.getVersion() != lastVersion)- throw new StaleStateException("");-- if (identity.clazz == CodeCommentReply.class) {- CodeCommentReply reply = (CodeCommentReply) activity;- reply.setContent(contentInput.getModelObject());- GitPlex.getInstance(CodeCommentReplyManager.class).save(reply);- } else {- CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;- statusChange.setNote(contentInput.getModelObject());- GitPlex.getInstance(CodeCommentStatusChangeManager.class).save(statusChange);- }- WebMarkupContainer activityContainer = newActivityContainer(componentId, identity.getActivity());- fragment.replaceWith(activityContainer);- target.add(activityContainer);- } catch (StaleStateException e) {- error("Some one changed the content you are editing. Reload the page and try again.");- target.add(feedback);- }- }-- }.add(new Label("label", "Save")));-- fragment.add(form);- fragment.setOutputMarkupId(true);- activityContainer.replaceWith(fragment);- target.add(fragment);- }-- });- foot.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 this reply?"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- activityContainer.remove();- GitPlex.getInstance(CodeCommentReplyManager.class).delete((CodeCommentReply) identity.getActivity());- String script = String.format("$('#%s').remove();", activityContainer.getMarkupId());- target.appendJavaScript(script);- }-- }.setVisible(activity instanceof CodeCommentReply));-- activityContainer.add(foot);- return activityContainer;- }-- private WebMarkupContainer newAddReplyContainer() {- WebMarkupContainer addReplyContainer = new Fragment("addReply", "addReplyFrag", this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.getAccount() != null);- }-- };- addReplyContainer.setOutputMarkupId(true);- addReplyContainer.add(new AjaxLink<Void>("reply") {-- @Override- public void onClick(AjaxRequestTarget target) {- onAddReply(target, false);- }-- });- return addReplyContainer;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(newCommentContainer());-- activitiesView = new RepeatingView("activities");- PullRequest request = getPullRequest();-- List<CodeCommentActivity> activities = new ArrayList<>();- for (CodeCommentReply reply: getComment().getReplies()) {- if (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null) {- activities.add(reply);- }- }- for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {- if (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null) {- activities.add(statusChange);- }- }-- activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));-- for (CodeCommentActivity activity: activities) {- Component activityContainer = newActivityContainer(activitiesView.newChildId(), activity);- if (!getComment().isVisitedAfter(activity.getDate()))- activityContainer.add(AttributeAppender.append("class", "new"));- activitiesView.add(activityContainer);- }- add(activitiesView);- add(newAddReplyContainer());-- setOutputMarkupId(true);-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- Date lastActivityDate;- String prevActivityMarkupId;- if (activitiesView.size() != 0) {- @SuppressWarnings("deprecation")- Component lastActivityContainer = activitiesView.get(activitiesView.size()-1);-- CodeCommentActivity lastActivity = ((ActivityIdentity) lastActivityContainer.getDefaultModelObject()).getActivity();- lastActivityDate = lastActivity.getDate();- prevActivityMarkupId = lastActivityContainer.getMarkupId();- } else {- lastActivityDate = getComment().getDate();- prevActivityMarkupId = get("comment").getMarkupId();- }-- PullRequest request = getPullRequest();- List<CodeCommentActivity> activities = new ArrayList<>();- for (CodeCommentReply reply: getComment().getReplies()) {- if (reply.getDate().getTime()>lastActivityDate.getTime()- && (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null)) {- activities.add(reply);- }- }- for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {- if (statusChange.getDate().getTime()>lastActivityDate.getTime()- && (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null)) {- activities.add(statusChange);- }- }- activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));-- for (CodeCommentActivity activity: activities) {- Component newActivityContainer = newActivityContainer(activitiesView.newChildId(), activity);- newActivityContainer.add(AttributeAppender.append("class", "new"));- activitiesView.add(newActivityContainer);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityContainer.getMarkupId(), prevActivityMarkupId);- handler.prependJavaScript(script);- handler.add(newActivityContainer);- prevActivityMarkupId = newActivityContainer.getMarkupId();- }- }-- @Override- protected void onEndInitialRequest(RequestCycle cycle) {- if (SecurityUtils.getAccount() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getComment());- }- }-- });- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new CodeCommentResourceReference()));- }-- private void onAddReply(AjaxRequestTarget target, boolean changeStatus) {- Fragment fragment = new Fragment("addReply", "activityEditFrag", CodeCommentPanel.this);- Form<?> form = new Form<Void>("form");- CommentInput contentInput = new CommentInput("content", Model.of("")) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());- }-- @Override- protected Depot getDepot() {- return getComment().getDepot();- }-- };- contentInput.setRequired(!changeStatus);- form.add(contentInput);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- WebMarkupContainer addReplyContainer = newAddReplyContainer();- fragment.replaceWith(addReplyContainer);- target.add(addReplyContainer);- }-- });-- AjaxButton saveButton = new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Account user = SecurityUtils.getAccount();- CodeComment comment = getComment();- Date date = new Date();- CompareContext compareContext = getCompareContext(comment);- if (changeStatus) {- CodeCommentStatusChange statusChange = new CodeCommentStatusChange();- statusChange.setComment(getComment());- statusChange.setUser(user);- statusChange.setCompareContext(compareContext);- statusChange.setResolved(!comment.isResolved());- statusChange.setDate(date);- statusChange.setNote(contentInput.getModelObject());-- GitPlex.getInstance(CodeCommentManager.class).changeStatus(statusChange);- onStatusChanged(target, fragment, statusChange);- onSaveComment(target, getComment());- } else {- CodeCommentReply reply = new CodeCommentReply();- reply.setComment(comment);- reply.setDate(date);- reply.setUser(user);- reply.setContent(contentInput.getModelObject());- reply.setCompareContext(compareContext);- GitPlex.getInstance(CodeCommentReplyManager.class).save(reply, true);- onReplyAdded(target, fragment, reply);- }- }-- };- if (changeStatus) {- saveButton.add(new Label("label", getComment().isResolved()?"Confirm unresolve":"Confirm resolve"));- } else {- saveButton.add(new Label("label", "Save"));- saveButton.add(AttributeAppender.append("class", "dirty-aware"));- }- form.add(saveButton);-- fragment.add(form);- fragment.setOutputMarkupId(true);- get("addReply").replaceWith(fragment);- target.add(fragment);- }-- public void onChangeStatus(AjaxRequestTarget target) {- onAddReply(target, true);- }-- private void onStatusChanged(AjaxRequestTarget target, Fragment fragment, CodeCommentStatusChange statusChange) {- WebMarkupContainer activityContainer = newActivityContainer(activitiesView.newChildId(), statusChange);- activitiesView.add(activityContainer);-- String script = String.format("$('#%s .add-reply').before('<div id=\"%s\"></div>');",- CodeCommentPanel.this.getMarkupId(), activityContainer.getMarkupId());- target.prependJavaScript(script);- target.add(activityContainer);-- WebMarkupContainer addReplyContainer = newAddReplyContainer();- fragment.replaceWith(addReplyContainer);- target.add(addReplyContainer);- }-- private void onReplyAdded(AjaxRequestTarget target, Fragment fragment, @Nullable CodeCommentReply reply) {- if (reply != null) {- WebMarkupContainer activityContainer = newActivityContainer(activitiesView.newChildId(), reply);- activitiesView.add(activityContainer);-- String script = String.format("$('#%s .add-reply').before('<div id=\"%s\"></div>');",- CodeCommentPanel.this.getMarkupId(), activityContainer.getMarkupId());- target.prependJavaScript(script);- target.add(activityContainer);- }-- WebMarkupContainer addReplyContainer = newAddReplyContainer();- fragment.replaceWith(addReplyContainer);- target.add(addReplyContainer);- }-- protected abstract void onDeleteComment(AjaxRequestTarget target, CodeComment comment);-- protected abstract void onSaveComment(AjaxRequestTarget target, CodeComment comment);-- protected abstract CompareContext getCompareContext(CodeComment comment);-- protected abstract PullRequest getPullRequest();-- private static class ActivityIdentity implements Serializable {-- final Class<? extends CodeCommentActivity> clazz;-- final Long id;-- ActivityIdentity(CodeCommentActivity activity) {- this.clazz = ClassUtils.unproxy(activity.getClass());- this.id = activity.getId();- }-- CodeCommentActivity getActivity() {- return GitPlex.getInstance(Dao.class).load(clazz, id);- }-- }-}+package com.gitplex.server.web.component.comment;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Date;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+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.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+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.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.StaleStateException;++import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.commons.util.ClassUtils;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;+import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;+import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;+import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentReply;+import com.gitplex.server.core.entity.CodeCommentStatusChange;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.support.DepotAndRevision;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CodeCommentReplyManager;+import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.util.DateUtils;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++@SuppressWarnings("serial")+public abstract class CodeCommentPanel extends Panel {++ private final Long commentId;++ private RepeatingView activitiesView;++ /**+ * We pass comment id instead of comment model as we want to make sure that+ * comment is always loaded upon usage as this panel is involved in websocket+ * update and websocket update does not detach models at end of request which+ * may result in Hibernate lazy load exception when the comment is used again+ * in next request+ *+ * @param id+ * @param commentId+ */+ public CodeCommentPanel(String id, Long commentId) {+ super(id);+ this.commentId = commentId;+ }++ protected CodeComment getComment() {+ return GitPlex.getInstance(CodeCommentManager.class).load(commentId);+ }++ private WebMarkupContainer newCommentContainer() {+ WebMarkupContainer commentContainer = new Fragment("comment", "viewFrag", this);+ commentContainer.setOutputMarkupId(true);++ commentContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getComment().isVisitedAfter(getComment().getDate())?"": "new";+ }++ }));++ commentContainer.add(new AvatarLink("userAvatar", getComment().getUser()));+ commentContainer.add(new AccountLink("userName", getComment().getUser()));+ commentContainer.add(new Label("activityDescription", "commented"));+ commentContainer.add(new Label("activityDate", DateUtils.formatAge(getComment().getDate())));+ commentContainer.add(new Link<Void>("compareContext") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getCompareContext(getComment()).equals(getComment().getCompareContext())+ && !getComment().getCommentPos().getCommit().equals(getComment().getCompareContext().getCompareCommit()));+ }++ @Override+ public void onClick() {+ CodeComment comment = getComment();+ CompareContext compareContext = comment.getCompareContext();+ PullRequest request = getPullRequest();+ if (request != null) {+ RequestChangesPage.State state = new RequestChangesPage.State();+ state.commentId = comment.getId();+ if (compareContext.isLeftSide()) {+ state.oldCommit = compareContext.getCompareCommit();+ state.newCommit = comment.getCommentPos().getCommit();+ } else {+ state.oldCommit = comment.getCommentPos().getCommit();+ state.newCommit = compareContext.getCompareCommit();+ }+ state.mark = comment.getCommentPos();+ state.pathFilter = compareContext.getPathFilter();+ state.whitespaceOption = compareContext.getWhitespaceOption();+ PageParameters params = RequestChangesPage.paramsOf(request, state);+ setResponsePage(RequestChangesPage.class, params);+ } else {+ RevisionComparePage.State state = new RevisionComparePage.State();+ state.commentId = comment.getId();+ state.compareWithMergeBase = false;+ if (compareContext.isLeftSide()) {+ state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());+ state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());+ } else {+ state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());+ state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());+ }+ state.mark = comment.getCommentPos();+ state.pathFilter = compareContext.getPathFilter();+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.whitespaceOption = compareContext.getWhitespaceOption();+ PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);+ setResponsePage(RevisionComparePage.class, params);+ }+ }++ }.add(AttributeAppender.append("title", "This comment is added in a different compare context, click to show")));++ MarkdownEditSupport editSupport;+ if (SecurityUtils.canModify(getComment())) {+ editSupport = new MarkdownEditSupport() {++ @Override+ public void setContent(String content) {+ CodeComment comment = getComment();+ comment.setContent(content);+ GitPlex.getInstance(CodeCommentManager.class).save(comment);+ }++ @Override+ public long getVersion() {+ return getComment().getVersion();+ }++ };+ } else {+ editSupport = null;+ }+ commentContainer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getComment().getContent();+ }++ }, editSupport));++ WebMarkupContainer foot = new WebMarkupContainer("foot");+ foot.setVisible(SecurityUtils.canModify(getComment()));+ foot.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment fragment = new Fragment(commentContainer.getId(), "commentEditFrag", CodeCommentPanel.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ CommentInput contentInput = new CommentInput("content", Model.of(getComment().getContent())) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());+ }++ @Override+ protected Depot getDepot() {+ return getComment().getDepot();+ }++ };+ form.add(contentInput);+ contentInput.setRequired(true);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ WebMarkupContainer commentContainer = newCommentContainer();+ fragment.replaceWith(commentContainer);+ target.add(commentContainer);+ }++ });++ long lastVersion = getComment().getVersion();+ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ try {+ CodeComment comment = getComment();+ if (comment.getVersion() != lastVersion)+ throw new StaleStateException("");+ comment.setContent(contentInput.getModelObject());+ GitPlex.getInstance(CodeCommentManager.class).save(comment);+ WebMarkupContainer commentContainer = newCommentContainer();+ fragment.replaceWith(commentContainer);+ target.add(commentContainer);+ onSaveComment(target, comment);+ } catch (StaleStateException e) {+ error("Some one changed the content you are editing. Reload the page and try again.");+ target.add(feedback);+ }+ }++ });++ fragment.add(form);+ fragment.setOutputMarkupId(true);+ commentContainer.replaceWith(fragment);+ target.add(fragment);+ }++ });++ foot.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ String confirmMessage;+ if (getComment().getReplies().isEmpty()) {+ confirmMessage = "Do you really want to delete this comment?";+ } else {+ confirmMessage = "Deleting this comment will also delete all replies, do you really "+ + "want to continue?";+ }+ attributes.getAjaxCallListeners().add(new ConfirmListener(confirmMessage));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onDeleteComment(target, getComment());+ GitPlex.getInstance(CodeCommentManager.class).delete(getComment());+ }++ });++ commentContainer.add(foot);+ return commentContainer;+ }++ private WebMarkupContainer newActivityContainer(String componentId, CodeCommentActivity activity) {+ ActivityIdentity identity = new ActivityIdentity(activity);+ Fragment activityContainer = new Fragment(componentId, "viewFrag", this, Model.of(identity));+ activityContainer.setOutputMarkupId(true);+ activityContainer.setMarkupId(activity.getAnchor());++ activityContainer.add(new AvatarLink("userAvatar", activity.getUser()));+ activityContainer.add(new AccountLink("userName", activity.getUser()));+ String activityDescription;+ if (activity instanceof CodeCommentStatusChange) {+ CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;+ if (statusChange.isResolved())+ activityDescription = "resolved";+ else+ activityDescription = "unresolved";+ } else {+ activityDescription = "replied";+ }+ activityContainer.add(new Label("activityDescription", activityDescription));+ activityContainer.add(new Label("activityDate", DateUtils.formatAge(activity.getDate())));+ activityContainer.add(new Link<Void>("compareContext") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getCompareContext(getComment()).equals(identity.getActivity().getCompareContext())+ && !getComment().getCommentPos().getCommit().equals(identity.getActivity().getCompareContext().getCompareCommit()));+ }++ @Override+ public void onClick() {+ CodeCommentActivity activity = identity.getActivity();+ CompareContext compareContext = activity.getCompareContext();+ PullRequest request = getPullRequest();+ if (request != null) {+ RequestChangesPage.State state = new RequestChangesPage.State();+ state.commentId = activity.getComment().getId();+ if (compareContext.isLeftSide()) {+ state.oldCommit = compareContext.getCompareCommit();+ state.newCommit = activity.getComment().getCommentPos().getCommit();+ } else {+ state.oldCommit = activity.getComment().getCommentPos().getCommit();+ state.newCommit = compareContext.getCompareCommit();+ }+ state.mark = activity.getComment().getCommentPos();+ state.pathFilter = compareContext.getPathFilter();+ state.whitespaceOption = compareContext.getWhitespaceOption();+ PageParameters params = RequestChangesPage.paramsOf(request, state);+ setResponsePage(RequestChangesPage.class, params);+ } else {+ RevisionComparePage.State state = new RevisionComparePage.State();+ CodeComment comment = activity.getComment();+ state.commentId = comment.getId();+ state.compareWithMergeBase = false;+ if (compareContext.isLeftSide()) {+ state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());+ state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());+ } else {+ state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());+ state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());+ }+ state.mark = comment.getCommentPos();+ state.pathFilter = compareContext.getPathFilter();+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.whitespaceOption = compareContext.getWhitespaceOption();+ PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);+ setResponsePage(RevisionComparePage.class, params);+ }+ }++ }.add(AttributeAppender.append("title", "This reply is added in a different compare context, click to show")));++ if (StringUtils.isNotBlank(activity.getNote())) {+ MarkdownEditSupport editSupport;+ if (SecurityUtils.canModify(getComment())) {+ editSupport = new MarkdownEditSupport() {++ @Override+ public void setContent(String content) {+ if (identity.clazz == CodeCommentReply.class) {+ CodeCommentReply reply = (CodeCommentReply) activity;+ reply.setContent(content);+ GitPlex.getInstance(CodeCommentReplyManager.class).save(reply);+ } else {+ CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;+ statusChange.setNote(content);+ GitPlex.getInstance(CodeCommentStatusChangeManager.class).save(statusChange);+ }+ }++ @Override+ public long getVersion() {+ return identity.getActivity().getVersion();+ }++ };+ } else {+ editSupport = null;+ }+ activityContainer.add(new MarkdownPanel("content", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return identity.getActivity().getNote();+ }++ }, editSupport));++ } else {+ activityContainer.add(new Label("content", "<div class='no-note'>No note</div>").setEscapeModelStrings(false));+ }++ WebMarkupContainer foot = new WebMarkupContainer("foot");+ foot.setVisible(SecurityUtils.canModify(activity));++ foot.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment fragment = new Fragment(activityContainer.getId(), "activityEditFrag",+ CodeCommentPanel.this, Model.of(identity.id));+ Form<?> form = new Form<Void>("form");+ CommentInput contentInput = new CommentInput("content", Model.of(identity.getActivity().getNote())) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());+ }++ @Override+ protected Depot getDepot() {+ return getComment().getDepot();+ }++ };+ contentInput.setRequired(identity.clazz == CodeCommentReply.class);+ form.add(contentInput);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ WebMarkupContainer replyContainer = newActivityContainer(componentId, identity.getActivity());+ fragment.replaceWith(replyContainer);+ target.add(replyContainer);+ }++ });++ long lastVersion = identity.getActivity().getVersion();+ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ try {+ CodeCommentActivity activity = identity.getActivity();+ if (activity.getVersion() != lastVersion)+ throw new StaleStateException("");++ if (identity.clazz == CodeCommentReply.class) {+ CodeCommentReply reply = (CodeCommentReply) activity;+ reply.setContent(contentInput.getModelObject());+ GitPlex.getInstance(CodeCommentReplyManager.class).save(reply);+ } else {+ CodeCommentStatusChange statusChange = (CodeCommentStatusChange) activity;+ statusChange.setNote(contentInput.getModelObject());+ GitPlex.getInstance(CodeCommentStatusChangeManager.class).save(statusChange);+ }+ WebMarkupContainer activityContainer = newActivityContainer(componentId, identity.getActivity());+ fragment.replaceWith(activityContainer);+ target.add(activityContainer);+ } catch (StaleStateException e) {+ error("Some one changed the content you are editing. Reload the page and try again.");+ target.add(feedback);+ }+ }++ }.add(new Label("label", "Save")));++ fragment.add(form);+ fragment.setOutputMarkupId(true);+ activityContainer.replaceWith(fragment);+ target.add(fragment);+ }++ });+ foot.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 this reply?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ activityContainer.remove();+ GitPlex.getInstance(CodeCommentReplyManager.class).delete((CodeCommentReply) identity.getActivity());+ String script = String.format("$('#%s').remove();", activityContainer.getMarkupId());+ target.appendJavaScript(script);+ }++ }.setVisible(activity instanceof CodeCommentReply));++ activityContainer.add(foot);+ return activityContainer;+ }++ private WebMarkupContainer newAddReplyContainer() {+ WebMarkupContainer addReplyContainer = new Fragment("addReply", "addReplyFrag", this) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getAccount() != null);+ }++ };+ addReplyContainer.setOutputMarkupId(true);+ addReplyContainer.add(new AjaxLink<Void>("reply") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onAddReply(target, false);+ }++ });+ return addReplyContainer;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newCommentContainer());++ activitiesView = new RepeatingView("activities");+ PullRequest request = getPullRequest();++ List<CodeCommentActivity> activities = new ArrayList<>();+ for (CodeCommentReply reply: getComment().getReplies()) {+ if (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null) {+ activities.add(reply);+ }+ }+ for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {+ if (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null) {+ activities.add(statusChange);+ }+ }++ activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));++ for (CodeCommentActivity activity: activities) {+ Component activityContainer = newActivityContainer(activitiesView.newChildId(), activity);+ if (!getComment().isVisitedAfter(activity.getDate()))+ activityContainer.add(AttributeAppender.append("class", "new"));+ activitiesView.add(activityContainer);+ }+ add(activitiesView);+ add(newAddReplyContainer());++ setOutputMarkupId(true);++ add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ Date lastActivityDate;+ String prevActivityMarkupId;+ if (activitiesView.size() != 0) {+ @SuppressWarnings("deprecation")+ Component lastActivityContainer = activitiesView.get(activitiesView.size()-1);++ CodeCommentActivity lastActivity = ((ActivityIdentity) lastActivityContainer.getDefaultModelObject()).getActivity();+ lastActivityDate = lastActivity.getDate();+ prevActivityMarkupId = lastActivityContainer.getMarkupId();+ } else {+ lastActivityDate = getComment().getDate();+ prevActivityMarkupId = get("comment").getMarkupId();+ }++ PullRequest request = getPullRequest();+ List<CodeCommentActivity> activities = new ArrayList<>();+ for (CodeCommentReply reply: getComment().getReplies()) {+ if (reply.getDate().getTime()>lastActivityDate.getTime()+ && (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null)) {+ activities.add(reply);+ }+ }+ for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {+ if (statusChange.getDate().getTime()>lastActivityDate.getTime()+ && (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null)) {+ activities.add(statusChange);+ }+ }+ activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));++ for (CodeCommentActivity activity: activities) {+ Component newActivityContainer = newActivityContainer(activitiesView.newChildId(), activity);+ newActivityContainer.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityContainer);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityContainer.getMarkupId(), prevActivityMarkupId);+ handler.prependJavaScript(script);+ handler.add(newActivityContainer);+ prevActivityMarkupId = newActivityContainer.getMarkupId();+ }+ }++ @Override+ protected void onEndInitialRequest(RequestCycle cycle) {+ if (SecurityUtils.getAccount() != null) {+ GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getComment());+ }+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new CodeCommentResourceReference()));+ }++ private void onAddReply(AjaxRequestTarget target, boolean changeStatus) {+ Fragment fragment = new Fragment("addReply", "activityEditFrag", CodeCommentPanel.this);+ Form<?> form = new Form<Void>("form");+ CommentInput contentInput = new CommentInput("content", Model.of("")) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());+ }++ @Override+ protected Depot getDepot() {+ return getComment().getDepot();+ }++ };+ contentInput.setRequired(!changeStatus);+ form.add(contentInput);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ WebMarkupContainer addReplyContainer = newAddReplyContainer();+ fragment.replaceWith(addReplyContainer);+ target.add(addReplyContainer);+ }++ });++ AjaxButton saveButton = new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Account user = SecurityUtils.getAccount();+ CodeComment comment = getComment();+ Date date = new Date();+ CompareContext compareContext = getCompareContext(comment);+ if (changeStatus) {+ CodeCommentStatusChange statusChange = new CodeCommentStatusChange();+ statusChange.setComment(getComment());+ statusChange.setUser(user);+ statusChange.setCompareContext(compareContext);+ statusChange.setResolved(!comment.isResolved());+ statusChange.setDate(date);+ statusChange.setNote(contentInput.getModelObject());++ GitPlex.getInstance(CodeCommentManager.class).changeStatus(statusChange);+ onStatusChanged(target, fragment, statusChange);+ onSaveComment(target, getComment());+ } else {+ CodeCommentReply reply = new CodeCommentReply();+ reply.setComment(comment);+ reply.setDate(date);+ reply.setUser(user);+ reply.setContent(contentInput.getModelObject());+ reply.setCompareContext(compareContext);+ GitPlex.getInstance(CodeCommentReplyManager.class).save(reply, true);+ onReplyAdded(target, fragment, reply);+ }+ }++ };+ if (changeStatus) {+ saveButton.add(new Label("label", getComment().isResolved()?"Confirm unresolve":"Confirm resolve"));+ } else {+ saveButton.add(new Label("label", "Save"));+ saveButton.add(AttributeAppender.append("class", "dirty-aware"));+ }+ form.add(saveButton);++ fragment.add(form);+ fragment.setOutputMarkupId(true);+ get("addReply").replaceWith(fragment);+ target.add(fragment);+ }++ public void onChangeStatus(AjaxRequestTarget target) {+ onAddReply(target, true);+ }++ private void onStatusChanged(AjaxRequestTarget target, Fragment fragment, CodeCommentStatusChange statusChange) {+ WebMarkupContainer activityContainer = newActivityContainer(activitiesView.newChildId(), statusChange);+ activitiesView.add(activityContainer);++ String script = String.format("$('#%s .add-reply').before('<div id=\"%s\"></div>');",+ CodeCommentPanel.this.getMarkupId(), activityContainer.getMarkupId());+ target.prependJavaScript(script);+ target.add(activityContainer);++ WebMarkupContainer addReplyContainer = newAddReplyContainer();+ fragment.replaceWith(addReplyContainer);+ target.add(addReplyContainer);+ }++ private void onReplyAdded(AjaxRequestTarget target, Fragment fragment, @Nullable CodeCommentReply reply) {+ if (reply != null) {+ WebMarkupContainer activityContainer = newActivityContainer(activitiesView.newChildId(), reply);+ activitiesView.add(activityContainer);++ String script = String.format("$('#%s .add-reply').before('<div id=\"%s\"></div>');",+ CodeCommentPanel.this.getMarkupId(), activityContainer.getMarkupId());+ target.prependJavaScript(script);+ target.add(activityContainer);+ }++ WebMarkupContainer addReplyContainer = newAddReplyContainer();+ fragment.replaceWith(addReplyContainer);+ target.add(addReplyContainer);+ }++ protected abstract void onDeleteComment(AjaxRequestTarget target, CodeComment comment);++ protected abstract void onSaveComment(AjaxRequestTarget target, CodeComment comment);++ protected abstract CompareContext getCompareContext(CodeComment comment);++ protected abstract PullRequest getPullRequest();++ private static class ActivityIdentity implements Serializable {++ final Class<? extends CodeCommentActivity> clazz;++ final Long id;++ ActivityIdentity(CodeCommentActivity activity) {+ this.clazz = ClassUtils.unproxy(activity.getClass());+ this.id = activity.getId();+ }++ CodeCommentActivity getActivity() {+ return GitPlex.getInstance(Dao.class).load(clazz, id);+ }++ }+}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentResourceReference.javaindex a9f57132cf..ed33e9376b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.html b/server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javaindex 8b67d9ace8..a3c31333b7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import java.util.ArrayList;import java.util.HashMap;@@ -21,16 +21,16 @@ import org.hibernate.criterion.Restrictions;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.web.avatar.AvatarManager;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;import com.gitplex.commons.wicket.behavior.markdown.MarkdownBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.web.avatar.AvatarManager;@SuppressWarnings("serial")public abstract class CommentInput extends TextArea<String> {@@ -113,7 +113,7 @@ public abstract class CommentInput extends TextArea<String> {super.renderHead(component, response);response.render(JavaScriptHeaderItem.forReference(new CommentInputResourceReference()));- String script = String.format("gitplex.comment('%s', %s, %s);",+ String script = String.format("gitplex.server.comment('%s', %s, %s);",component.getMarkupId(true), ATWHO_LIMIT,getCallbackFunction(CallbackParameter.explicit("type"), CallbackParameter.explicit("param")));response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInputResourceReference.javasimilarity index 67%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInputResourceReference.javaindex c8a427aa4f..027171c4c4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/CommentInputResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class CommentInputResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.javaindex 5d5ed01d0b..405bcc2c3c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import java.io.File;import java.io.FileOutputStream;@@ -11,17 +11,17 @@ import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AttachmentManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.resource.AttachmentResource;-import com.gitplex.web.resource.AttachmentResourceReference;import com.google.common.base.Preconditions;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AttachmentManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.resource.AttachmentResource;+import com.gitplex.server.web.resource.AttachmentResourceReference;import jersey.repackaged.com.google.common.base.Throwables;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.javasimilarity index 73%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.javaindex 5430931e1d..ba986341d5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java@@ -1,12 +1,12 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Element;-import com.gitplex.core.entity.Account;-import com.gitplex.core.util.markdown.MentionParser;-import com.gitplex.web.page.account.overview.AccountOverviewPage;import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.util.markdown.MentionParser;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;public class MentionTransformer extends MentionParser implements HtmlTransformer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.javasimilarity index 70%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.javaindex 9e4f9523bf..299e3b1047 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java@@ -1,12 +1,12 @@-package com.gitplex.web.component.comment;+package com.gitplex.server.web.component.comment;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Element;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.util.markdown.PullRequestParser;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.util.markdown.PullRequestParser;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;public class PullRequestTransformer extends PullRequestParser implements HtmlTransformer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment-list.css b/server.web/src/main/java/com/gitplex/server/web/component/comment/code-comment-list.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment-list.cssrename to server.web/src/main/java/com/gitplex/server/web/component/comment/code-comment-list.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment.css b/server.web/src/main/java/com/gitplex/server/web/component/comment/code-comment.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment.cssrename to server.web/src/main/java/com/gitplex/server/web/component/comment/code-comment.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comment-input.js b/server.web/src/main/java/com/gitplex/server/web/component/comment/comment-input.jssimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/comment-input.jsrename to server.web/src/main/java/com/gitplex/server/web/component/comment/comment-input.jsindex b33bedc932..f290313fb8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comment-input.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/comment-input.js@@ -1,39 +1,39 @@-gitplex.comment = function(inputId, atWhoLimit, callback) {- var $input = $("#" + inputId);-- $input.prevAll(".md-help").html(- "<a href='https://help.github.com/articles/github-flavored-markdown/' target='_blank'>GitHub flavored markdown</a> " +- "is accepted here. You can also input:" +- "<ul>" +- "<li><b>@user_login_name</b> to mention/notify an user. " +- "<li><b>#pull_request_number</b> to reference a pull request. " +- "<li><b>:emoji:</b> to insert an emoji." +- "</ul>");-- $input.atwho({- at: '@',- searchKey: "searchKey",- callbacks: {- remoteFilter: function(query, renderCallback) {- $input.data("atWhoUserRenderCallback", renderCallback);- callback("userQuery", query);- }- },- displayTpl: "<li><span class='avatar'><img src='${avatarUrl}'/></span> ${name} <small>${fullName}</small></li>",- limit: atWhoLimit- });-- $input.atwho({- at: '#',- searchKey: "searchKey",- callbacks: {- remoteFilter: function(query, renderCallback) {- $input.data("atWhoRequestRenderCallback", renderCallback);- callback("requestQuery", query);- }- },- displayTpl: "<li><span class='text-muted'>#${requestNumber}</span> - ${requestTitle}</li>",- insertTpl: '#${requestNumber}',- limit: atWhoLimit- });-};+gitplex.server.comment = function(inputId, atWhoLimit, callback) {+ var $input = $("#" + inputId);++ $input.prevAll(".md-help").html(+ "<a href='https://help.github.com/articles/github-flavored-markdown/' target='_blank'>GitHub flavored markdown</a> " ++ "is accepted here. You can also input:" ++ "<ul>" ++ "<li><b>@user_login_name</b> to mention/notify an user. " ++ "<li><b>#pull_request_number</b> to reference a pull request. " ++ "<li><b>:emoji:</b> to insert an emoji." ++ "</ul>");++ $input.atwho({+ at: '@',+ searchKey: "searchKey",+ callbacks: {+ remoteFilter: function(query, renderCallback) {+ $input.data("atWhoUserRenderCallback", renderCallback);+ callback("userQuery", query);+ }+ },+ displayTpl: "<li><span class='avatar'><img src='${avatarUrl}'/></span> ${name} <small>${fullName}</small></li>",+ limit: atWhoLimit+ });++ $input.atwho({+ at: '#',+ searchKey: "searchKey",+ callbacks: {+ remoteFilter: function(query, renderCallback) {+ $input.data("atWhoRequestRenderCallback", renderCallback);+ callback("requestQuery", query);+ }+ },+ displayTpl: "<li><span class='text-muted'>#${requestNumber}</span> - ${requestTitle}</li>",+ insertTpl: '#${requestNumber}',+ limit: atWhoLimit+ });+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.javaindex 3a6b82b43d..b92f6daf9e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.comment.comparecontext;+package com.gitplex.server.web.component.comment.comparecontext;import java.util.ArrayList;import java.util.List;@@ -21,15 +21,15 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.DepotAndRevision;-import com.gitplex.web.component.revisionpicker.RevisionSelector;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.lang.diff.WhitespaceOption;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.DepotAndRevision;+import com.gitplex.server.web.component.revisionpicker.RevisionSelector;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class CompareContextPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.javasimilarity index 65%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.javaindex 3730e3e58b..f8aaeb2fcb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.component.comment.comparecontext;+package com.gitplex.server.web.component.comment.comparecontext;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;public class CompareContextResourceReference extends BaseDependentCssResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/compare-context.css b/server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/compare-context.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/compare-context.cssrename to server.web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/compare-context.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.javaindex 7391688d66..7fe2919c97 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commitgraph;+package com.gitplex.server.web.component.commitgraph;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.snapsvg.SnapSvgResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class CommitGraphResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.java b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.javaindex 944068a6fa..d64dcf5e5b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commitgraph;+package com.gitplex.server.web.component.commitgraph;import java.util.ArrayList;import java.util.HashMap;@@ -10,7 +10,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;+import com.gitplex.server.core.GitPlex;public class CommitGraphUtils {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.css b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/commit-graph.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.cssrename to server.web/src/main/java/com/gitplex/server/web/component/commitgraph/commit-graph.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.js b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/commit-graph.jssimilarity index 98%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.jsrename to server.web/src/main/java/com/gitplex/server/web/component/commitgraph/commit-graph.jsindex e09ccf0edb..3c3dcb63cb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitgraph/commit-graph.js@@ -1,10 +1,10 @@-gitplex.commitgraph = {+gitplex.server.commitgraph = {render: function(containerId, commits) {var $container = $("#" + containerId);$container.prepend("<svg class='commit-graph'></svg>");var $graph = $container.children("svg");- gitplex.commitgraph.populateData($graph, commits);- gitplex.commitgraph.drawGraph($graph);+ gitplex.server.commitgraph.populateData($graph, commits);+ gitplex.server.commitgraph.drawGraph($graph);var paper = Snap($graph[0]);function getCommitDot(e) {@@ -429,7 +429,7 @@ $(function() {return;e.stopPropagation();$(".commit-graph").each(function() {- gitplex.commitgraph.drawGraph($(this));+ gitplex.server.commitgraph.drawGraph($(this));});});});diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashPanel.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashPanel.javaindex f2f4a6286e..ae35430a62 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commithash;+package com.gitplex.server.web.component.commithash;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashResourceReference.javaindex 63e9fe3d71..0b1243990c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commithash/CommitHashResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commithash;+package com.gitplex.server.web.component.commithash;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commithash/commit-hash.css b/server.web/src/main/java/com/gitplex/server/web/component/commithash/commit-hash.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commithash/commit-hash.cssrename to server.web/src/main/java/com/gitplex/server/web/component/commithash/commit-hash.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.javaindex 97686dc28f..e8d13b0fb6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java@@ -1,211 +1,211 @@-package com.gitplex.web.component.commitlist;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.CssHeaderItem;-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.BookmarkablePageLink;-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.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-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.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.revwalk.RevCommit;-import org.joda.time.DateTime;--import com.gitplex.core.entity.Depot;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.ContributorAvatars;-import com.gitplex.web.component.commitgraph.CommitGraphResourceReference;-import com.gitplex.web.component.commitgraph.CommitGraphUtils;-import com.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;-import com.gitplex.web.component.contributorpanel.ContributorPanel;-import com.gitplex.web.model.CommitRefsModel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;--@SuppressWarnings("serial")-public class CommitListPanel extends Panel {-- private final IModel<Depot> depotModel;-- private final IModel<List<RevCommit>> commitsModel;-- private final IModel<Map<String, List<String>>> labelsModel = new CommitRefsModel(new AbstractReadOnlyModel<Depot>() {-- @Override- public Depot getObject() {- return depotModel.getObject();- }-- });-- private WebMarkupContainer container;-- public CommitListPanel(String id, IModel<Depot> depotModel, IModel<List<RevCommit>> commitsModel) {- super(id);- this.depotModel = depotModel;- this.commitsModel = new LoadableDetachableModel<List<RevCommit>>() {-- @Override- protected List<RevCommit> load() {- List<RevCommit> commits = commitsModel.getObject();- if (commits.size() > Constants.MAX_DISPLAY_COMMITS)- commits = commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());- CommitGraphUtils.sort(commits, 0);- return separateByDate(commits);- }-- @Override- protected void onDetach() {- commitsModel.detach();- super.onDetach();- }-- };- }-- @Override- protected void onInitialize() {- super.onInitialize();-- String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;- add(new Label("tooManyCommits", tooManyMessage) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(commitsModel.getObject().size()>Constants.MAX_DISPLAY_COMMITS);- }-- });- add(new Label("noAnyCommits", "No any commits found") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(commitsModel.getObject().isEmpty());- }-- });-- container = new WebMarkupContainer("container");- container.setOutputMarkupId(true);- add(container);- container.add(new ListView<RevCommit>("commits", commitsModel) {-- private int itemIndex;-- @Override- protected void onBeforeRender() {- itemIndex = 0;- super.onBeforeRender();- }-- @Override- protected void populateItem(ListItem<RevCommit> item) {- RevCommit commit = item.getModelObject();-- Fragment fragment;- if (commit != null) {- fragment = new Fragment("commit", "commitFrag", CommitListPanel.this);- fragment.add(new ContributorAvatars("avatar",- commit.getAuthorIdent(), commit.getCommitterIdent()));-- fragment.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));-- RepeatingView labelsView = new RepeatingView("labels");-- List<String> commitLabels = labelsModel.getObject().get(commit.name());- if (commitLabels == null)- commitLabels = new ArrayList<>();- for (String label: commitLabels)- labelsView.add(new Label(labelsView.newChildId(), label));- fragment.add(labelsView);-- fragment.add(new ContributorPanel("contribution",- commit.getAuthorIdent(), commit.getCommitterIdent(), true));-- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = commit.name();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<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()))));-- DepotFilePage.State browseState = new DepotFilePage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- fragment.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));-- item.add(AttributeAppender.append("class", "commit clearfix commit-item-" + itemIndex++));- } else {- fragment = new Fragment("commit", "dateFrag", CommitListPanel.this);- DateTime dateTime = new DateTime(getModelObject().get(item.getIndex()+1).getCommitterIdent().getWhen());- fragment.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));- if (item.getIndex() == 0)- item.add(AttributeAppender.append("class", "date first"));- else- item.add(AttributeAppender.append("class", "date"));- }- item.add(fragment);- }-- });-- }-- private List<RevCommit> separateByDate(List<RevCommit> commits) {- List<RevCommit> separated = new ArrayList<>();- DateTime groupTime = null;- for (RevCommit commit: commits) {- DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen());- if (groupTime == null || commitTime.getYear() != groupTime.getYear()- || commitTime.getDayOfYear() != groupTime.getDayOfYear()) {- groupTime = commitTime;- separated.add(null);- }- separated.add(commit);- }- return separated;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));- response.render(CssHeaderItem.forReference(new CommitListResourceReference()));-- String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject());- String script = String.format("gitplex.commitgraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits);- response.render(OnDomReadyHeaderItem.forScript(script));- }-- @Override- protected void onDetach() {- depotModel.detach();- commitsModel.detach();-- super.onDetach();- }--}+package com.gitplex.server.web.component.commitlist;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+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.BookmarkablePageLink;+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.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+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.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.revwalk.RevCommit;+import org.joda.time.DateTime;++import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.ContributorAvatars;+import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReference;+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.model.CommitRefsModel;+import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;++@SuppressWarnings("serial")+public class CommitListPanel extends Panel {++ private final IModel<Depot> depotModel;++ private final IModel<List<RevCommit>> commitsModel;++ private final IModel<Map<String, List<String>>> labelsModel = new CommitRefsModel(new AbstractReadOnlyModel<Depot>() {++ @Override+ public Depot getObject() {+ return depotModel.getObject();+ }++ });++ private WebMarkupContainer container;++ public CommitListPanel(String id, IModel<Depot> depotModel, IModel<List<RevCommit>> commitsModel) {+ super(id);+ this.depotModel = depotModel;+ this.commitsModel = new LoadableDetachableModel<List<RevCommit>>() {++ @Override+ protected List<RevCommit> load() {+ List<RevCommit> commits = commitsModel.getObject();+ if (commits.size() > Constants.MAX_DISPLAY_COMMITS)+ commits = commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());+ CommitGraphUtils.sort(commits, 0);+ return separateByDate(commits);+ }++ @Override+ protected void onDetach() {+ commitsModel.detach();+ super.onDetach();+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;+ add(new Label("tooManyCommits", tooManyMessage) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(commitsModel.getObject().size()>Constants.MAX_DISPLAY_COMMITS);+ }++ });+ add(new Label("noAnyCommits", "No any commits found") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(commitsModel.getObject().isEmpty());+ }++ });++ container = new WebMarkupContainer("container");+ container.setOutputMarkupId(true);+ add(container);+ container.add(new ListView<RevCommit>("commits", commitsModel) {++ private int itemIndex;++ @Override+ protected void onBeforeRender() {+ itemIndex = 0;+ super.onBeforeRender();+ }++ @Override+ protected void populateItem(ListItem<RevCommit> item) {+ RevCommit commit = item.getModelObject();++ Fragment fragment;+ if (commit != null) {+ fragment = new Fragment("commit", "commitFrag", CommitListPanel.this);+ fragment.add(new ContributorAvatars("avatar",+ commit.getAuthorIdent(), commit.getCommitterIdent()));++ fragment.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));++ RepeatingView labelsView = new RepeatingView("labels");++ List<String> commitLabels = labelsModel.getObject().get(commit.name());+ if (commitLabels == null)+ commitLabels = new ArrayList<>();+ for (String label: commitLabels)+ labelsView.add(new Label(labelsView.newChildId(), label));+ fragment.add(labelsView);++ fragment.add(new ContributorPanel("contribution",+ commit.getAuthorIdent(), commit.getCommitterIdent(), true));++ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ Link<Void> hashLink = new BookmarkablePageLink<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()))));++ DepotFilePage.State browseState = new DepotFilePage.State();+ browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);+ fragment.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));++ item.add(AttributeAppender.append("class", "commit clearfix commit-item-" + itemIndex++));+ } else {+ fragment = new Fragment("commit", "dateFrag", CommitListPanel.this);+ DateTime dateTime = new DateTime(getModelObject().get(item.getIndex()+1).getCommitterIdent().getWhen());+ fragment.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));+ if (item.getIndex() == 0)+ item.add(AttributeAppender.append("class", "date first"));+ else+ item.add(AttributeAppender.append("class", "date"));+ }+ item.add(fragment);+ }++ });++ }++ private List<RevCommit> separateByDate(List<RevCommit> commits) {+ List<RevCommit> separated = new ArrayList<>();+ DateTime groupTime = null;+ for (RevCommit commit: commits) {+ DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen());+ if (groupTime == null || commitTime.getYear() != groupTime.getYear()+ || commitTime.getDayOfYear() != groupTime.getDayOfYear()) {+ groupTime = commitTime;+ separated.add(null);+ }+ separated.add(commit);+ }+ return separated;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));+ response.render(CssHeaderItem.forReference(new CommitListResourceReference()));++ String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject());+ String script = String.format("gitplex.server.commitgraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ protected void onDetach() {+ depotModel.detach();+ commitsModel.detach();++ super.onDetach();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListResourceReference.javaindex aea5d0f39c..c7eb12568e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commitlist;+package com.gitplex.server.web.component.commitlist;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/commit-list.css b/server.web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitlist/commit-list.cssrename to server.web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.java b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.javaindex 6891114465..f6cee3e7c9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java@@ -1,13 +1,13 @@-package com.gitplex.web.component.commitmessage;+package com.gitplex.server.web.component.commitmessage;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.unbescape.html.HtmlEscape;-import com.gitplex.core.GitPlex;-import com.gitplex.core.commitmessagetransform.CommitMessageTransformer;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.commitmessagetransform.CommitMessageTransformer;+import com.gitplex.server.core.entity.Depot;@SuppressWarnings("serial")public class CommitMessageLabel extends Label {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageResourceReference.javaindex 2c659e69dc..2852b2c343 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commitmessage;+package com.gitplex.server.web.component.commitmessage;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.html b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.javaindex acaa1c5d30..56caf80d19 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.commitmessage;+package com.gitplex.server.web.component.commitmessage;import java.util.ArrayList;import java.util.List;@@ -17,11 +17,11 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.html.HtmlEscape;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.page.depot.commit.CommitDetailPage;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.util.Highlighter;import com.gitplex.commons.util.Transformer;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.page.depot.commit.CommitDetailPage;@SuppressWarnings("serial")public class ExpandableCommitMessagePanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/commit-message.css b/server.web/src/main/java/com/gitplex/server/web/component/commitmessage/commit-message.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/commit-message.cssrename to server.web/src/main/java/com/gitplex/server/web/component/commitmessage/commit-message.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.javarename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.javaindex af66ff2f7a..d1300acfe2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.confirmdelete;+package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;@SuppressWarnings("serial")public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.javarename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.javaindex f87efdf911..2effc0294e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.confirmdelete;+package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;@SuppressWarnings("serial")public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.javarename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.javaindex 6c015832d2..5c4f9ec745 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.confirmdelete;+package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.html b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.javaindex e07be825aa..28ccf0cd9b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.confirmdelete;+package com.gitplex.server.web.component.confirmdelete;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -56,7 +56,7 @@ abstract class ConfirmDeletePanel extends Panel {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new ConfirmDeleteResourceReference()));- String script = String.format("gitplex.confirmDelete('%s', '%s');", getMarkupId(), getConfirmInput());+ String script = String.format("gitplex.server.confirmDelete('%s', '%s');", getMarkupId(), getConfirmInput());response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteResourceReference.javaindex eb682ea286..50b1777233 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.confirmdelete;+package com.gitplex.server.web.component.confirmdelete;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class ConfirmDeleteResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.css b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/confirm-delete.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.cssrename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/confirm-delete.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.js b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/confirm-delete.jssimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.jsrename to server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/confirm-delete.jsindex 1c7cae1086..f8ea1815e1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/confirmdelete/confirm-delete.js@@ -1,4 +1,4 @@-gitplex.confirmDelete = function(containerId, confirmText) {+gitplex.server.confirmDelete = function(containerId, confirmText) {var $container = $("#" + containerId);$container.find("input.confirm").on("input", function() {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.javaindex 89fd962688..1b7c2e2e86 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.contributorpanel;+package com.gitplex.server.web.component.contributorpanel;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -7,8 +7,8 @@ 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.web.component.AccountLink;-import com.gitplex.web.util.DateUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.util.DateUtils;@SuppressWarnings("serial")public class ContributorPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorResourceReference.javaindex 039f7682e6..6ddd374728 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.contributorpanel;+package com.gitplex.server.web.component.contributorpanel;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/contributor.css b/server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/contributor.cssrename to server.web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.java b/server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.javaindex e03b6bb573..dc96cf6784 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.createbranch;+package com.gitplex.server.web.component.createbranch;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")public abstract class CreateBranchLink extends ModalLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.javaindex 86634b409e..3474efe319 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.createbranch;+package com.gitplex.server.web.component.createbranch;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -11,13 +11,13 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.security.SecurityUtils;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.security.SecurityUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.java b/server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.javarename to server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.javaindex fd5ed1e310..3ef9b14467 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.createtag;+package com.gitplex.server.web.component.createtag;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")public abstract class CreateTagLink extends ModalLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.javaindex cdd8075ae2..29f473038f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.createtag;+package com.gitplex.server.web.component.createtag;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -12,13 +12,13 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.checkresult.GateCheckResult;-import com.gitplex.core.security.SecurityUtils;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;+import com.gitplex.server.core.security.SecurityUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.javaindex 2b39ceac9d..f0d7ab3a7f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java@@ -1,11 +1,11 @@-package com.gitplex.web.component.depotchoice;+package com.gitplex.server.web.component.depotchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.wicket.component.select2.Select2Choice;+import com.gitplex.server.core.entity.Depot;@SuppressWarnings("serial")public class AbstractDepotChoice extends Select2Choice<Depot> {@@ -19,9 +19,9 @@ public class AbstractDepotChoice extends Select2Choice<Depot> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose a repository...");- getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.depotChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.depotChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.depotChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.depotChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.javaindex 59ae49b632..08d2e87347 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotchoice;+package com.gitplex.server.web.component.depotchoice;import java.util.Collection;import java.util.List;@@ -7,11 +7,11 @@ import org.apache.commons.lang3.StringEscapeUtils;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;@SuppressWarnings("serial")public abstract class AbstractDepotChoiceProvider extends ChoiceProvider<Depot> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.javaindex 5839dfdf7c..51b61d4e85 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/DepotChoiceResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.component.depotchoice;+package com.gitplex.server.web.component.depotchoice;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class DepotChoiceResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/depot-choice.js b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.jssimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/depot-choice.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.jsindex f4d1aeb964..e753822cdf 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/depot-choice.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotchoice/depot-choice.js@@ -1,13 +1,13 @@-gitplex.depotChoiceFormatter = {- formatSelection: function(depot) {- return depot.name;- },-- formatResult: function(depot) {- return depot.name;- },-- escapeMarkup: function(m) {- return m;- }+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/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javaindex 6b1176efd1..996c04e181 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.advanced;+package com.gitplex.server.web.component.depotfile.blobsearch.advanced;import java.io.Serializable;import java.util.ArrayList;@@ -37,16 +37,16 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.search.SearchManager;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;-import com.gitplex.search.query.FileQuery;-import com.gitplex.search.query.SymbolQuery;-import com.gitplex.search.query.TextQuery;-import com.gitplex.search.query.TooGeneralQueryException;-import com.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.search.SearchManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.FileQuery;+import com.gitplex.server.search.query.SymbolQuery;+import com.gitplex.server.search.query.TextQuery;+import com.gitplex.server.search.query.TooGeneralQueryException;+import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.behavior.RunTaskBehavior;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.javaindex 6eab68b0bb..23f3ee64bf 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.advanced;+package com.gitplex.server.web.component.depotfile.blobsearch.advanced;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/advanced-search.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/advanced-search.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javaindex fd8c3a8fae..77be7b7132 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.instant;+package com.gitplex.server.web.component.depotfile.blobsearch.instant;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -30,17 +30,17 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.ResourceReference;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.search.SearchManager;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;-import com.gitplex.search.query.FileQuery;-import com.gitplex.search.query.SymbolQuery;-import com.gitplex.search.query.TooGeneralQueryException;-import com.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.search.SearchManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.FileQuery;+import com.gitplex.server.search.query.SymbolQuery;+import com.gitplex.server.search.query.TooGeneralQueryException;+import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;+import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;@@ -184,7 +184,7 @@ public abstract class InstantSearchPanel extends Panel {public void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);String script = String.format(- "gitplex.blobInstantSearch.init('%s', %s);",+ "gitplex.server.blobInstantSearch.init('%s', %s);",searchField.getMarkupId(),getCallbackFunction(explicit("key"), explicit("input")));@@ -318,7 +318,7 @@ public abstract class InstantSearchPanel extends Panel {};- String script = String.format("gitplex.blobInstantSearch.hintOpened('%s', '%s');",+ String script = String.format("gitplex.server.blobInstantSearch.hintOpened('%s', '%s');",searchField.getMarkupId(true), searchHint.getMarkupId(true));target.appendJavaScript(script);}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.javaindex a1be5d5c56..4fe876f9d5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.instant;+package com.gitplex.server.web.component.depotfile.blobsearch.instant;import java.util.List;@@ -6,11 +6,11 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.doneevents.DoneEventsResourceReference;import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class InstantSearchResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.jssimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.jsindex 79dbf4a3fe..2e57178f02 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.js@@ -1,79 +1,79 @@-gitplex.blobInstantSearch = {- init: function(inputId, callback) {- var $input = $("#" + inputId);-- $input.doneEvents("inputchange focus click", function() {- callback("input", $(this).val());- }, 100);- $input.on("blur", function() {- if ($input.data("hint") == null && $input.is(":visible")) {- // in case user clicks advanced button while the- // instant input is shown, we need to hide the- // input after a timeout in order not to make- // the advanced button moving to lost the click- setTimeout(function(){$input.hide();}, 250);- }- });- $input.bind("keydown", "esc", function() {- $input.hide();- });-- $input.data("return", function() {- if (gitplex.commons.form.confirmLeave())- callback("return");- });- $input.data("keyup", function(e) {- var $hint = $input.data("hint");- if ($hint != null) {- e.preventDefault();- var $active = $hint.find("li.hit.active");- var $prev = $active.prev("li.hit");- if ($prev.length != 0) {- $active.removeClass("active");- $prev.addClass("active");- callback("up");- }- $hint.scrollIntoView("li.hit.active", 36, 36);- }- });- $input.data("keydown", function(e) {- var $hint = $input.data("hint");- if ($hint != null) {- e.preventDefault();- var $active = $hint.find("li.hit.active");- var $next = $active.next("li.hit");- if ($next.length != 0) {- $active.removeClass("active");- $next.addClass("active");- callback("down");- }- $hint.scrollIntoView("li.hit.active", 36, 36);- }- });- $input.bind("keydown", "return", $input.data("return"));- $input.bind("keydown", "up", $input.data("keyup"));- $input.bind("keydown", "down", $input.data("keydown"));- },-- hintOpened: function(inputId, hintId) {- var $input = $("#" + inputId);- var $hint = $("#" + hintId);- $hint.bind("keydown", "up", $input.data("keyup"));- $hint.bind("keydown", "down", $input.data("keydown"));- $hint.bind("keydown", "return", $input.data("return"));-- $hint.on("close", function() {- if (!$input.is(":focus") && $input.is(":visible")) {- // in case user clicks advanced button while the- // instant input is shown, we need to hide the- // input after a timeout in order not to make- // the advanced button moving to lost the click- setTimeout(function(){$input.hide();}, 250);- }- $input.data("hint", null);- });-- $input.data("hint", $hint);- }-+gitplex.server.blobInstantSearch = {+ init: function(inputId, callback) {+ var $input = $("#" + inputId);++ $input.doneEvents("inputchange focus click", function() {+ callback("input", $(this).val());+ }, 100);+ $input.on("blur", function() {+ if ($input.data("hint") == null && $input.is(":visible")) {+ // in case user clicks advanced button while the+ // instant input is shown, we need to hide the+ // input after a timeout in order not to make+ // the advanced button moving to lost the click+ setTimeout(function(){$input.hide();}, 250);+ }+ });+ $input.bind("keydown", "esc", function() {+ $input.hide();+ });++ $input.data("return", function() {+ if (gitplex.commons.form.confirmLeave())+ callback("return");+ });+ $input.data("keyup", function(e) {+ var $hint = $input.data("hint");+ if ($hint != null) {+ e.preventDefault();+ var $active = $hint.find("li.hit.active");+ var $prev = $active.prev("li.hit");+ if ($prev.length != 0) {+ $active.removeClass("active");+ $prev.addClass("active");+ callback("up");+ }+ $hint.scrollIntoView("li.hit.active", 36, 36);+ }+ });+ $input.data("keydown", function(e) {+ var $hint = $input.data("hint");+ if ($hint != null) {+ e.preventDefault();+ var $active = $hint.find("li.hit.active");+ var $next = $active.next("li.hit");+ if ($next.length != 0) {+ $active.removeClass("active");+ $next.addClass("active");+ callback("down");+ }+ $hint.scrollIntoView("li.hit.active", 36, 36);+ }+ });+ $input.bind("keydown", "return", $input.data("return"));+ $input.bind("keydown", "up", $input.data("keyup"));+ $input.bind("keydown", "down", $input.data("keydown"));+ },++ hintOpened: function(inputId, hintId) {+ var $input = $("#" + inputId);+ var $hint = $("#" + hintId);+ $hint.bind("keydown", "up", $input.data("keyup"));+ $hint.bind("keydown", "down", $input.data("keydown"));+ $hint.bind("keydown", "return", $input.data("return"));++ $hint.on("close", function() {+ if (!$input.is(":focus") && $input.is(":visible")) {+ // in case user clicks advanced button while the+ // instant input is shown, we need to hide the+ // input after a timeout in order not to make+ // the advanced button moving to lost the click+ setTimeout(function(){$input.hide();}, 250);+ }+ $input.data("hint", null);+ });++ $input.data("hint", $hint);+ }+};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/point.png b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/point.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/point.pngrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/point.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.javaindex e420775d9e..eec395caa9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.component.depotfile.blobsearch.result;import org.apache.commons.lang3.StringEscapeUtils;import org.apache.wicket.Component;@@ -24,10 +24,10 @@ class ConfirmSwitchFileListener implements IAjaxCallListener {@Overridepublic CharSequence getPrecondition(Component component) {if (path != null) {- return String.format("return gitplex.searchresult.confirmSwitchFileByPath('%s');",+ return String.format("return gitplex.server.searchresult.confirmSwitchFileByPath('%s');",StringEscapeUtils.escapeEcmaScript(path));} else {- return String.format("return gitplex.searchresult.confirmSwitchFileByLink('%s');",+ return String.format("return gitplex.server.searchresult.confirmSwitchFileByLink('%s');",component.getMarkupId(true));}}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.javaindex 251bf22cd2..5810358f45 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.component.depotfile.blobsearch.result;import java.io.Serializable;import java.util.List;-import com.gitplex.search.hit.QueryHit;import com.gitplex.commons.util.Range;+import com.gitplex.server.search.hit.QueryHit;public class MatchedBlob implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.javaindex d32e813966..42540d9191 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.component.depotfile.blobsearch.result;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -26,12 +26,12 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.search.hit.FileHit;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.hit.TextHit;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.entity.support.TextRange;+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.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.wicket.component.EmphasizeAwareLabel;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.javaindex 57b3ca952d..378e0f775d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.component.depotfile.blobsearch.result;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.uri.URIResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class SearchResultResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.jssimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.jsindex 657db48455..1d76eabef9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.js@@ -1,17 +1,17 @@-gitplex.searchresult = {- confirmSwitchFileByLink: function(linkId) {- var linkURI = new URI(document.getElementById(linkId));- var currentURI = new URI(window.location.href);- if (linkURI.search(true).path != currentURI.search(true).path)- return gitplex.commons.form.confirmLeave();- else- return true;- },- confirmSwitchFileByPath: function(path) {- var currentURI = new URI(window.location.href);- if (path != currentURI.search(true).path)- return gitplex.commons.form.confirmLeave();- else- return true;- }-};+gitplex.server.searchresult = {+ confirmSwitchFileByLink: function(linkId) {+ var linkURI = new URI(document.getElementById(linkId));+ var currentURI = new URI(window.location.href);+ if (linkURI.search(true).path != currentURI.search(true).path)+ return gitplex.commons.form.confirmLeave();+ else+ return true;+ },+ confirmSwitchFileByPath: function(path) {+ var currentURI = new URI(window.location.href);+ if (path != currentURI.search(true).path)+ return gitplex.commons.form.confirmLeave();+ else+ return true;+ }+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.javaindex a4a70e0548..a231f1bc2e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview;+package com.gitplex.server.web.component.depotfile.blobview;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.javaindex f2bf122146..8755cf4cfc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview;+package com.gitplex.server.web.component.depotfile.blobview;import javax.annotation.Nullable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.javaindex 5ceb5b9317..7aee6223e3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview;+package com.gitplex.server.web.component.depotfile.blobview;import java.io.Serializable;import java.util.List;@@ -8,10 +8,10 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.search.hit.QueryHit;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.search.hit.QueryHit;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.lang.extractors.TokenPosition;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.javaindex 8d2197ac87..41d4f37816 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview;+package com.gitplex.server.web.component.depotfile.blobview;import javax.annotation.Nullable;@@ -17,16 +17,16 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.cycle.RequestCycle;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.resource.BlobResource;-import com.gitplex.web.resource.BlobResourceReference;import com.google.common.base.Preconditions;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;import com.gitplex.commons.wicket.component.ViewStateAwareAjaxLink;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.resource.BlobResource;+import com.gitplex.server.web.resource.BlobResourceReference;@SuppressWarnings("serial")public abstract class BlobViewPanel extends Panel {@@ -169,7 +169,7 @@ public abstract class BlobViewPanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference()));- response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.blobView('%s');", getMarkupId())));+ response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.server.blobView('%s');", getMarkupId())));}public BlobViewContext getContext() {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.javaindex 388c43f928..a63b280c40 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview;+package com.gitplex.server.web.component.depotfile.blobview;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class BlobViewResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.javasimilarity index 59%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.javaindex 5843654e2a..48e29ab977 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java@@ -1,9 +1,9 @@-package com.gitplex.web.component.depotfile.blobview.binary;+package com.gitplex.server.web.component.depotfile.blobview.binary;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;import com.gitplex.commons.git.Blob;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;public class BinaryRenderer implements BlobRenderer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.javasimilarity index 67%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.javaindex 0c4c4fa6ea..79321e1080 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.depotfile.blobview.binary;+package com.gitplex.server.web.component.depotfile.blobview.binary;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;@SuppressWarnings("serial")public class BinaryViewPanel extends BlobViewPanel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.javaindex 1be87afdae..1d0fc85a5f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.binary;+package com.gitplex.server.web.component.depotfile.blobview.binary;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/binary-view.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/binary-view.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/binary-view.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/binary-view.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.jssimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.jsindex 29f33a938d..2683ebf6c0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.js@@ -1,27 +1,27 @@-gitplex.blobView = function(containerId) {- var $blobView = $("#" + containerId + ">.blob-view");- var $head = $blobView.find(">.head");- var $body = $blobView.find(">.body");-- $blobView.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.commons.history.setViewState({scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}});- $body.find(".autofit:visible").first().trigger("storeViewState");- });-- $blobView.on("autofit", function(e, width, height) {- e.stopPropagation();- $blobView.outerWidth(width);- $blobView.outerHeight(height);-- height = $blobView.height()-$head.outerHeight();- $body.outerWidth(width).outerHeight(height);- $body.find(".autofit:visible").first().trigger("autofit", [$body.width(), $body.height()]);-- var viewState = gitplex.commons.history.getViewState();- if (viewState && viewState.scroll) {- $body.scrollLeft(viewState.scroll.left);- $body.scrollTop(viewState.scroll.top);- }- });+gitplex.server.blobView = function(containerId) {+ var $blobView = $("#" + containerId + ">.blob-view");+ var $head = $blobView.find(">.head");+ var $body = $blobView.find(">.body");++ $blobView.on("storeViewState", function(e) {+ e.stopPropagation();+ gitplex.commons.history.setViewState({scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}});+ $body.find(".autofit:visible").first().trigger("storeViewState");+ });++ $blobView.on("autofit", function(e, width, height) {+ e.stopPropagation();+ $blobView.outerWidth(width);+ $blobView.outerHeight(height);++ height = $blobView.height()-$head.outerHeight();+ $body.outerWidth(width).outerHeight(height);+ $body.find(".autofit:visible").first().trigger("autofit", [$body.width(), $body.height()]);++ var viewState = gitplex.commons.history.getViewState();+ if (viewState && viewState.scroll) {+ $body.scrollLeft(viewState.scroll.left);+ $body.scrollTop(viewState.scroll.top);+ }+ });};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.javaindex c60659819a..9dd74ae15a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.gitlink;+package com.gitplex.server.web.component.depotfile.blobview.gitlink;import org.apache.wicket.AttributeModifier;import org.apache.wicket.markup.head.CssHeaderItem;@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.Submodule;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;@SuppressWarnings("serial")public class GitLinkPanel extends BlobViewPanel {diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.javanew file mode 100644index 0000000000..6eb58d64b6--- /dev/null+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java@@ -0,0 +1,17 @@+package com.gitplex.server.web.component.depotfile.blobview.gitlink;++import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;++public class GitLinkRenderer implements BlobRenderer {++ @Override+ public BlobViewPanel render(String panelId, BlobViewContext context) {+ if (context.getBlobIdent().isGitLink())+ return new GitLinkPanel(panelId, context);+ else+ return null;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.javaindex 43475fbbc1..9a59c4e454 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.gitlink;+package com.gitplex.server.web.component.depotfile.blobview.gitlink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/git-link.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/git-link.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/git-link.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/git-link.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.javasimilarity index 56%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.javaindex a02cf1b8c4..6adb7836d0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java@@ -1,9 +1,9 @@-package com.gitplex.web.component.depotfile.blobview.image;+package com.gitplex.server.web.component.depotfile.blobview.image;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;import com.gitplex.commons.git.Blob;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;public class ImageRenderer implements BlobRenderer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.javasimilarity index 68%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.javaindex 58b8b6f712..4b35103bc6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java@@ -1,13 +1,13 @@-package com.gitplex.web.component.depotfile.blobview.image;+package com.gitplex.server.web.component.depotfile.blobview.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.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.resource.BlobResource;-import com.gitplex.web.resource.BlobResourceReference;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.resource.BlobResource;+import com.gitplex.server.web.resource.BlobResourceReference;@SuppressWarnings("serial")public class ImageViewPanel extends BlobViewPanel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.javaindex 1e65cb62ea..9bbb0643fb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.image;+package com.gitplex.server.web.component.depotfile.blobview.image;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/image-view.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/image-view.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/image-view.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/image-view.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.javaindex 15d466e8aa..2cf41d8965 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.markdown;+package com.gitplex.server.web.component.depotfile.blobview.markdown;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;@@ -7,11 +7,11 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.Model;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;import com.gitplex.commons.git.Blob;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;@SuppressWarnings("serial")public class MarkdownFilePanel extends BlobViewPanel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.javaindex f3baa5dbe9..1286e6d60b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.markdown;+package com.gitplex.server.web.component.depotfile.blobview.markdown;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.javasimilarity index 56%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.javaindex 78a8e39d1d..10c56fb918 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java@@ -1,11 +1,11 @@-package com.gitplex.web.component.depotfile.blobview.markdown;+package com.gitplex.server.web.component.depotfile.blobview.markdown;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.web.component.depotfile.blobview.source.SourceViewPanel;import com.gitplex.commons.git.Blob;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;+import com.gitplex.server.web.component.depotfile.blobview.source.SourceViewPanel;public class MarkdownRenderer implements BlobRenderer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/markdown-file.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/markdown-file.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/markdown-file.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/markdown-file.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.javasimilarity index 60%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.javaindex 6690a9a28c..12111242a3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java@@ -1,9 +1,9 @@-package com.gitplex.web.component.depotfile.blobview.source;+package com.gitplex.server.web.component.depotfile.blobview.source;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;import com.gitplex.commons.git.Blob;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;public class SourceRenderer implements BlobRenderer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.javaindex b25b6a6dad..d947fbc5f2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java@@ -1,933 +1,933 @@-package com.gitplex.web.component.depotfile.blobview.source;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.UUID;--import javax.annotation.Nullable;-import javax.servlet.http.Cookie;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-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.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;-import org.apache.wicket.markup.ComponentTag;-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.form.Form;-import org.apache.wicket.markup.html.image.Image;-import org.apache.wicket.markup.html.panel.Fragment;-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.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.http.WebResponse;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;-import org.unbescape.javascript.JavaScriptEscape;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.web.behavior.blamemessage.BlameMessageBehavior;-import com.gitplex.web.component.comment.CodeCommentPanel;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.comment.comparecontext.CompareContextPanel;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.web.component.sourceformat.OptionChangeCallback;-import com.gitplex.web.component.sourceformat.SourceFormatPanel;-import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.util.DateUtils;-import com.google.common.base.Preconditions;-import com.gitplex.commons.git.Blame;-import com.gitplex.commons.git.Blob;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.command.BlameCommand;-import com.gitplex.commons.lang.extractors.ExtractException;-import com.gitplex.commons.lang.extractors.Extractor;-import com.gitplex.commons.lang.extractors.Extractors;-import com.gitplex.commons.lang.extractors.Symbol;-import com.gitplex.commons.util.Range;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--/**- * Make sure to add only one source view panel per page- *- * @author robin- *- */-@SuppressWarnings("serial")-public class SourceViewPanel extends BlobViewPanel {-- private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);-- private static final String COOKIE_OUTLINE = "sourceView.outline";-- private static final String BODY_ID = "body";-- private final List<Symbol> symbols = new ArrayList<>();-- private final IModel<Collection<CodeComment>> commentsModel =- new LoadableDetachableModel<Collection<CodeComment>>() {-- @Override- protected Collection<CodeComment> load() {- return GitPlex.getInstance(CodeCommentManager.class).findAll(- context.getDepot(), context.getCommit(), context.getBlobIdent().path);- }-- };-- private WebMarkupContainer commentContainer;-- private WebMarkupContainer outlineContainer;-- private SourceFormatPanel sourceFormat;-- private SymbolTooltipPanel symbolTooltip;-- private AbstractPostAjaxBehavior ajaxBehavior;-- private BlameMessageBehavior blameMessageBehavior;-- public SourceViewPanel(String id, BlobViewContext context) {- super(id, context);-- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- Preconditions.checkArgument(blob.getText() != null);-- Extractor extractor = GitPlex.getInstance(Extractors.class).getExtractor(context.getBlobIdent().path);- if (extractor != null) {- try {- symbols.addAll(extractor.extract(blob.getText().getContent()));- } catch (ExtractException e) {- logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);- }- }-- }-- @Override- protected WebMarkupContainer newOptions(String id) {- sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.sourceview.onTabSizeChange(%s);", sourceFormat.getTabSize());- target.appendJavaScript(script);- }-- }, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.sourceview.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());- target.appendJavaScript(script);- }-- });- return sourceFormat;- }-- @Override- public WebMarkupContainer newAdditionalActions(String id) {- WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);- actions.add(new PreventDefaultAjaxLink<Void>("blame") {-- @Override- public void onClick(AjaxRequestTarget target) {- boolean blamed = (context.getMode() != Mode.BLAME);- String jsonOfBlameInfos = getJsonOfBlameInfos(blamed);- String script = String.format("gitplex.sourceview.onBlame(%s);", jsonOfBlameInfos);- target.appendJavaScript(script);- context.onBlameChange(target, blamed);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (context.getMode() == Mode.BLAME)- return "active";- else- return "";- }-- })));-- if (!symbols.isEmpty()) {- actions.add(new AjaxLink<Void>("outline") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleOutline(target);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (outlineContainer.isVisible())- return "active";- else- return "";- }-- })));- } else {- actions.add(new WebMarkupContainer("outline").setVisible(false));- }- return actions;- }-- private void toggleOutline(AjaxRequestTarget target) {- WebResponse response = (WebResponse) RequestCycle.get().getResponse();- Cookie cookie;- if (outlineContainer.isVisible()) {- cookie = new Cookie(COOKIE_OUTLINE, "no");- outlineContainer.setVisible(false);- } else {- cookie = new Cookie(COOKIE_OUTLINE, "yes");- outlineContainer.setVisible(true);- }- cookie.setMaxAge(Integer.MAX_VALUE);- response.addCookie(cookie);- target.add(outlineContainer);- target.appendJavaScript("gitplex.sourceview.onToggleOutline();");- }-- public void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {- String script;- if (mark != null) {- script = String.format("gitplex.sourceview.mark(%s, %s);", getJson(mark), scroll);- } else {- script = String.format("gitplex.sourceview.mark(undefined, false);");- }- target.appendJavaScript(script);- }-- private String getJson(TextRange mark) {- try {- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initComment();"));- }-- };-- commentContainer.add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- if (commentContainer.isVisible())- handler.add(commentContainer.get("head").get("toggleResolve"));- }-- });-- WebMarkupContainer head = new WebMarkupContainer("head");- head.setOutputMarkupId(true);- commentContainer.add(head);-- head.add(new DropdownLink("context") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- @Override- protected Component newContent(String id) {- CompareContext compareContext = context.getOpenComment().getCompareContext();- return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {-- @Override- public CodeComment getObject() {- return context.getOpenComment();- }-- }, Model.of(compareContext.getWhitespaceOption()));- }-- });- head.add(new AjaxLink<Void>("locate") {-- @Override- public void onClick(AjaxRequestTarget target) {- CodeComment comment = context.getOpenComment();- TextRange mark;- if (comment != null) {- mark = comment.getCommentPos().getRange();- } else {- mark = (TextRange) commentContainer.getDefaultModelObject();- }- mark(target, mark, true);- context.onMark(target, mark);- target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));- }-- @Override- protected void onInitialize() {- super.onInitialize();- setOutputMarkupId(true);- }-- });-- // use this instead of bookmarkable link as we want to get the link- // updated whenever we re-render the comment container- AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (context.getOpenComment() != null) {- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent = new BlobIdent(context.getBlobIdent());- state.blobIdent.revision = context.getCommit().name();- state.commentId = context.getOpenComment().getId();- state.mark = context.getOpenComment().getCommentPos().getRange();- return urlFor(DepotFilePage.class, DepotFilePage.paramsOf(context.getDepot(), state)).toString();- } else {- return "";- }- }-- });- head.add(new WebMarkupContainer("permanent") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- }.add(appender));-- head.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));- }-- @Override- public void onClick(AjaxRequestTarget target) {- clearComment(target);- if (context.getOpenComment() != null)- context.onCommentOpened(target, null);- target.appendJavaScript("gitplex.sourceview.onCloseComment();");- }-- });-- head.add(new AjaxLink<Void>("toggleResolve") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- CodeComment comment = context.getOpenComment();- if (comment != null) {- if (comment.isResolved()) {- tag.put("title", "Comment is currently resolved, click to unresolve");- tag.put("class", "pull-right resolve resolved");- } else {- tag.put("title", "Comment is currently unresolved, click to resolve");- tag.put("class", "pull-right resolve unresolved");- }- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (SecurityUtils.getAccount() != null) {- ((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);- target.appendJavaScript("gitplex.sourceview.scrollToCommentBottom();");- } else {- Session.get().warn("Please login to resolve/unresolve comment");- }- }-- }.setOutputMarkupId(true));-- commentContainer.setOutputMarkupPlaceholderTag(true);- if (context.getOpenComment() != null && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.add(commentPanel);- } else {- commentContainer.add(new WebMarkupContainer(BODY_ID));- commentContainer.setVisible(false);- }- add(commentContainer);-- add(ajaxBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch(params.getParameterValue("action").toString()) {- case "openSelectionPopover":- TextRange mark = getMark(params, "param1", "param2", "param3", "param4");- String script = String.format("gitplex.sourceview.openSelectionPopover(%s, '%s', %s);",- getJson(mark), context.getMarkUrl(mark),- SecurityUtils.getAccount()!=null);- target.appendJavaScript(script);- break;- case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());-- mark = getMark(params, "param1", "param2", "param3", "param4");- commentContainer.setDefaultModelObject(mark);-- Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);- fragment.setOutputMarkupId(true);-- Form<?> form = new Form<Void>("form");-- String uuid = UUID.randomUUID().toString();-- CommentInput contentInput;- form.add(contentInput = new CommentInput("content", Model.of("")) {-- @Override- protected DepotAttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(context.getDepot(), uuid);- }-- @Override- protected Depot getDepot() {- return context.getDepot();- }-- });- contentInput.setRequired(true);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- clearComment(target);- target.appendJavaScript("gitplex.sourceview.mark(undefined, false);");- target.appendJavaScript("gitplex.sourceview.onLayoutChange();");- context.onMark(target, null);- }-- });-- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- CodeComment comment = new CodeComment();- comment.setUUID(uuid);- comment.setCommentPos(new CommentPos());- comment.getCommentPos().setCommit(context.getCommit().name());- comment.getCommentPos().setPath(context.getBlobIdent().path);- comment.setContent(contentInput.getModelObject());- comment.setDepot(context.getDepot());- comment.setUser(SecurityUtils.getAccount());- comment.getCommentPos().setRange(mark);- comment.setCompareContext(getCompareContext());-- GitPlex.getInstance(CodeCommentManager.class).save(comment);-- CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.replace(commentPanel);- target.add(commentContainer);-- String script = String.format("gitplex.sourceview.onCommentAdded(%s);",- getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, comment);- }-- });- fragment.add(form);- commentContainer.replace(fragment);- commentContainer.setVisible(true);- target.add(commentContainer);- context.onAddComment(target, mark);- target.appendJavaScript(String.format("gitplex.sourceview.onAddComment(%s);", getJson(mark)));- break;- case "openComment":- Long commentId = params.getParameterValue("param1").toLong();- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.replace(commentPanel);- commentContainer.setVisible(true);- target.add(commentContainer);- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);- script = String.format("gitplex.sourceview.onOpenComment(%s);", getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, comment);- break;- }- }-- });-- add(blameMessageBehavior = new BlameMessageBehavior() {-- @Override- protected Depot getDepot() {- return context.getDepot();- }- });-- outlineContainer = new WebMarkupContainer("outline") {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initOutline();"));- }-- };- outlineContainer.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleOutline(target);- }-- });- NestedTree<Symbol> tree;- outlineContainer.add(tree = new NestedTree<Symbol>(BODY_ID, new ITreeProvider<Symbol>() {-- @Override- public void detach() {- }-- @Override- public Iterator<? extends Symbol> getRoots() {- return getChildSymbols(null).iterator();- }-- @Override- public boolean hasChildren(Symbol symbol) {- return !getChildSymbols(symbol).isEmpty();- }-- @Override- public Iterator<? extends Symbol> getChildren(Symbol symbol) {- return getChildSymbols(symbol).iterator();- }-- @Override- public IModel<Symbol> model(Symbol symbol) {- return Model.of(symbol);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new HumanTheme());- }-- @Override- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);- Symbol symbol = nodeModel.getObject();-- fragment.add(new Image("icon", symbol.getIcon()));-- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- context.onSelect(target, context.getBlobIdent(), symbol.getPos());- }-- };- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent = context.getBlobIdent();- state.commentId = CodeComment.idOf(context.getOpenComment());- state.mark = TextRange.of(symbol.getPos());- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- link.add(AttributeAppender.replace("href", urlFor(DepotFilePage.class, params).toString()));- link.add(symbol.render("label", null));- fragment.add(link);-- return fragment;- }-- });-- for (Symbol root: getChildSymbols(null))- tree.expand(root);-- outlineContainer.setOutputMarkupPlaceholderTag(true);- add(outlineContainer);-- if (!symbols.isEmpty()) {- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie(COOKIE_OUTLINE);- if (cookie!=null && cookie.getValue().equals("no"))- outlineContainer.setVisible(false);- } else {- outlineContainer.setVisible(false);- }-- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {-- @Override- public Depot getObject() {- return context.getDepot();- }-- }) {-- @Override- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {- BlobIdent blobIdent = new BlobIdent(- getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- context.onSelect(target, blobIdent, hit.getTokenPos());- }-- @Override- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- context.onSearchComplete(target, hits);- }-- @Override- protected String getBlobPath() {- return context.getBlobIdent().path;- }-- });- }-- private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,- String endLineParam, String endCharParam) {- int beginLine = params.getParameterValue(beginLineParam).toInt();- int beginChar = params.getParameterValue(beginCharParam).toInt();- int endLine = params.getParameterValue(endLineParam).toInt();- int endChar = params.getParameterValue(endCharParam).toInt();- TextRange mark = new TextRange();- mark.beginLine = beginLine;- mark.beginChar = beginChar;- mark.endLine = endLine;- mark.endChar = endChar;- return mark;- }-- private String getJsonOfComment(CodeComment comment) {- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = comment.getCommentPos().getRange();-- String jsonOfCommentInfo;- try {- jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- return jsonOfCommentInfo;- }-- private void clearComment(AjaxRequestTarget target) {- commentContainer.replace(new WebMarkupContainer(BODY_ID));- commentContainer.setVisible(false);- target.add(commentContainer);- }-- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {- clearComment(target);- String script = String.format("gitplex.sourceview.onCommentDeleted(%s);",- getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, null);- }-- private List<Symbol> getChildSymbols(@Nullable Symbol parentSymbol) {- List<Symbol> children = new ArrayList<>();- for (Symbol symbol: symbols) {- if (symbol.getParent() == parentSymbol)- children.add(symbol);- }- return children;- }-- private String getJsonOfBlameInfos(boolean blamed) {- String jsonOfBlameInfos;- if (blamed) {- List<BlameInfo> blameInfos = new ArrayList<>();-- String commitHash = context.getCommit().name();-- BlameCommand cmd = new BlameCommand(context.getDepot().getDirectory());- cmd.commitHash(commitHash).file(context.getBlobIdent().path);- for (Blame blame: cmd.call().values()) {- BlameInfo blameInfo = new BlameInfo();- blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());- blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());- blameInfo.hash = blame.getCommit().getHash();- blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);- CommitDetailPage.State state = new CommitDetailPage.State();- state.revision = blame.getCommit().getHash();- state.pathFilter = context.getBlobIdent().path;- PageParameters params = CommitDetailPage.paramsOf(context.getDepot(), state);- blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();- blameInfo.ranges = blame.getRanges();- blameInfos.add(blameInfo);- }- try {- jsonOfBlameInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- } else {- jsonOfBlameInfos = "undefined";- }- return jsonOfBlameInfos;- }-- private CompareContext getCompareContext() {- CompareContext compareContext = new CompareContext();- compareContext.setCompareCommit(context.getCommit().name());- compareContext.setPathFilter(context.getBlobIdent().path);- return compareContext;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));-- Blob blob = context.getDepot().getBlob(context.getBlobIdent());-- String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);- Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();- for (CodeComment comment: commentsModel.getObject()) {- if (comment.getCommentPos().getRange() != null) {- int line = comment.getCommentPos().getRange().getBeginLine();- List<CommentInfo> commentInfosAtLine = commentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- commentInfos.put(line, commentInfosAtLine);- }- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = comment.getCommentPos().getRange();- commentInfosAtLine.add(commentInfo);- }- }- for (List<CommentInfo> value: commentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }-- String jsonOfCommentInfos;- try {- jsonOfCommentInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- CharSequence callback = ajaxBehavior.getCallbackFunction(- explicit("action"), explicit("param1"), explicit("param2"),- explicit("param3"), explicit("param4"));- String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);- String script = String.format("gitplex.sourceview.init('%s', '%s', %s, %s, '%s', '%s', "- + "%s, %s, %s, %s, %s, %s, %s, '%s');",- JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),- JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),- context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",- context.getMark()!=null?getJson(context.getMark()):"undefined",- symbolTooltip.getMarkupId(),- context.getBlobIdent().revision,- jsonOfBlameInfos,- jsonOfCommentInfos,- callback, blameMessageBehavior.getCallback(),- viewState!=null?"JSON.parse('"+viewState+"')":"undefined",- SecurityUtils.getAccount()!=null,- context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",- sourceFormat.getTabSize(),- sourceFormat.getLineWrapMode());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- @Override- protected void onDetach() {- commentsModel.detach();- super.onDetach();- }-- @SuppressWarnings("unused")- private static class BlameInfo {-- String abbreviatedHash;-- String hash;-- String url;-- String authorName;-- String commitDate;-- List<Range> ranges;- }-- @SuppressWarnings("unused")- private static class CommentInfo {- long id;-- String title;-- TextRange mark;- }--}+package com.gitplex.server.web.component.depotfile.blobview.source;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.UUID;++import javax.annotation.Nullable;+import javax.servlet.http.Cookie;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+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.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.markup.ComponentTag;+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.form.Form;+import org.apache.wicket.markup.html.image.Image;+import org.apache.wicket.markup.html.panel.Fragment;+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.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.http.WebResponse;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import org.unbescape.javascript.JavaScriptEscape;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.search.hit.QueryHit;+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.comparecontext.CompareContextPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;+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.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.util.DateUtils;+import com.google.common.base.Preconditions;+import com.gitplex.commons.git.Blame;+import com.gitplex.commons.git.Blob;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.command.BlameCommand;+import com.gitplex.commons.lang.extractors.ExtractException;+import com.gitplex.commons.lang.extractors.Extractor;+import com.gitplex.commons.lang.extractors.Extractors;+import com.gitplex.commons.lang.extractors.Symbol;+import com.gitplex.commons.util.Range;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++/**+ * Make sure to add only one source view panel per page+ *+ * @author robin+ *+ */+@SuppressWarnings("serial")+public class SourceViewPanel extends BlobViewPanel {++ private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);++ private static final String COOKIE_OUTLINE = "sourceView.outline";++ private static final String BODY_ID = "body";++ private final List<Symbol> symbols = new ArrayList<>();++ private final IModel<Collection<CodeComment>> commentsModel =+ new LoadableDetachableModel<Collection<CodeComment>>() {++ @Override+ protected Collection<CodeComment> load() {+ return GitPlex.getInstance(CodeCommentManager.class).findAll(+ context.getDepot(), context.getCommit(), context.getBlobIdent().path);+ }++ };++ private WebMarkupContainer commentContainer;++ private WebMarkupContainer outlineContainer;++ private SourceFormatPanel sourceFormat;++ private SymbolTooltipPanel symbolTooltip;++ private AbstractPostAjaxBehavior ajaxBehavior;++ private BlameMessageBehavior blameMessageBehavior;++ public SourceViewPanel(String id, BlobViewContext context) {+ super(id, context);++ Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Preconditions.checkArgument(blob.getText() != null);++ Extractor extractor = GitPlex.getInstance(Extractors.class).getExtractor(context.getBlobIdent().path);+ if (extractor != null) {+ try {+ symbols.addAll(extractor.extract(blob.getText().getContent()));+ } catch (ExtractException e) {+ logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);+ }+ }++ }++ @Override+ protected WebMarkupContainer newOptions(String id) {+ sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.server.sourceview.onTabSizeChange(%s);", sourceFormat.getTabSize());+ target.appendJavaScript(script);+ }++ }, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.server.sourceview.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());+ target.appendJavaScript(script);+ }++ });+ return sourceFormat;+ }++ @Override+ public WebMarkupContainer newAdditionalActions(String id) {+ WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);+ actions.add(new PreventDefaultAjaxLink<Void>("blame") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ boolean blamed = (context.getMode() != Mode.BLAME);+ String jsonOfBlameInfos = getJsonOfBlameInfos(blamed);+ String script = String.format("gitplex.server.sourceview.onBlame(%s);", jsonOfBlameInfos);+ target.appendJavaScript(script);+ context.onBlameChange(target, blamed);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (context.getMode() == Mode.BLAME)+ return "active";+ else+ return "";+ }++ })));++ if (!symbols.isEmpty()) {+ actions.add(new AjaxLink<Void>("outline") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleOutline(target);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (outlineContainer.isVisible())+ return "active";+ else+ return "";+ }++ })));+ } else {+ actions.add(new WebMarkupContainer("outline").setVisible(false));+ }+ return actions;+ }++ private void toggleOutline(AjaxRequestTarget target) {+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie;+ if (outlineContainer.isVisible()) {+ cookie = new Cookie(COOKIE_OUTLINE, "no");+ outlineContainer.setVisible(false);+ } else {+ cookie = new Cookie(COOKIE_OUTLINE, "yes");+ outlineContainer.setVisible(true);+ }+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(outlineContainer);+ target.appendJavaScript("gitplex.server.sourceview.onToggleOutline();");+ }++ public void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {+ String script;+ if (mark != null) {+ script = String.format("gitplex.server.sourceview.mark(%s, %s);", getJson(mark), scroll);+ } else {+ script = String.format("gitplex.server.sourceview.mark(undefined, false);");+ }+ target.appendJavaScript(script);+ }++ private String getJson(TextRange mark) {+ try {+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceview.initComment();"));+ }++ };++ commentContainer.add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ if (commentContainer.isVisible())+ handler.add(commentContainer.get("head").get("toggleResolve"));+ }++ });++ WebMarkupContainer head = new WebMarkupContainer("head");+ head.setOutputMarkupId(true);+ commentContainer.add(head);++ head.add(new DropdownLink("context") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ @Override+ protected Component newContent(String id) {+ CompareContext compareContext = context.getOpenComment().getCompareContext();+ return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {++ @Override+ public CodeComment getObject() {+ return context.getOpenComment();+ }++ }, Model.of(compareContext.getWhitespaceOption()));+ }++ });+ head.add(new AjaxLink<Void>("locate") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ CodeComment comment = context.getOpenComment();+ TextRange mark;+ if (comment != null) {+ mark = comment.getCommentPos().getRange();+ } else {+ mark = (TextRange) commentContainer.getDefaultModelObject();+ }+ mark(target, mark, true);+ context.onMark(target, mark);+ target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ setOutputMarkupId(true);+ }++ });++ // use this instead of bookmarkable link as we want to get the link+ // updated whenever we re-render the comment container+ AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (context.getOpenComment() != null) {+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent = new BlobIdent(context.getBlobIdent());+ state.blobIdent.revision = context.getCommit().name();+ state.commentId = context.getOpenComment().getId();+ state.mark = context.getOpenComment().getCommentPos().getRange();+ return urlFor(DepotFilePage.class, DepotFilePage.paramsOf(context.getDepot(), state)).toString();+ } else {+ return "";+ }+ }++ });+ head.add(new WebMarkupContainer("permanent") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ }.add(appender));++ head.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ clearComment(target);+ if (context.getOpenComment() != null)+ context.onCommentOpened(target, null);+ target.appendJavaScript("gitplex.server.sourceview.onCloseComment();");+ }++ });++ head.add(new AjaxLink<Void>("toggleResolve") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ CodeComment comment = context.getOpenComment();+ if (comment != null) {+ if (comment.isResolved()) {+ tag.put("title", "Comment is currently resolved, click to unresolve");+ tag.put("class", "pull-right resolve resolved");+ } else {+ tag.put("title", "Comment is currently unresolved, click to resolve");+ tag.put("class", "pull-right resolve unresolved");+ }+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (SecurityUtils.getAccount() != null) {+ ((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);+ target.appendJavaScript("gitplex.server.sourceview.scrollToCommentBottom();");+ } else {+ Session.get().warn("Please login to resolve/unresolve comment");+ }+ }++ }.setOutputMarkupId(true));++ commentContainer.setOutputMarkupPlaceholderTag(true);+ if (context.getOpenComment() != null && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.add(commentPanel);+ } else {+ commentContainer.add(new WebMarkupContainer(BODY_ID));+ commentContainer.setVisible(false);+ }+ add(commentContainer);++ add(ajaxBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ switch(params.getParameterValue("action").toString()) {+ case "openSelectionPopover":+ TextRange mark = getMark(params, "param1", "param2", "param3", "param4");+ String script = String.format("gitplex.server.sourceview.openSelectionPopover(%s, '%s', %s);",+ getJson(mark), context.getMarkUrl(mark),+ SecurityUtils.getAccount()!=null);+ target.appendJavaScript(script);+ break;+ case "addComment":+ Preconditions.checkNotNull(SecurityUtils.getAccount());++ mark = getMark(params, "param1", "param2", "param3", "param4");+ commentContainer.setDefaultModelObject(mark);++ Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);+ fragment.setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");++ String uuid = UUID.randomUUID().toString();++ CommentInput contentInput;+ form.add(contentInput = new CommentInput("content", Model.of("")) {++ @Override+ protected DepotAttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(context.getDepot(), uuid);+ }++ @Override+ protected Depot getDepot() {+ return context.getDepot();+ }++ });+ contentInput.setRequired(true);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ clearComment(target);+ target.appendJavaScript("gitplex.server.sourceview.mark(undefined, false);");+ target.appendJavaScript("gitplex.server.sourceview.onLayoutChange();");+ context.onMark(target, null);+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ CodeComment comment = new CodeComment();+ comment.setUUID(uuid);+ comment.setCommentPos(new CommentPos());+ comment.getCommentPos().setCommit(context.getCommit().name());+ comment.getCommentPos().setPath(context.getBlobIdent().path);+ comment.setContent(contentInput.getModelObject());+ comment.setDepot(context.getDepot());+ comment.setUser(SecurityUtils.getAccount());+ comment.getCommentPos().setRange(mark);+ comment.setCompareContext(getCompareContext());++ GitPlex.getInstance(CodeCommentManager.class).save(comment);++ CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.replace(commentPanel);+ target.add(commentContainer);++ String script = String.format("gitplex.server.sourceview.onCommentAdded(%s);",+ getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, comment);+ }++ });+ fragment.add(form);+ commentContainer.replace(fragment);+ commentContainer.setVisible(true);+ target.add(commentContainer);+ context.onAddComment(target, mark);+ target.appendJavaScript(String.format("gitplex.server.sourceview.onAddComment(%s);", getJson(mark)));+ break;+ case "openComment":+ Long commentId = params.getParameterValue("param1").toLong();+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.replace(commentPanel);+ commentContainer.setVisible(true);+ target.add(commentContainer);+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);+ script = String.format("gitplex.server.sourceview.onOpenComment(%s);", getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, comment);+ break;+ }+ }++ });++ add(blameMessageBehavior = new BlameMessageBehavior() {++ @Override+ protected Depot getDepot() {+ return context.getDepot();+ }+ });++ outlineContainer = new WebMarkupContainer("outline") {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceview.initOutline();"));+ }++ };+ outlineContainer.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleOutline(target);+ }++ });+ NestedTree<Symbol> tree;+ outlineContainer.add(tree = new NestedTree<Symbol>(BODY_ID, new ITreeProvider<Symbol>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends Symbol> getRoots() {+ return getChildSymbols(null).iterator();+ }++ @Override+ public boolean hasChildren(Symbol symbol) {+ return !getChildSymbols(symbol).isEmpty();+ }++ @Override+ public Iterator<? extends Symbol> getChildren(Symbol symbol) {+ return getChildSymbols(symbol).iterator();+ }++ @Override+ public IModel<Symbol> model(Symbol symbol) {+ return Model.of(symbol);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);+ Symbol symbol = nodeModel.getObject();++ fragment.add(new Image("icon", symbol.getIcon()));++ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ context.onSelect(target, context.getBlobIdent(), symbol.getPos());+ }++ };+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent = context.getBlobIdent();+ state.commentId = CodeComment.idOf(context.getOpenComment());+ state.mark = TextRange.of(symbol.getPos());+ PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);+ link.add(AttributeAppender.replace("href", urlFor(DepotFilePage.class, params).toString()));+ link.add(symbol.render("label", null));+ fragment.add(link);++ return fragment;+ }++ });++ for (Symbol root: getChildSymbols(null))+ tree.expand(root);++ outlineContainer.setOutputMarkupPlaceholderTag(true);+ add(outlineContainer);++ if (!symbols.isEmpty()) {+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_OUTLINE);+ if (cookie!=null && cookie.getValue().equals("no"))+ outlineContainer.setVisible(false);+ } else {+ outlineContainer.setVisible(false);+ }++ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {++ @Override+ public Depot getObject() {+ return context.getDepot();+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {+ BlobIdent blobIdent = new BlobIdent(+ getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());+ context.onSelect(target, blobIdent, hit.getTokenPos());+ }++ @Override+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {+ context.onSearchComplete(target, hits);+ }++ @Override+ protected String getBlobPath() {+ return context.getBlobIdent().path;+ }++ });+ }++ private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,+ String endLineParam, String endCharParam) {+ int beginLine = params.getParameterValue(beginLineParam).toInt();+ int beginChar = params.getParameterValue(beginCharParam).toInt();+ int endLine = params.getParameterValue(endLineParam).toInt();+ int endChar = params.getParameterValue(endCharParam).toInt();+ TextRange mark = new TextRange();+ mark.beginLine = beginLine;+ mark.beginChar = beginChar;+ mark.endLine = endLine;+ mark.endChar = endChar;+ return mark;+ }++ private String getJsonOfComment(CodeComment comment) {+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = comment.getCommentPos().getRange();++ String jsonOfCommentInfo;+ try {+ jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ return jsonOfCommentInfo;+ }++ private void clearComment(AjaxRequestTarget target) {+ commentContainer.replace(new WebMarkupContainer(BODY_ID));+ commentContainer.setVisible(false);+ target.add(commentContainer);+ }++ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {+ clearComment(target);+ String script = String.format("gitplex.server.sourceview.onCommentDeleted(%s);",+ getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, null);+ }++ private List<Symbol> getChildSymbols(@Nullable Symbol parentSymbol) {+ List<Symbol> children = new ArrayList<>();+ for (Symbol symbol: symbols) {+ if (symbol.getParent() == parentSymbol)+ children.add(symbol);+ }+ return children;+ }++ private String getJsonOfBlameInfos(boolean blamed) {+ String jsonOfBlameInfos;+ if (blamed) {+ List<BlameInfo> blameInfos = new ArrayList<>();++ String commitHash = context.getCommit().name();++ BlameCommand cmd = new BlameCommand(context.getDepot().getDirectory());+ cmd.commitHash(commitHash).file(context.getBlobIdent().path);+ for (Blame blame: cmd.call().values()) {+ BlameInfo blameInfo = new BlameInfo();+ blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());+ blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());+ blameInfo.hash = blame.getCommit().getHash();+ blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);+ CommitDetailPage.State state = new CommitDetailPage.State();+ state.revision = blame.getCommit().getHash();+ state.pathFilter = context.getBlobIdent().path;+ PageParameters params = CommitDetailPage.paramsOf(context.getDepot(), state);+ blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();+ blameInfo.ranges = blame.getRanges();+ blameInfos.add(blameInfo);+ }+ try {+ jsonOfBlameInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ } else {+ jsonOfBlameInfos = "undefined";+ }+ return jsonOfBlameInfos;+ }++ private CompareContext getCompareContext() {+ CompareContext compareContext = new CompareContext();+ compareContext.setCompareCommit(context.getCommit().name());+ compareContext.setPathFilter(context.getBlobIdent().path);+ return compareContext;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));++ Blob blob = context.getDepot().getBlob(context.getBlobIdent());++ String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);+ Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();+ for (CodeComment comment: commentsModel.getObject()) {+ if (comment.getCommentPos().getRange() != null) {+ int line = comment.getCommentPos().getRange().getBeginLine();+ List<CommentInfo> commentInfosAtLine = commentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ commentInfos.put(line, commentInfosAtLine);+ }+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = comment.getCommentPos().getRange();+ commentInfosAtLine.add(commentInfo);+ }+ }+ for (List<CommentInfo> value: commentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }++ String jsonOfCommentInfos;+ try {+ jsonOfCommentInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ CharSequence callback = ajaxBehavior.getCallbackFunction(+ explicit("action"), explicit("param1"), explicit("param2"),+ explicit("param3"), explicit("param4"));+ String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);+ String script = String.format("gitplex.server.sourceview.init('%s', '%s', %s, %s, '%s', '%s', "+ + "%s, %s, %s, %s, %s, %s, %s, '%s');",+ JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),+ JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),+ context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",+ context.getMark()!=null?getJson(context.getMark()):"undefined",+ symbolTooltip.getMarkupId(),+ context.getBlobIdent().revision,+ jsonOfBlameInfos,+ jsonOfCommentInfos,+ callback, blameMessageBehavior.getCallback(),+ viewState!=null?"JSON.parse('"+viewState+"')":"undefined",+ SecurityUtils.getAccount()!=null,+ context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",+ sourceFormat.getTabSize(),+ sourceFormat.getLineWrapMode());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ protected void onDetach() {+ commentsModel.detach();+ super.onDetach();+ }++ @SuppressWarnings("unused")+ private static class BlameInfo {++ String abbreviatedHash;++ String hash;++ String url;++ String authorName;++ String commitDate;++ List<Range> ranges;+ }++ @SuppressWarnings("unused")+ private static class CommentInfo {+ long id;++ String title;++ TextRange mark;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.javaindex 41007cac5f..fda8a276f5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.source;+package com.gitplex.server.web.component.depotfile.blobview.source;import java.util.List;@@ -6,13 +6,13 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;import com.gitplex.commons.wicket.assets.hover.HoverResourceReference;import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;import com.gitplex.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class SourceViewResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.jssimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.jsindex 5b8325ffb8..37ba22a57e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js@@ -1,544 +1,544 @@-gitplex.sourceview = {- init: function(fileContent, filePath, openComment, mark, symbolTooltipId,- revision, blameInfos, comments, markCallback, blameMessageCallback,- viewState, loggedIn, anchor, tabSize, lineWrapMode) {- var cm;-- var $sourceView = $(".source-view");- if (openComment)- $sourceView.data("openComment", openComment);- if (mark)- $sourceView.data("mark", mark);-- $sourceView.data("markCallback", markCallback);- $sourceView.data("blameMessageCallback", blameMessageCallback);-- var $code = $sourceView.children(".code");- $sourceView.closest(".scrollable").css("overflow", "visible");-- function repositionCommentPopovers() {- $(".comment-popover:visible").each(function() {- var $popover = $(this);- var lineInfo = cm.lineInfo($popover.data("line"));- if (lineInfo.gutterMarkers) {- var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];- if (gutter) {- var $indicator = $(gutter).children("a");- if ($indicator.offset().top+$indicator.height() < $sourceView.offset().top- || $indicator.offset().top > $sourceView.offset().top+$sourceView.height()) {- $popover.css("left", "-10000px");- } else {- $popover.css({- "left": $indicator.offset().left + $indicator.outerWidth() - $sourceView.offset().left,- "top": $indicator.offset().top + ($indicator.outerHeight() - $popover.outerHeight())/2 - $sourceView.offset().top- });- }- }- }- });- }-- $sourceView.on("storeViewState", function(event) {- event.stopPropagation();- if (cm) {- gitplex.commons.history.setViewState(gitplex.commons.codemirror.getViewState(cm));- }- });-- $sourceView.on("autofit", function(event, width, height) {- event.stopPropagation();- $sourceView.outerWidth(width);- $sourceView.outerHeight(height);- $code.outerHeight($sourceView.height());-- var $comment = $sourceView.children(".comment");- var paddingLeft;- if ($comment.is(":visible")) {- paddingLeft = $comment.outerWidth();- $comment.children(".ui-resizable-handle").outerHeight($sourceView.height());-- var $commentHead = $comment.find(">.content>.head");- var $commentBody = $comment.find(">.content>.body");- $commentBody.outerHeight($sourceView.height() - $commentHead.outerHeight());- } else {- paddingLeft = 0;- }- $sourceView.css("padding-left", paddingLeft);-- var $outline = $sourceView.children(".outline");- if ($outline.is(":visible")) {- $sourceView.css("padding-right", $outline.outerWidth());- $outline.css("left", $code.outerWidth() + paddingLeft);- $outline.children(".ui-resizable-handle").outerHeight($sourceView.height());-- var $outlineHead = $outline.find(">.content>.head");- var $outlineBody = $outline.find(">.content>.body");- $outlineBody.outerHeight($sourceView.height() - $outlineHead.outerHeight());- } else {- $sourceView.css("padding-right", "0");- }-- /*- * initialize codemirror here when we know the container width and height- * as otherwise the annotatescrollbar addon is inaccurate when window- * initially loads- */- var initState = !cm;- if (!cm) {- var options = {- value: fileContent,- readOnly: gitplex.commons.isDevice()?"nocursor":true,- theme: "eclipse",- lineNumbers: true,- lineWrapping: lineWrapMode == "Soft wrap",- indentUnit: tabSize,- tabSize: tabSize,- styleActiveLine: true,- styleSelectedText: true,- foldGutter: true,- matchBrackets: true,- scrollbarStyle: "simple",- highlightIdentifiers: {delay: 500},- gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],- extraKeys: {- "F11": function(cm) {- cm.setOption("fullScreen", !cm.getOption("fullScreen"));- },- "Esc": function(cm) {- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- }- }- };-- cm = CodeMirror($code[0], options);- gitplex.commons.codemirror.setMode(cm, filePath);-- // add gutters with a timer to avoid the issue that occasionally- // gutter becomes much wider than expected- setTimeout(function() {- var gutters = cm.getOption("gutters").slice();- gutters.splice(0, 0, "CodeMirror-comments");- cm.setOption("gutters", gutters);- for (var line in comments) {- if (comments.hasOwnProperty(line)) {- gitplex.sourceview.addCommentGutter(line, comments[line][1]);- }- }-- if (blameInfos) {- gitplex.sourceview.blame(blameInfos);- }- gitplex.sourceview.highlightCommentTrigger();- }, 10);-- $code.selectionPopover("init", function() {- if (cm.hasFocus()) {- var from = cm.getCursor("from");- var to = cm.getCursor("to");- if (from.line != to.line || from.ch != to.ch) {- markCallback("openSelectionPopover", from.line, from.ch, to.line, to.ch);- return;- }- }- return "close";- });-- $code.mouseover(function(e) {- var node = e.target || e.srcElement, $node = $(node);- if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")- || $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")) {- document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);- }- });- cm.setSize($code.width(), $code.height());- if (mark)- gitplex.commons.codemirror.mark(cm, mark, true);- if (initState) // restore cursor and scroll- gitplex.commons.codemirror.initState(cm, viewState);- cm.on("scroll", function() {- gitplex.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId));- gitplex.mouseState.moved = false;- repositionCommentPopovers(cm);- });- } else {- cm.setSize($code.width(), $code.height());- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- repositionCommentPopovers(cm);- }- });- if (anchor) {- var $anchor = $("#"+anchor);- if ($anchor.length != 0) {- setTimeout(function() {- $anchor.closest(".code-comment").parent().scrollIntoView($anchor);- }, 10);- }- }- },- initComment: function() {- var $sourceView = $(".source-view");- var $code = $sourceView.children(".code");- var commentWidthCookieKey = "sourceView.comment.width";- var $comment = $sourceView.children(".comment");- var commentWidth = Cookies.get(commentWidthCookieKey);- if (!commentWidth)- commentWidth = 400;- $comment.outerWidth(commentWidth);- var $commentResizeHandle = $comment.children(".ui-resizable-handle");- $comment.resizable({- autoHide: false,- handles: {"e": $commentResizeHandle},- minWidth: 200,- resize: function(e, ui) {- var codeWidth = $code.outerWidth();- if(codeWidth < 300)- $(this).resizable({maxWidth: ui.size.width});- },- stop: function(e, ui) {- $(this).resizable({maxWidth: undefined});- Cookies.set(commentWidthCookieKey, ui.size.width, {expires: Infinity});- }- });- },- initOutline: function() {- var $sourceView = $(".source-view");- var $code = $sourceView.children(".code");- var outlineWidthCookieKey = "sourceView.outline.width";- var $outline = $sourceView.children(".outline");- var outlineWidth = Cookies.get(outlineWidthCookieKey);- if (!outlineWidth)- outlineWidth = 350;- $outline.outerWidth(outlineWidth);- var $outlineResizeHandle = $outline.children(".ui-resizable-handle");- $outline.resizable({- autoHide: false,- handles: {"w": $outlineResizeHandle},- minWidth: 100,- resize: function(e, ui) {- var codeWidth = $code.outerWidth();- if(codeWidth < 300)- $(this).resizable({maxWidth: ui.size.width});- },- stop: function(e, ui) {- $(this).resizable({maxWidth: undefined});- Cookies.set(outlineWidthCookieKey, ui.size.width, {expires: Infinity});- }- });- },- restoreMark: function() {- var $sourceView = $(".source-view");- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var mark = $sourceView.data("mark");- if (mark) {- gitplex.commons.codemirror.mark(cm, mark, false);- } else {- gitplex.commons.codemirror.clearMark(cm);- }- },- addCommentGutter: function(line, comments) {- $(".comment-popover[data-line='" + line + "']").remove();-- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var markCallback = $(".source-view").data("markCallback");-- var $gutter = $(document.createElement("div"));- $gutter.addClass("CodeMirror-comment");- $gutter.data("comments", comments);- if (comments.length != 1) {- /*- * when there are multiple comments starts with the same line, we should- * display a comment indicator which will display a comment popover with- * list of comment triggers upon click, user can then click one of the- * trigger link to display the actual comment content- */- $gutter.append("<a><i class='fa fa-comments'></i></a>");- var $indicator = $gutter.children("a");- var content = "";- for (var i in comments) {- var comment = comments[i];- var index = parseInt(i) + 1;- content += "<a class='comment-trigger' title='Click to show details of this comment'>#" + comment.id + "</a>";- }- $indicator.popover({- html: true,- container: ".source-view",- placement: "right auto",- template: "<div data-line='" + line + "' class='popover comment-popover'><div class='arrow'></div><div class='popover-content'></div></div>",- content: content- });- $indicator.on('shown.bs.popover', function () {- $(".comment-popover[data-line='" + line + "'] a").each(function() {- $(this).mouseover(function() {- var comment = comments[$(this).index()];- gitplex.commons.codemirror.mark(cm, comment.mark, false);- });- $(this).mouseout(function() {- gitplex.sourceview.restoreMark();- });- $(this).click(function() {- if ($(".source-view form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- var comment = comments[$(this).index()];- markCallback("openComment", comment.id);- });- });- gitplex.sourceview.highlightCommentTrigger();- });- } else {- var comment = comments[0];- $gutter.append("<a class='comment-trigger' title='Click to show comment of marked text'><i class='fa fa-commenting'></i></a>");- var $indicator = $gutter.children("a");- $indicator.mouseover(function() {- gitplex.commons.codemirror.mark(cm, comment.mark, false);- });- $indicator.mouseout(function() {- gitplex.sourceview.restoreMark();- });- $indicator.click(function() {- if ($(".source-view form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- markCallback("openComment", comment.id);- });- }- cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);- },- openSelectionPopover: function(mark, markUrl, loggedIn) {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var ch = (mark.beginChar + mark.endChar)/2;- var position = cm.charCoords({line:mark.beginLine, ch:ch});-- var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");- $content.children("a.permanent").attr("href", markUrl);- if (loggedIn) {- $content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");- $content.children("a.comment").click(function() {- if ($(".source-view").find("form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- var markCallback = $(".source-view").data("markCallback");- markCallback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);- });- } else {- $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");- }-- $(".source-view>.code").selectionPopover("open", {- position: position,- content: $content- });- },- onCommentAdded: function(comment) {- var $sourceView = $(".source-view");- $sourceView.data("openComment", comment);- $sourceView.data("mark", comment.mark);-- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var line = parseInt(comment.mark.beginLine);- var lineInfo = cm.lineInfo(line);- var gutter;- if (lineInfo.gutterMarkers)- gutter = lineInfo.gutterMarkers["CodeMirror-comments"];- var comments;- if (gutter) {- comments = $(gutter).data("comments");- } else {- comments = [];- }- comments.push(comment);- gitplex.sourceview.addCommentGutter(line, comments);- gitplex.sourceview.highlightCommentTrigger();- gitplex.sourceview.onLayoutChange();- },- onCommentDeleted: function(comment) {- var $sourceView = $(".source-view");- $sourceView.removeData("openComment");-- var line = parseInt(comment.mark.beginLine);- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var lineInfo = cm.lineInfo(line);- var $gutter = $(lineInfo.gutterMarkers["CodeMirror-comments"]);- var comments = $gutter.data("comments");- if (comments.length == 1) {- cm.setGutterMarker(line, "CodeMirror-comments", null);- } else {- for (var i in comments) {- if (comments[i].id == comment.id) {- comments.splice(i, 1);- break;- }- }- gitplex.sourceview.addCommentGutter(line, comments);- }- gitplex.sourceview.highlightCommentTrigger();- gitplex.sourceview.onLayoutChange();-- gitplex.sourceview.mark(undefined, false);- },- onLayoutChange: function() {- $sourceView = $('.source-view');- $sourceView.trigger('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]);- },- onAddComment: function(mark) {- var $sourceView = $(".source-view");- $sourceView.removeData("openComment");- $sourceView.data("mark", mark);- $(".source-view>.code").selectionPopover("close");-- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- gitplex.commons.codemirror.clearSelection(cm);- gitplex.sourceview.onLayoutChange();-- // mark and scroll after changing layout to make sure scroll- // works correctly- gitplex.commons.codemirror.mark(cm, mark, true);-- gitplex.sourceview.highlightCommentTrigger();- },- onOpenComment: function(comment) {- var $sourceView = $(".source-view");- $sourceView.data("openComment", comment);- $sourceView.data("mark", comment.mark);- gitplex.sourceview.highlightCommentTrigger();- gitplex.sourceview.onLayoutChange();-- // mark and scroll after changing layout to make sure scroll- // works correctly- gitplex.sourceview.mark(comment.mark, true);- },- onCloseComment: function() {- var $sourceView = $(".source-view");- $sourceView.removeData("openComment");- gitplex.sourceview.highlightCommentTrigger();- gitplex.sourceview.onLayoutChange();- gitplex.sourceview.mark(undefined, false);- },- onToggleOutline: function() {- gitplex.sourceview.onLayoutChange();- $(".outline-toggle").toggleClass("active");- },- highlightCommentTrigger: function() {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- $(".comment-popover a").removeClass("active");-- /*- * we can not simply select all comment triggers via jQuery- * as comment gutter may be create/destroy dynamically by- * CodeMirror- */- for (var i=0; i<cm.lineCount(); i++) {- var gutterMarkers = cm.lineInfo(i).gutterMarkers;- if (gutterMarkers) {- var gutter = gutterMarkers["CodeMirror-comments"];- if (gutter) {- $(gutter).children("a").removeClass("active");- }- }- }-- var openComment = $(".source-view").data("openComment");- if (openComment) {- var line = parseInt(openComment.mark.beginLine);- var lineInfo = cm.lineInfo(line);- if (lineInfo && lineInfo.gutterMarkers) {- var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];- if (gutter) {- var comments = $(gutter).data("comments");- if (comments.length == 1) {- $(gutter).children("a").addClass("active");- } else {- $(".comment-popover[data-line='" + line + "'] a").each(function() {- var comment = comments[$(this).index()];- if (comment.id == openComment.id) {- $(this).addClass("active");- }- });- }- }- }- }- },- mark: function(mark, scroll) {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- if (mark) {- $(".source-view").data("mark", mark);- gitplex.commons.codemirror.mark(cm, mark, scroll);- } else {- $(".source-view").removeData("mark");- gitplex.commons.codemirror.clearMark(cm);- }- },- blame: function(blameInfos) {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var alignment = {targetX: 100, targetY: 100, x: 0, y: 0};-- if (blameInfos) {- var blameMessageCallback = $(".source-view").data("blameMessageCallback");- var gutters = cm.getOption("gutters").slice();- gutters.splice(1, 0, "CodeMirror-annotations");- cm.setOption("gutters", gutters);- for (var i in blameInfos) {- var blameInfo = blameInfos[i];- for (var j in blameInfo.ranges) {- var range = blameInfo.ranges[j];- var $gutter = $(document.createElement("div"));- $gutter.addClass("CodeMirror-annotation");- $("<a class='hash'>" + blameInfo.abbreviatedHash + "</a>").appendTo($gutter).attr("href", blameInfo.url);- var $hashLink = $gutter.children("a.hash");- $hashLink.data("hash", blameInfo.hash);- $hashLink.data("line", range.from);-- $hashLink.hover(function() {- var tooltipId = "blame-message-line-" + $(this).data("line");- blameMessageCallback(tooltipId, $(this).data("hash"));- var $tooltip = $("<div class='blame-message'><div class='loading'>Loading...</div></div>");- $tooltip.attr("id", tooltipId);- $tooltip.data("trigger", this);- $tooltip.data("alignment", alignment);- $(".source-view").append($tooltip);- return $tooltip;- }, alignment);-- $gutter.append("<span class='date'>" + blameInfo.commitDate + "</span>");- $gutter.append("<span class='author'>" + blameInfo.authorName + "</span>");- cm.setGutterMarker(range.from, "CodeMirror-annotations", $gutter[0]);-- for (var line = range.from+1; line<range.to; line++) {- var $gutter = $(document.createElement("div"));- $gutter.addClass("CodeMirror-annotation");- $gutter.append("<span class='same-as-above'>...</span>");- cm.setGutterMarker(line, "CodeMirror-annotations", $gutter[0]);- }- }- }- } else {- cm.clearGutter("CodeMirror-annotations");- var gutters = cm.getOption("gutters").slice();- gutters.splice(1, 1);- cm.setOption("gutters", gutters);- }- },- onBlame: function(blameInfos) {- gitplex.sourceview.blame(blameInfos);- gitplex.sourceview.onLayoutChange();- $(".blame-toggle").toggleClass("active");- },- scrollToCommentBottom: function() {- var $body = $(".source-view>.comment>.content>.body");- $body.scrollTop($body[0].scrollHeight);- },- onLineWrapModeChange: function(lineWrapMode) {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");- },- onTabSizeChange: function(tabSize) {- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- cm.setOption("tabSize", tabSize);- }-};+gitplex.server.sourceview = {+ init: function(fileContent, filePath, openComment, mark, symbolTooltipId,+ revision, blameInfos, comments, markCallback, blameMessageCallback,+ viewState, loggedIn, anchor, tabSize, lineWrapMode) {+ var cm;++ var $sourceView = $(".source-view");+ if (openComment)+ $sourceView.data("openComment", openComment);+ if (mark)+ $sourceView.data("mark", mark);++ $sourceView.data("markCallback", markCallback);+ $sourceView.data("blameMessageCallback", blameMessageCallback);++ var $code = $sourceView.children(".code");+ $sourceView.closest(".scrollable").css("overflow", "visible");++ function repositionCommentPopovers() {+ $(".comment-popover:visible").each(function() {+ var $popover = $(this);+ var lineInfo = cm.lineInfo($popover.data("line"));+ if (lineInfo.gutterMarkers) {+ var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];+ if (gutter) {+ var $indicator = $(gutter).children("a");+ if ($indicator.offset().top+$indicator.height() < $sourceView.offset().top+ || $indicator.offset().top > $sourceView.offset().top+$sourceView.height()) {+ $popover.css("left", "-10000px");+ } else {+ $popover.css({+ "left": $indicator.offset().left + $indicator.outerWidth() - $sourceView.offset().left,+ "top": $indicator.offset().top + ($indicator.outerHeight() - $popover.outerHeight())/2 - $sourceView.offset().top+ });+ }+ }+ }+ });+ }++ $sourceView.on("storeViewState", function(event) {+ event.stopPropagation();+ if (cm) {+ gitplex.commons.history.setViewState(gitplex.commons.codemirror.getViewState(cm));+ }+ });++ $sourceView.on("autofit", function(event, width, height) {+ event.stopPropagation();+ $sourceView.outerWidth(width);+ $sourceView.outerHeight(height);+ $code.outerHeight($sourceView.height());++ var $comment = $sourceView.children(".comment");+ var paddingLeft;+ if ($comment.is(":visible")) {+ paddingLeft = $comment.outerWidth();+ $comment.children(".ui-resizable-handle").outerHeight($sourceView.height());++ var $commentHead = $comment.find(">.content>.head");+ var $commentBody = $comment.find(">.content>.body");+ $commentBody.outerHeight($sourceView.height() - $commentHead.outerHeight());+ } else {+ paddingLeft = 0;+ }+ $sourceView.css("padding-left", paddingLeft);++ var $outline = $sourceView.children(".outline");+ if ($outline.is(":visible")) {+ $sourceView.css("padding-right", $outline.outerWidth());+ $outline.css("left", $code.outerWidth() + paddingLeft);+ $outline.children(".ui-resizable-handle").outerHeight($sourceView.height());++ var $outlineHead = $outline.find(">.content>.head");+ var $outlineBody = $outline.find(">.content>.body");+ $outlineBody.outerHeight($sourceView.height() - $outlineHead.outerHeight());+ } else {+ $sourceView.css("padding-right", "0");+ }++ /*+ * initialize codemirror here when we know the container width and height+ * as otherwise the annotatescrollbar addon is inaccurate when window+ * initially loads+ */+ var initState = !cm;+ if (!cm) {+ var options = {+ value: fileContent,+ readOnly: gitplex.commons.isDevice()?"nocursor":true,+ theme: "eclipse",+ lineNumbers: true,+ lineWrapping: lineWrapMode == "Soft wrap",+ indentUnit: tabSize,+ tabSize: tabSize,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ highlightIdentifiers: {delay: 500},+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],+ extraKeys: {+ "F11": function(cm) {+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));+ },+ "Esc": function(cm) {+ if (cm.getOption("fullScreen"))+ cm.setOption("fullScreen", false);+ }+ }+ };++ cm = CodeMirror($code[0], options);+ gitplex.commons.codemirror.setMode(cm, filePath);++ // add gutters with a timer to avoid the issue that occasionally+ // gutter becomes much wider than expected+ setTimeout(function() {+ var gutters = cm.getOption("gutters").slice();+ gutters.splice(0, 0, "CodeMirror-comments");+ cm.setOption("gutters", gutters);+ for (var line in comments) {+ if (comments.hasOwnProperty(line)) {+ gitplex.server.sourceview.addCommentGutter(line, comments[line][1]);+ }+ }++ if (blameInfos) {+ gitplex.server.sourceview.blame(blameInfos);+ }+ gitplex.server.sourceview.highlightCommentTrigger();+ }, 10);++ $code.selectionPopover("init", function() {+ if (cm.hasFocus()) {+ var from = cm.getCursor("from");+ var to = cm.getCursor("to");+ if (from.line != to.line || from.ch != to.ch) {+ markCallback("openSelectionPopover", from.line, from.ch, to.line, to.ch);+ return;+ }+ }+ return "close";+ });++ $code.mouseover(function(e) {+ var node = e.target || e.srcElement, $node = $(node);+ if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")+ || $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")) {+ document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);+ }+ });+ cm.setSize($code.width(), $code.height());+ if (mark)+ gitplex.commons.codemirror.mark(cm, mark, true);+ if (initState) // restore cursor and scroll+ gitplex.commons.codemirror.initState(cm, viewState);+ cm.on("scroll", function() {+ gitplex.server.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId));+ gitplex.server.mouseState.moved = false;+ repositionCommentPopovers(cm);+ });+ } else {+ cm.setSize($code.width(), $code.height());+ if (cm.getOption("fullScreen"))+ cm.setOption("fullScreen", false);+ repositionCommentPopovers(cm);+ }+ });+ if (anchor) {+ var $anchor = $("#"+anchor);+ if ($anchor.length != 0) {+ setTimeout(function() {+ $anchor.closest(".code-comment").parent().scrollIntoView($anchor);+ }, 10);+ }+ }+ },+ initComment: function() {+ var $sourceView = $(".source-view");+ var $code = $sourceView.children(".code");+ var commentWidthCookieKey = "sourceView.comment.width";+ var $comment = $sourceView.children(".comment");+ var commentWidth = Cookies.get(commentWidthCookieKey);+ if (!commentWidth)+ commentWidth = 400;+ $comment.outerWidth(commentWidth);+ var $commentResizeHandle = $comment.children(".ui-resizable-handle");+ $comment.resizable({+ autoHide: false,+ handles: {"e": $commentResizeHandle},+ minWidth: 200,+ resize: function(e, ui) {+ var codeWidth = $code.outerWidth();+ if(codeWidth < 300)+ $(this).resizable({maxWidth: ui.size.width});+ },+ stop: function(e, ui) {+ $(this).resizable({maxWidth: undefined});+ Cookies.set(commentWidthCookieKey, ui.size.width, {expires: Infinity});+ }+ });+ },+ initOutline: function() {+ var $sourceView = $(".source-view");+ var $code = $sourceView.children(".code");+ var outlineWidthCookieKey = "sourceView.outline.width";+ var $outline = $sourceView.children(".outline");+ var outlineWidth = Cookies.get(outlineWidthCookieKey);+ if (!outlineWidth)+ outlineWidth = 350;+ $outline.outerWidth(outlineWidth);+ var $outlineResizeHandle = $outline.children(".ui-resizable-handle");+ $outline.resizable({+ autoHide: false,+ handles: {"w": $outlineResizeHandle},+ minWidth: 100,+ resize: function(e, ui) {+ var codeWidth = $code.outerWidth();+ if(codeWidth < 300)+ $(this).resizable({maxWidth: ui.size.width});+ },+ stop: function(e, ui) {+ $(this).resizable({maxWidth: undefined});+ Cookies.set(outlineWidthCookieKey, ui.size.width, {expires: Infinity});+ }+ });+ },+ restoreMark: function() {+ var $sourceView = $(".source-view");+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var mark = $sourceView.data("mark");+ if (mark) {+ gitplex.commons.codemirror.mark(cm, mark, false);+ } else {+ gitplex.commons.codemirror.clearMark(cm);+ }+ },+ addCommentGutter: function(line, comments) {+ $(".comment-popover[data-line='" + line + "']").remove();++ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var markCallback = $(".source-view").data("markCallback");++ var $gutter = $(document.createElement("div"));+ $gutter.addClass("CodeMirror-comment");+ $gutter.data("comments", comments);+ if (comments.length != 1) {+ /*+ * when there are multiple comments starts with the same line, we should+ * display a comment indicator which will display a comment popover with+ * list of comment triggers upon click, user can then click one of the+ * trigger link to display the actual comment content+ */+ $gutter.append("<a><i class='fa fa-comments'></i></a>");+ var $indicator = $gutter.children("a");+ var content = "";+ for (var i in comments) {+ var comment = comments[i];+ var index = parseInt(i) + 1;+ content += "<a class='comment-trigger' title='Click to show details of this comment'>#" + comment.id + "</a>";+ }+ $indicator.popover({+ html: true,+ container: ".source-view",+ placement: "right auto",+ template: "<div data-line='" + line + "' class='popover comment-popover'><div class='arrow'></div><div class='popover-content'></div></div>",+ content: content+ });+ $indicator.on('shown.bs.popover', function () {+ $(".comment-popover[data-line='" + line + "'] a").each(function() {+ $(this).mouseover(function() {+ var comment = comments[$(this).index()];+ gitplex.commons.codemirror.mark(cm, comment.mark, false);+ });+ $(this).mouseout(function() {+ gitplex.server.sourceview.restoreMark();+ });+ $(this).click(function() {+ if ($(".source-view form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ var comment = comments[$(this).index()];+ markCallback("openComment", comment.id);+ });+ });+ gitplex.server.sourceview.highlightCommentTrigger();+ });+ } else {+ var comment = comments[0];+ $gutter.append("<a class='comment-trigger' title='Click to show comment of marked text'><i class='fa fa-commenting'></i></a>");+ var $indicator = $gutter.children("a");+ $indicator.mouseover(function() {+ gitplex.commons.codemirror.mark(cm, comment.mark, false);+ });+ $indicator.mouseout(function() {+ gitplex.server.sourceview.restoreMark();+ });+ $indicator.click(function() {+ if ($(".source-view form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ markCallback("openComment", comment.id);+ });+ }+ cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);+ },+ openSelectionPopover: function(mark, markUrl, loggedIn) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var ch = (mark.beginChar + mark.endChar)/2;+ var position = cm.charCoords({line:mark.beginLine, ch:ch});++ var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");+ $content.children("a.permanent").attr("href", markUrl);+ if (loggedIn) {+ $content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");+ $content.children("a.comment").click(function() {+ if ($(".source-view").find("form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ var markCallback = $(".source-view").data("markCallback");+ markCallback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);+ });+ } else {+ $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");+ }++ $(".source-view>.code").selectionPopover("open", {+ position: position,+ content: $content+ });+ },+ onCommentAdded: function(comment) {+ var $sourceView = $(".source-view");+ $sourceView.data("openComment", comment);+ $sourceView.data("mark", comment.mark);++ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var line = parseInt(comment.mark.beginLine);+ var lineInfo = cm.lineInfo(line);+ var gutter;+ if (lineInfo.gutterMarkers)+ gutter = lineInfo.gutterMarkers["CodeMirror-comments"];+ var comments;+ if (gutter) {+ comments = $(gutter).data("comments");+ } else {+ comments = [];+ }+ comments.push(comment);+ gitplex.server.sourceview.addCommentGutter(line, comments);+ gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceview.onLayoutChange();+ },+ onCommentDeleted: function(comment) {+ var $sourceView = $(".source-view");+ $sourceView.removeData("openComment");++ var line = parseInt(comment.mark.beginLine);+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var lineInfo = cm.lineInfo(line);+ var $gutter = $(lineInfo.gutterMarkers["CodeMirror-comments"]);+ var comments = $gutter.data("comments");+ if (comments.length == 1) {+ cm.setGutterMarker(line, "CodeMirror-comments", null);+ } else {+ for (var i in comments) {+ if (comments[i].id == comment.id) {+ comments.splice(i, 1);+ break;+ }+ }+ gitplex.server.sourceview.addCommentGutter(line, comments);+ }+ gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceview.onLayoutChange();++ gitplex.server.sourceview.mark(undefined, false);+ },+ onLayoutChange: function() {+ $sourceView = $('.source-view');+ $sourceView.trigger('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]);+ },+ onAddComment: function(mark) {+ var $sourceView = $(".source-view");+ $sourceView.removeData("openComment");+ $sourceView.data("mark", mark);+ $(".source-view>.code").selectionPopover("close");++ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ gitplex.commons.codemirror.clearSelection(cm);+ gitplex.server.sourceview.onLayoutChange();++ // mark and scroll after changing layout to make sure scroll+ // works correctly+ gitplex.commons.codemirror.mark(cm, mark, true);++ gitplex.server.sourceview.highlightCommentTrigger();+ },+ onOpenComment: function(comment) {+ var $sourceView = $(".source-view");+ $sourceView.data("openComment", comment);+ $sourceView.data("mark", comment.mark);+ gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceview.onLayoutChange();++ // mark and scroll after changing layout to make sure scroll+ // works correctly+ gitplex.server.sourceview.mark(comment.mark, true);+ },+ onCloseComment: function() {+ var $sourceView = $(".source-view");+ $sourceView.removeData("openComment");+ gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceview.mark(undefined, false);+ },+ onToggleOutline: function() {+ gitplex.server.sourceview.onLayoutChange();+ $(".outline-toggle").toggleClass("active");+ },+ highlightCommentTrigger: function() {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ $(".comment-popover a").removeClass("active");++ /*+ * we can not simply select all comment triggers via jQuery+ * as comment gutter may be create/destroy dynamically by+ * CodeMirror+ */+ for (var i=0; i<cm.lineCount(); i++) {+ var gutterMarkers = cm.lineInfo(i).gutterMarkers;+ if (gutterMarkers) {+ var gutter = gutterMarkers["CodeMirror-comments"];+ if (gutter) {+ $(gutter).children("a").removeClass("active");+ }+ }+ }++ var openComment = $(".source-view").data("openComment");+ if (openComment) {+ var line = parseInt(openComment.mark.beginLine);+ var lineInfo = cm.lineInfo(line);+ if (lineInfo && lineInfo.gutterMarkers) {+ var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];+ if (gutter) {+ var comments = $(gutter).data("comments");+ if (comments.length == 1) {+ $(gutter).children("a").addClass("active");+ } else {+ $(".comment-popover[data-line='" + line + "'] a").each(function() {+ var comment = comments[$(this).index()];+ if (comment.id == openComment.id) {+ $(this).addClass("active");+ }+ });+ }+ }+ }+ }+ },+ mark: function(mark, scroll) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ if (mark) {+ $(".source-view").data("mark", mark);+ gitplex.commons.codemirror.mark(cm, mark, scroll);+ } else {+ $(".source-view").removeData("mark");+ gitplex.commons.codemirror.clearMark(cm);+ }+ },+ blame: function(blameInfos) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var alignment = {targetX: 100, targetY: 100, x: 0, y: 0};++ if (blameInfos) {+ var blameMessageCallback = $(".source-view").data("blameMessageCallback");+ var gutters = cm.getOption("gutters").slice();+ gutters.splice(1, 0, "CodeMirror-annotations");+ cm.setOption("gutters", gutters);+ for (var i in blameInfos) {+ var blameInfo = blameInfos[i];+ for (var j in blameInfo.ranges) {+ var range = blameInfo.ranges[j];+ var $gutter = $(document.createElement("div"));+ $gutter.addClass("CodeMirror-annotation");+ $("<a class='hash'>" + blameInfo.abbreviatedHash + "</a>").appendTo($gutter).attr("href", blameInfo.url);+ var $hashLink = $gutter.children("a.hash");+ $hashLink.data("hash", blameInfo.hash);+ $hashLink.data("line", range.from);++ $hashLink.hover(function() {+ var tooltipId = "blame-message-line-" + $(this).data("line");+ blameMessageCallback(tooltipId, $(this).data("hash"));+ var $tooltip = $("<div class='blame-message'><div class='loading'>Loading...</div></div>");+ $tooltip.attr("id", tooltipId);+ $tooltip.data("trigger", this);+ $tooltip.data("alignment", alignment);+ $(".source-view").append($tooltip);+ return $tooltip;+ }, alignment);++ $gutter.append("<span class='date'>" + blameInfo.commitDate + "</span>");+ $gutter.append("<span class='author'>" + blameInfo.authorName + "</span>");+ cm.setGutterMarker(range.from, "CodeMirror-annotations", $gutter[0]);++ for (var line = range.from+1; line<range.to; line++) {+ var $gutter = $(document.createElement("div"));+ $gutter.addClass("CodeMirror-annotation");+ $gutter.append("<span class='same-as-above'>...</span>");+ cm.setGutterMarker(line, "CodeMirror-annotations", $gutter[0]);+ }+ }+ }+ } else {+ cm.clearGutter("CodeMirror-annotations");+ var gutters = cm.getOption("gutters").slice();+ gutters.splice(1, 1);+ cm.setOption("gutters", gutters);+ }+ },+ onBlame: function(blameInfos) {+ gitplex.server.sourceview.blame(blameInfos);+ gitplex.server.sourceview.onLayoutChange();+ $(".blame-toggle").toggleClass("active");+ },+ scrollToCommentBottom: function() {+ var $body = $(".source-view>.comment>.content>.body");+ $body.scrollTop($body[0].scrollHeight);+ },+ onLineWrapModeChange: function(lineWrapMode) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");+ },+ onTabSizeChange: function(tabSize) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ cm.setOption("tabSize", tabSize);+ }+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/vgrabber.png b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/vgrabber.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/vgrabber.pngrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/vgrabber.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.javaindex 3067415371..9876c9ba7b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.symbollink;+package com.gitplex.server.web.component.depotfile.blobview.symbollink;import java.io.File;import java.io.IOException;@@ -17,10 +17,10 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.gitplex.commons.git.Blob;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class SymbolLinkPanel extends BlobViewPanel {diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.javanew file mode 100644index 0000000000..228a88b2df--- /dev/null+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java@@ -0,0 +1,17 @@+package com.gitplex.server.web.component.depotfile.blobview.symbollink;++import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;++public class SymbolLinkRenderer implements BlobRenderer {++ @Override+ public BlobViewPanel render(String panelId, BlobViewContext context) {+ if (context.getBlobIdent().isSymbolLink())+ return new SymbolLinkPanel(panelId, context);+ else+ return null;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.javaindex 2466a6a527..f96aa2bd0d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.blobview.symbollink;+package com.gitplex.server.web.component.depotfile.blobview.symbollink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/symbol-link.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/symbol-link.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.javasimilarity index 74%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.javaindex 98e61de386..45f2da4e3e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.editsave;+package com.gitplex.server.web.component.depotfile.editsave;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.javaindex cc326f9be2..d6df70724c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.editsave;+package com.gitplex.server.web.component.depotfile.editsave;import java.io.IOException;@@ -31,14 +31,6 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.component.diff.blob.BlobDiffPanel;-import com.gitplex.web.component.diff.revision.DiffViewMode;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.google.common.base.Preconditions;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobChange;@@ -49,6 +41,14 @@ import com.gitplex.commons.git.exception.GitObjectAlreadyExistsException;import com.gitplex.commons.git.exception.NotGitTreeException;import com.gitplex.commons.git.exception.ObsoleteCommitException;import com.gitplex.commons.lang.diff.WhitespaceOption;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;+import com.gitplex.server.web.component.diff.revision.DiffViewMode;+import com.gitplex.server.web.page.depot.file.DepotFilePage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import jersey.repackaged.com.google.common.base.Objects;@@ -384,14 +384,14 @@ public abstract class EditSavePanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new EditSaveResourceReference()));- String script = String.format("gitplex.editsave.init('%s');", getMarkupId());+ String script = String.format("gitplex.server.editsave.init('%s');", getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}protected abstract void onCommitted(AjaxRequestTarget target, ObjectId oldCommitId, ObjectId newCommitId);public void onNewPathChange(AjaxRequestTarget target) {- String script = String.format("gitplex.editsave.onPathChange('%s', '%s', %b);",+ String script = String.format("gitplex.server.editsave.onPathChange('%s', '%s', %b);",getMarkupId(), StringEscapeUtils.escapeEcmaScript(getDefaultCommitMessage()),Objects.equal(fileEdit.getNewFile().getPath(), fileEdit.getOldPath()));target.appendJavaScript(script);diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.javaindex ed2e54d125..349dfa49e3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.editsave;+package com.gitplex.server.web.component.depotfile.editsave;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class EditSaveResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.jssimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.jsindex 5f6fd02e42..0c3fad47e9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.js@@ -1,43 +1,43 @@-gitplex.editsave = {- init: function(containerId) {- var $editSave = $("#" + containerId + ">.edit-save");- $editSave.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.commons.history.setViewState({scroll:{left: $editSave.scrollLeft(), top: $editSave.scrollTop()}});- });- $editSave.on("autofit", function(e, width, height) {- e.stopPropagation();-- $editSave.closest(".body").css("overflow", "hidden");- $editSave.outerWidth(width);- $editSave.outerHeight(height);-- var viewState = gitplex.commons.history.getViewState();- if (viewState && viewState.scroll) {- $editSave.scrollLeft(viewState.scroll.left);- $editSave.scrollTop(viewState.scroll.top);- }- });-- $editSave.on("contentEdit", function(event, contentChanged) {- event.stopPropagation();- $editSave.data("contentChanged", contentChanged);- gitplex.editsave.updateSubmitBtnState($editSave);- });- },-- updateSubmitBtnState: function($editSave) {- var $submitBtn = $editSave.find("input[type=submit]");- if ($editSave.data("contentChanged") === true || $editSave.data("pathChanged") === true)- $submitBtn.removeAttr("disabled");- else- $submitBtn.attr("disabled", "disabled");- },-- onPathChange: function(containerId, defaultCommitMessage, equalsOldPath) {- var $editSave = $("#" + containerId + ">.edit-save");- $editSave.find(".summary-commit-message").attr("placeholder", defaultCommitMessage);- $editSave.data("pathChanged", !equalsOldPath);- gitplex.editsave.updateSubmitBtnState($editSave);- }-};+gitplex.server.editsave = {+ init: function(containerId) {+ var $editSave = $("#" + containerId + ">.edit-save");+ $editSave.on("storeViewState", function(e) {+ e.stopPropagation();+ gitplex.commons.history.setViewState({scroll:{left: $editSave.scrollLeft(), top: $editSave.scrollTop()}});+ });+ $editSave.on("autofit", function(e, width, height) {+ e.stopPropagation();++ $editSave.closest(".body").css("overflow", "hidden");+ $editSave.outerWidth(width);+ $editSave.outerHeight(height);++ var viewState = gitplex.commons.history.getViewState();+ if (viewState && viewState.scroll) {+ $editSave.scrollLeft(viewState.scroll.left);+ $editSave.scrollTop(viewState.scroll.top);+ }+ });++ $editSave.on("contentEdit", function(event, contentChanged) {+ event.stopPropagation();+ $editSave.data("contentChanged", contentChanged);+ gitplex.server.editsave.updateSubmitBtnState($editSave);+ });+ },++ updateSubmitBtnState: function($editSave) {+ var $submitBtn = $editSave.find("input[type=submit]");+ if ($editSave.data("contentChanged") === true || $editSave.data("pathChanged") === true)+ $submitBtn.removeAttr("disabled");+ else+ $submitBtn.attr("disabled", "disabled");+ },++ onPathChange: function(containerId, defaultCommitMessage, equalsOldPath) {+ var $editSave = $("#" + containerId + ">.edit-save");+ $editSave.find(".summary-commit-message").attr("placeholder", defaultCommitMessage);+ $editSave.data("pathChanged", !equalsOldPath);+ gitplex.server.editsave.updateSubmitBtnState($editSave);+ }+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.javaindex 2bf64bd48c..6c512d513c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.fileedit;+package com.gitplex.server.web.component.depotfile.fileedit;import javax.annotation.Nullable;@@ -22,16 +22,6 @@ import org.eclipse.jgit.lib.ObjectId;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.web.component.depotfile.editsave.EditSavePanel;-import com.gitplex.web.component.diff.blob.BlobDiffPanel;-import com.gitplex.web.component.diff.revision.DiffViewMode;-import com.gitplex.web.component.sourceformat.OptionChangeCallback;-import com.gitplex.web.component.sourceformat.SourceFormatPanel;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.google.common.base.Charsets;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobChange;@@ -42,6 +32,16 @@ import com.gitplex.commons.lang.diff.WhitespaceOption;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;import com.gitplex.commons.wicket.component.ViewStateAwareAjaxLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;+import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;+import com.gitplex.server.web.component.diff.revision.DiffViewMode;+import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;+import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public abstract class FileEditPanel extends Panel {@@ -137,7 +137,7 @@ public abstract class FileEditPanel extends Panel {replace(preview);target.add(preview);- target.appendJavaScript(String.format("gitplex.fileedit.preview('%s');", getMarkupId()));+ target.appendJavaScript(String.format("gitplex.server.fileedit.preview('%s');", getMarkupId()));}};@@ -155,7 +155,7 @@ public abstract class FileEditPanel extends Panel {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();content = params.getParameterValue("content").toString();- target.appendJavaScript(String.format("gitplex.fileedit.save('%s');", getMarkupId()));+ target.appendJavaScript(String.format("gitplex.server.fileedit.save('%s');", getMarkupId()));}};@@ -181,7 +181,7 @@ public abstract class FileEditPanel extends Panel {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.fileedit.onIndentTypeChange('%s', '%s');",+ String script = String.format("gitplex.server.fileedit.onIndentTypeChange('%s', '%s');",FileEditPanel.this.getMarkupId(), sourceFormat.getIndentType());target.appendJavaScript(script);}@@ -190,7 +190,7 @@ public abstract class FileEditPanel extends Panel {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.fileedit.onTabSizeChange('%s', %s);",+ String script = String.format("gitplex.server.fileedit.onTabSizeChange('%s', %s);",FileEditPanel.this.getMarkupId(), sourceFormat.getTabSize());target.appendJavaScript(script);}@@ -199,7 +199,7 @@ public abstract class FileEditPanel extends Panel {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.fileedit.onLineWrapModeChange('%s', '%s');",+ String script = String.format("gitplex.server.fileedit.onLineWrapModeChange('%s', '%s');",FileEditPanel.this.getMarkupId(), sourceFormat.getLineWrapMode());target.appendJavaScript(script);}@@ -241,7 +241,7 @@ public abstract class FileEditPanel extends Panel {String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);- String script = String.format("gitplex.fileedit.init('%s', '%s', '%s', %s, %s, %s, %s, '%s', %s, '%s');",+ String script = String.format("gitplex.server.fileedit.init('%s', '%s', '%s', %s, %s, %s, %s, '%s', %s, '%s');",getMarkupId(), getNewPathParam(), StringEscapeUtils.escapeEcmaScript(content),previewBehavior.getCallbackFunction(CallbackParameter.explicit("content")),saveBehavior.getCallbackFunction(CallbackParameter.explicit("content")),@@ -271,7 +271,7 @@ public abstract class FileEditPanel extends Panel {this.newPath = GitUtils.normalizePath(newPath);editSavePanel.onNewPathChange(target);- target.appendJavaScript(String.format("gitplex.fileedit.setMode('%s', '%s');",+ target.appendJavaScript(String.format("gitplex.server.fileedit.setMode('%s', '%s');",getMarkupId(), getNewPathParam()));}@@ -284,7 +284,7 @@ public abstract class FileEditPanel extends Panel {}public void mark(AjaxRequestTarget target, TextRange mark) {- String script = String.format("gitplex.fileedit.mark('%s', %s);",+ String script = String.format("gitplex.server.fileedit.mark('%s', %s);",getMarkupId(), getJson(mark));target.appendJavaScript(script);}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.javaindex 3c72eb1b03..c1661e98f8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.fileedit;+package com.gitplex.server.web.component.depotfile.fileedit;import java.util.List;@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;import com.gitplex.commons.wicket.assets.diffmatchpatch.DiffMatchPatchResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class FileEditResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.jssimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.jsindex 1512602a72..70542dced9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.js@@ -1,220 +1,220 @@-gitplex.fileedit = {- init: function(containerId, filePath, fileContent, previewCallback, saveCallback, mark, viewState, indentType, tabSize, lineWrapMode) {- var $container = $("#" + containerId);- var $fileEdit = $container.find(">.file-edit");- var $head = $fileEdit.find(">.head");- var $body = $fileEdit.find(">.body");- var $edit = $body.find(">div.edit");- var cm;-- $head.find("a.edit").click(function() {- gitplex.fileedit.selectTab($(this));- });- $head.find("a.preview").click(function() {- previewCallback(cm.getValue());- });- $head.find("a.save").click(function() {- saveCallback(cm.getValue());- });-- $fileEdit.on("storeViewState", function(e) {- e.stopPropagation();- if (cm) {- gitplex.commons.history.setViewState(gitplex.commons.codemirror.getViewState(cm));- }- });-- $fileEdit.on("autofit", function(e, width, height) {- e.stopPropagation();- $fileEdit.outerWidth(width);- $fileEdit.outerHeight(height);-- height = $fileEdit.height()-$head.outerHeight();- $body.outerWidth(width).outerHeight(height-1);-- /*- * initialize codemirror here when we know the container width and height- * as otherwise the annotatescrollbar addon is inaccurate when window- * initially loads- */- var initState = !cm;- if (!cm) {- cm = CodeMirror($edit[0], {- value: fileContent,- theme: "eclipse",- indentWithTabs: indentType == "Tabs",- indentUnit: tabSize,- lineNumbers: true,- lineWrapping: lineWrapMode == "Soft wrap",- tabSize: tabSize,- styleActiveLine: true,- styleSelectedText: true,- foldGutter: true,- matchBrackets: true,- scrollbarStyle: "simple",- highlightIdentifiers: {delay: 500},- extraKeys: {- "F11": function(cm) {- cm.setOption("fullScreen", !cm.getOption("fullScreen"));- },- "Esc": function(cm) {- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- }- }- });-- cm.oldDocValue = cm.doc.getValue();- cm.on("change", function() {- var $form = $body.find(">form.edit");- if (cm.doc.getValue() != cm.oldDocValue) {- $form.addClass("dirty");- $fileEdit.data("contentChanged", true);- } else {- $form.removeClass("dirty");- $fileEdit.data("contentChanged", false);- }- });- gitplex.commons.codemirror.setMode(cm, filePath);-- if (mark)- gitplex.commons.codemirror.mark(cm, mark);- }-- if ($edit.is(":visible")) {- $body.css("overflow", "hidden");- $edit.outerHeight($body.height());- $edit.outerWidth($body.width());- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- cm.setSize($edit.width(), $edit.height());- if (initState)- gitplex.commons.codemirror.initState(cm, viewState);- } else {- $body.css("overflow", "auto");- }- });- },- save: function(containerId) {- gitplex.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.save"));- },- preview: function(containerId) {- gitplex.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.preview"));- },- setMode: function(containerId, filePath) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- gitplex.commons.codemirror.setMode(cm, filePath);- },- mark: function(containerId, mark) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- if (cm.oldDocValue) {- var dmp = new diff_match_patch();- var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());-- var beginLine = mark.beginLine, beginChar = mark.beginChar;- var endLine = mark.endLine, endChar = mark.endChar;- var newBeginLine, newBeginChar, newEndLine, newEndChar;- var oldLine = oldChar = newLine = newChar = 0;- for (var i=0; i<diffs.length; i++) {- var diff = diffs[i];- var chars = diff[1];- var quit = false;- for (var j=0; j<chars.length; j++) {- var char = chars[j];- if (diff[0] == -1) {- if (char == '\n') {- oldLine++;- oldChar = 0;- } else {- oldChar++;- }- } else if (diff[0] == 1) {- if (char == '\n') {- newLine++;- newChar = 0;- } else {- newChar++;- }- } else {- if (oldLine == beginLine && oldChar == beginChar) {- newBeginLine = newLine;- newBeginChar = newChar;- }- if (char == '\n') {- oldLine++;- oldChar = 0;- newLine++;- newChar = 0;- } else {- oldChar++;- newChar++;- }- if (oldLine == endLine && oldChar == endChar) {- newEndLine = newLine;- newEndChar = newChar;- }- }- if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {- quit = true;- break;- }- }- if (quit)- break;- }- }-- if (newBeginLine!=undefined && newEndLine!=undefined) {- var newMark = {- beginLine: newBeginLine,- beginChar: newBeginChar,- endLine: newEndLine,- endChar: newEndChar- };- gitplex.commons.codemirror.mark(cm, newMark);- }- },- selectTab: function($tab) {- var $active = $tab.parent().find("a.tab.active");- $active[0].hideableVisible = $(".hideable").is(":visible");- $active.removeClass("active");- $tab.addClass("active");- if ($tab[0].hideableVisible != undefined) {- if ($tab[0].hideableVisible)- $(".hideable").show();- else- $(".hideable").hide();- }- var $fileEdit = $tab.closest(".file-edit");- var $body = $fileEdit.find(">.body");-- var $cm = $fileEdit.find(">.body>div.edit>.CodeMirror");- if ($cm.is(":visible")) {- var cm = $cm[0].CodeMirror;- $fileEdit.find(">.body>div.save").data("viewState", gitplex.commons.codemirror.getViewState(cm));- }-- $body.find(">div").hide();- if ($tab.hasClass("edit")) {- $body.find(">div.edit").show().find(">.CodeMirror")[0].CodeMirror.focus();- } else if ($tab.hasClass("preview")) {- $body.find(">div.preview").show();- } else {- $body.find(">div.save").show();- $body.find(">div.save>.edit-save").trigger("contentEdit", [$fileEdit.data("contentChanged")]);- }- $(window).resize();- },- onIndentTypeChange: function(containerId, indentType) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("indentWithTabs", indentType == "Tabs");- },- onLineWrapModeChange: function(containerId, lineWrapMode) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");- },- onTabSizeChange: function(containerId, tabSize) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("tabSize", tabSize);- }-};+gitplex.server.fileedit = {+ init: function(containerId, filePath, fileContent, previewCallback, saveCallback, mark, viewState, indentType, tabSize, lineWrapMode) {+ var $container = $("#" + containerId);+ var $fileEdit = $container.find(">.file-edit");+ var $head = $fileEdit.find(">.head");+ var $body = $fileEdit.find(">.body");+ var $edit = $body.find(">div.edit");+ var cm;++ $head.find("a.edit").click(function() {+ gitplex.server.fileedit.selectTab($(this));+ });+ $head.find("a.preview").click(function() {+ previewCallback(cm.getValue());+ });+ $head.find("a.save").click(function() {+ saveCallback(cm.getValue());+ });++ $fileEdit.on("storeViewState", function(e) {+ e.stopPropagation();+ if (cm) {+ gitplex.commons.history.setViewState(gitplex.commons.codemirror.getViewState(cm));+ }+ });++ $fileEdit.on("autofit", function(e, width, height) {+ e.stopPropagation();+ $fileEdit.outerWidth(width);+ $fileEdit.outerHeight(height);++ height = $fileEdit.height()-$head.outerHeight();+ $body.outerWidth(width).outerHeight(height-1);++ /*+ * initialize codemirror here when we know the container width and height+ * as otherwise the annotatescrollbar addon is inaccurate when window+ * initially loads+ */+ var initState = !cm;+ if (!cm) {+ cm = CodeMirror($edit[0], {+ value: fileContent,+ theme: "eclipse",+ indentWithTabs: indentType == "Tabs",+ indentUnit: tabSize,+ lineNumbers: true,+ lineWrapping: lineWrapMode == "Soft wrap",+ tabSize: tabSize,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ highlightIdentifiers: {delay: 500},+ extraKeys: {+ "F11": function(cm) {+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));+ },+ "Esc": function(cm) {+ if (cm.getOption("fullScreen"))+ cm.setOption("fullScreen", false);+ }+ }+ });++ cm.oldDocValue = cm.doc.getValue();+ cm.on("change", function() {+ var $form = $body.find(">form.edit");+ if (cm.doc.getValue() != cm.oldDocValue) {+ $form.addClass("dirty");+ $fileEdit.data("contentChanged", true);+ } else {+ $form.removeClass("dirty");+ $fileEdit.data("contentChanged", false);+ }+ });+ gitplex.commons.codemirror.setMode(cm, filePath);++ if (mark)+ gitplex.commons.codemirror.mark(cm, mark);+ }++ if ($edit.is(":visible")) {+ $body.css("overflow", "hidden");+ $edit.outerHeight($body.height());+ $edit.outerWidth($body.width());+ if (cm.getOption("fullScreen"))+ cm.setOption("fullScreen", false);+ cm.setSize($edit.width(), $edit.height());+ if (initState)+ gitplex.commons.codemirror.initState(cm, viewState);+ } else {+ $body.css("overflow", "auto");+ }+ });+ },+ save: function(containerId) {+ gitplex.server.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.save"));+ },+ preview: function(containerId) {+ gitplex.server.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.preview"));+ },+ setMode: function(containerId, filePath) {+ var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;+ gitplex.commons.codemirror.setMode(cm, filePath);+ },+ mark: function(containerId, mark) {+ var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;+ if (cm.oldDocValue) {+ var dmp = new diff_match_patch();+ var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());++ var beginLine = mark.beginLine, beginChar = mark.beginChar;+ var endLine = mark.endLine, endChar = mark.endChar;+ var newBeginLine, newBeginChar, newEndLine, newEndChar;+ var oldLine = oldChar = newLine = newChar = 0;+ for (var i=0; i<diffs.length; i++) {+ var diff = diffs[i];+ var chars = diff[1];+ var quit = false;+ for (var j=0; j<chars.length; j++) {+ var char = chars[j];+ if (diff[0] == -1) {+ if (char == '\n') {+ oldLine++;+ oldChar = 0;+ } else {+ oldChar++;+ }+ } else if (diff[0] == 1) {+ if (char == '\n') {+ newLine++;+ newChar = 0;+ } else {+ newChar++;+ }+ } else {+ if (oldLine == beginLine && oldChar == beginChar) {+ newBeginLine = newLine;+ newBeginChar = newChar;+ }+ if (char == '\n') {+ oldLine++;+ oldChar = 0;+ newLine++;+ newChar = 0;+ } else {+ oldChar++;+ newChar++;+ }+ if (oldLine == endLine && oldChar == endChar) {+ newEndLine = newLine;+ newEndChar = newChar;+ }+ }+ if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {+ quit = true;+ break;+ }+ }+ if (quit)+ break;+ }+ }++ if (newBeginLine!=undefined && newEndLine!=undefined) {+ var newMark = {+ beginLine: newBeginLine,+ beginChar: newBeginChar,+ endLine: newEndLine,+ endChar: newEndChar+ };+ gitplex.commons.codemirror.mark(cm, newMark);+ }+ },+ selectTab: function($tab) {+ var $active = $tab.parent().find("a.tab.active");+ $active[0].hideableVisible = $(".hideable").is(":visible");+ $active.removeClass("active");+ $tab.addClass("active");+ if ($tab[0].hideableVisible != undefined) {+ if ($tab[0].hideableVisible)+ $(".hideable").show();+ else+ $(".hideable").hide();+ }+ var $fileEdit = $tab.closest(".file-edit");+ var $body = $fileEdit.find(">.body");++ var $cm = $fileEdit.find(">.body>div.edit>.CodeMirror");+ if ($cm.is(":visible")) {+ var cm = $cm[0].CodeMirror;+ $fileEdit.find(">.body>div.save").data("viewState", gitplex.commons.codemirror.getViewState(cm));+ }++ $body.find(">div").hide();+ if ($tab.hasClass("edit")) {+ $body.find(">div.edit").show().find(">.CodeMirror")[0].CodeMirror.focus();+ } else if ($tab.hasClass("preview")) {+ $body.find(">div.preview").show();+ } else {+ $body.find(">div.save").show();+ $body.find(">div.save>.edit-save").trigger("contentEdit", [$fileEdit.data("contentChanged")]);+ }+ $(window).resize();+ },+ onIndentTypeChange: function(containerId, indentType) {+ var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;+ cm.setOption("indentWithTabs", indentType == "Tabs");+ },+ onLineWrapModeChange: function(containerId, lineWrapMode) {+ var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;+ cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");+ },+ onTabSizeChange: function(containerId, tabSize) {+ var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;+ cm.setOption("tabSize", tabSize);+ }+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.javaindex 8faa46e4e7..906022c155 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.filelist;+package com.gitplex.server.web.component.depotfile.filelist;import java.io.IOException;import java.util.ArrayList;@@ -29,13 +29,13 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.google.common.base.Preconditions;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public abstract class FileListPanel extends Panel {@@ -259,7 +259,7 @@ public abstract class FileListPanel extends Panel {directory.revision, directory.path);String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();response.render(OnDomReadyHeaderItem.forScript(- String.format("gitplex.filelist.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));+ String.format("gitplex.server.filelist.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));}protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.javaindex 769c96110e..6d53666c9d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.filelist;+package com.gitplex.server.web.component.depotfile.filelist;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class FileListResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.javaindex 512c47684a..6ef89d5c73 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.filelist;+package com.gitplex.server.web.component.depotfile.filelist;import java.io.IOException;import java.util.HashMap;@@ -17,16 +17,16 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.avatar.AvatarManager;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.util.DateUtils;/*** Loading commits of children may take some time, and we do this via resource loading to avoid blockingdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.javaindex d2154490eb..4c3443f592 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.filelist;+package com.gitplex.server.web.component.depotfile.filelist;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/book.png b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/book.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/book.pngrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/book.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.jssimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.jsindex fbf987f2eb..3f187d45bd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.js@@ -1,57 +1,57 @@-gitplex.filelist = {- init: function(containerId, lastCommitsUrl) {- var $container = $("#" + containerId);- var $fileList = $container.find(">.file-list");-- $fileList.on("autofit", function(e, width, height) {- e.stopPropagation();- $fileList.outerWidth(width);- $fileList.outerHeight(height);-- var viewState = gitplex.commons.history.getViewState();- if (viewState && viewState.scroll) {- $fileList.scrollLeft(viewState.scroll.left);- $fileList.scrollTop(viewState.scroll.top);- }- });-- $fileList.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.commons.history.setViewState({scroll:{left: $fileList.scrollLeft(), top: $fileList.scrollTop()}});- });-- $.ajax({- url: lastCommitsUrl,- cache: false,- beforeSend: function(xhr) {- xhr.setRequestHeader('Wicket-Ajax', 'true');- xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');- },- success: function(lastCommits) {- if (jQuery.contains(document, $container[0])) { // add this check to avoid rendering last commits if directory is changed- var $table = $container.find(".file-list>table");- $table.find("tr.child").each(function() {- var $row = $(this);- var path = $row.find("td.path span").text();- var index = path.indexOf('/');- if (index != -1)- path = path.substring(0, index);- var lastCommit = lastCommits[path];-- if (lastCommit) {- var html = "<img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> ";- if (lastCommit.authorUrl)- html += "<a href='" + lastCommit.authorUrl + "'>" + lastCommit.authorName + "</a>";- else- html += "<span>" + lastCommit.authorName + "</span>";-- $row.children(".last-commit.author").empty().append(html);- $row.children(".last-commit.when").append("<span class='when'>" + lastCommit.when + "</span>");- $row.children(".last-commit.message").append("<a href='" + lastCommit.url + "'>" + lastCommit.summary + "</a>");- }- });- }- }- });- }+gitplex.server.filelist = {+ init: function(containerId, lastCommitsUrl) {+ var $container = $("#" + containerId);+ var $fileList = $container.find(">.file-list");++ $fileList.on("autofit", function(e, width, height) {+ e.stopPropagation();+ $fileList.outerWidth(width);+ $fileList.outerHeight(height);++ var viewState = gitplex.commons.history.getViewState();+ if (viewState && viewState.scroll) {+ $fileList.scrollLeft(viewState.scroll.left);+ $fileList.scrollTop(viewState.scroll.top);+ }+ });++ $fileList.on("storeViewState", function(e) {+ e.stopPropagation();+ gitplex.commons.history.setViewState({scroll:{left: $fileList.scrollLeft(), top: $fileList.scrollTop()}});+ });++ $.ajax({+ url: lastCommitsUrl,+ cache: false,+ beforeSend: function(xhr) {+ xhr.setRequestHeader('Wicket-Ajax', 'true');+ xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');+ },+ success: function(lastCommits) {+ if (jQuery.contains(document, $container[0])) { // add this check to avoid rendering last commits if directory is changed+ var $table = $container.find(".file-list>table");+ $table.find("tr.child").each(function() {+ var $row = $(this);+ var path = $row.find("td.path span").text();+ var index = path.indexOf('/');+ if (index != -1)+ path = path.substring(0, index);+ var lastCommit = lastCommits[path];++ if (lastCommit) {+ var html = "<img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> ";+ if (lastCommit.authorUrl)+ html += "<a href='" + lastCommit.authorUrl + "'>" + lastCommit.authorName + "</a>";+ else+ html += "<span>" + lastCommit.authorName + "</span>";++ $row.children(".last-commit.author").empty().append(html);+ $row.children(".last-commit.when").append("<span class='when'>" + lastCommit.when + "</span>");+ $row.children(".last-commit.message").append("<a href='" + lastCommit.url + "'>" + lastCommit.summary + "</a>");+ }+ });+ }+ }+ });+ }};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.javaindex ea99468162..80420a53d4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotfile.filenavigator;+package com.gitplex.server.web.component.depotfile.filenavigator;import java.io.IOException;import java.util.ArrayList;@@ -39,11 +39,6 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.BlobIcon;-import com.gitplex.web.component.depotfile.blobview.BlobNameChangeCallback;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.gitplex.commons.git.BlobIdent;@@ -53,6 +48,11 @@ import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;import com.gitplex.commons.wicket.component.floating.AlignPlacement;import com.gitplex.commons.wicket.component.floating.FloatingPanel;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.BlobIcon;+import com.gitplex.server.web.component.depotfile.blobview.BlobNameChangeCallback;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public abstract class FileNavigator extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.javasimilarity index 64%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.javaindex 2bc95509ae..9c002553f8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.component.depotfile.filenavigator;+package com.gitplex.server.web.component.depotfile.filenavigator;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;public class FileNavigatorResourceReference extends BaseDependentCssResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-down.png b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-down.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-down.pngrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-down.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-right.png b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-right.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-right.pngrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-right.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/file-navigator.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/file-navigator.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/file-navigator.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/file-navigator.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.html b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.javaindex e45dfe201b..c4af4f258a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java@@ -1,181 +1,181 @@-package com.gitplex.web.component.depotselector;--import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.CallbackParameter;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-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.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 org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.file.DepotFilePage;--@SuppressWarnings("serial")-public abstract class DepotSelector extends Panel {-- private final IModel<Collection<Depot>> depotsModel;-- private final Long currentDepotId;-- private ListView<Depot> depotsView;-- private String searchInput;-- public DepotSelector(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {- super(id);-- this.depotsModel = depotsModel;- this.currentDepotId = currentDepotId;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- WebMarkupContainer noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- TextField<String> searchField = new TextField<String>("search", Model.of(""));- add(searchField);- searchField.add(new InputChangeBehavior() {-- @Override- protected void onInputChange(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- });- searchField.add(new AbstractPostAjaxBehavior() {-- @Override- 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));- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- String script = String.format("gitplex.depotSelector.init('%s', %s)",- searchField.getMarkupId(true),- getCallbackFunction(CallbackParameter.explicit("id")));- response.render(OnDomReadyHeaderItem.forScript(script));- }-- });-- depotsContainer.add(depotsView = new ListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @Override- protected List<Depot> load() {- List<Depot> depots = new ArrayList<>();- for (Depot depot: depotsModel.getObject()) {- if (depot.matchesFQN(searchInput)) {- depots.add(depot);- }- }- depots.sort(Depot::compareLastVisit);- return depots;- }-- }) {-- @Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, item.getModelObject());- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- PageParameters params = DepotFilePage.paramsOf(item.getModelObject());- tag.put("href", urlFor(DepotFilePage.class, params).toString());- }-- };- if (depot.getId().equals(currentDepotId))- link.add(AttributeAppender.append("class", " current"));- link.add(new Label("name", depot.getFQN()));- item.add(link);-- if (item.getIndex() == 0)- item.add(AttributeAppender.append("class", "active"));- item.add(AttributeAppender.append("data-id", depot.getId()));- }-- });- }-- @Override- protected void onDetach() {- depotsModel.detach();-- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotSelectorResourceReference()));- }-- protected abstract void onSelect(AjaxRequestTarget target, Depot depot);--}+package com.gitplex.server.web.component.depotselector;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+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.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 org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.behavior.InputChangeBehavior;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.page.depot.file.DepotFilePage;++@SuppressWarnings("serial")+public abstract class DepotSelector extends Panel {++ private final IModel<Collection<Depot>> depotsModel;++ private final Long currentDepotId;++ private ListView<Depot> depotsView;++ private String searchInput;++ public DepotSelector(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {+ super(id);++ this.depotsModel = depotsModel;+ this.currentDepotId = currentDepotId;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ WebMarkupContainer noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);++ TextField<String> searchField = new TextField<String>("search", Model.of(""));+ add(searchField);+ searchField.add(new InputChangeBehavior() {++ @Override+ protected void onInputChange(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ }++ });+ searchField.add(new AbstractPostAjaxBehavior() {++ @Override+ 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));+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);++ String script = String.format("gitplex.server.depotSelector.init('%s', %s)",+ searchField.getMarkupId(true),+ getCallbackFunction(CallbackParameter.explicit("id")));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ });++ depotsContainer.add(depotsView = new ListView<Depot>("depots",+ new LoadableDetachableModel<List<Depot>>() {++ @Override+ protected List<Depot> load() {+ List<Depot> depots = new ArrayList<>();+ for (Depot depot: depotsModel.getObject()) {+ if (depot.matchesFQN(searchInput)) {+ depots.add(depot);+ }+ }+ depots.sort(Depot::compareLastVisit);+ return depots;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Depot> item) {+ Depot depot = item.getModelObject();+ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, item.getModelObject());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ PageParameters params = DepotFilePage.paramsOf(item.getModelObject());+ tag.put("href", urlFor(DepotFilePage.class, params).toString());+ }++ };+ if (depot.getId().equals(currentDepotId))+ link.add(AttributeAppender.append("class", " current"));+ link.add(new Label("name", depot.getFQN()));+ item.add(link);++ if (item.getIndex() == 0)+ item.add(AttributeAppender.append("class", "active"));+ item.add(AttributeAppender.append("data-id", depot.getId()));+ }++ });+ }++ @Override+ protected void onDetach() {+ depotsModel.detach();++ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new DepotSelectorResourceReference()));+ }++ protected abstract void onSelect(AjaxRequestTarget target, Depot depot);++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.javaindex bb6031ebb8..abfd215714 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.depotselector;+package com.gitplex.server.web.component.depotselector;import java.util.List;@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class DepotSelectorResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.css b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.cssrename to server.web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.js b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.jssimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.jsrename to server.web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.jsindex 42a3471659..a99d6fe141 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotselector/depot-selector.js@@ -1,4 +1,4 @@-gitplex.depotSelector = {+gitplex.server.depotSelector = {init: function(inputId, callback) {var $input = $("#" + inputId);diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.javaindex 458d27059c..b97e95e578 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff;+package com.gitplex.server.web.component.diff;import javax.annotation.Nullable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.javaindex d982530576..1d62a2a93c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.blob;+package com.gitplex.server.web.component.diff.blob;import javax.annotation.Nullable;@@ -14,20 +14,20 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.web.Constants;-import com.gitplex.web.component.diff.DiffRenderer;-import com.gitplex.web.component.diff.blob.text.TextDiffPanel;-import com.gitplex.web.component.diff.difftitle.BlobDiffTitle;-import com.gitplex.web.component.diff.revision.BlobCommentSupport;-import com.gitplex.web.component.diff.revision.DiffViewMode;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobChange;import com.gitplex.commons.lang.diff.DiffUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.diff.DiffRenderer;+import com.gitplex.server.web.component.diff.blob.text.TextDiffPanel;+import com.gitplex.server.web.component.diff.difftitle.BlobDiffTitle;+import com.gitplex.server.web.component.diff.revision.BlobCommentSupport;+import com.gitplex.server.web.component.diff.revision.DiffViewMode;@SuppressWarnings("serial")public class BlobDiffPanel extends Panel implements SourceAware {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffResourceReference.javaindex dc3d0d1c41..57705f2d08 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.blob;+package com.gitplex.server.web.component.diff.blob;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.javasimilarity index 73%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.javaindex 01b5e40f28..91c52eda36 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java@@ -1,11 +1,11 @@-package com.gitplex.web.component.diff.blob;+package com.gitplex.server.web.component.diff.blob;import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.support.CommentPos;public interface SourceAware {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/blob-diff.css b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/blob-diff.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/blob-diff.cssrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/blob-diff.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.javaindex 62d02e8e4c..331a701b86 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.blob.image;+package com.gitplex.server.web.component.diff.blob.image;import org.apache.wicket.markup.html.panel.Panel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.javaindex 5e4f054e6f..3bda777a01 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.diff.blob.image;+package com.gitplex.server.web.component.diff.blob.image;import org.apache.tika.mime.MediaType;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.web.component.diff.DiffRenderer;import com.gitplex.commons.git.BlobChange;+import com.gitplex.server.web.component.diff.DiffRenderer;public class ImageDiffRenderer implements DiffRenderer {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/MarkAwareDiffBlock.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/MarkAwareDiffBlock.javaindex 0a052cdd19..4e21171050 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/MarkAwareDiffBlock.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.blob.text;+package com.gitplex.server.web.component.diff.blob.text;import java.io.Serializable;import java.util.List;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex 3f3043e00a..0ec586dbf2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -1,1220 +1,1220 @@-package com.gitplex.web.component.diff.blob.text;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-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.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.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.protocol.http.WebSession;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.revwalk.RevCommit;-import org.unbescape.html.HtmlEscape;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.web.Constants;-import com.gitplex.web.behavior.blamemessage.BlameMessageBehavior;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.web.component.diff.blob.SourceAware;-import com.gitplex.web.component.diff.blob.text.MarkAwareDiffBlock.Type;-import com.gitplex.web.component.diff.diffstat.DiffStatBar;-import com.gitplex.web.component.diff.difftitle.BlobDiffTitle;-import com.gitplex.web.component.diff.revision.BlobCommentSupport;-import com.gitplex.web.component.diff.revision.DiffViewMode;-import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.file.RequestCompareInfo;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.util.DateUtils;-import com.google.common.base.Preconditions;-import com.gitplex.commons.git.Blame;-import com.gitplex.commons.git.BlobChange;-import com.gitplex.commons.git.BriefCommit;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.command.BlameCommand;-import com.gitplex.commons.lang.diff.DiffBlock;-import com.gitplex.commons.lang.diff.DiffMatchPatch.Operation;-import com.gitplex.commons.lang.diff.DiffUtils;-import com.gitplex.commons.lang.diff.LineDiff;-import com.gitplex.commons.lang.tokenizers.CmToken;-import com.gitplex.commons.util.Range;-import com.gitplex.commons.util.RangeUtils;-import com.gitplex.commons.util.StringUtils;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;--@SuppressWarnings("serial")-public class TextDiffPanel extends Panel implements SourceAware {-- private final IModel<Depot> depotModel;-- private final IModel<PullRequest> requestModel;-- private final BlobChange change;-- private final Map<Integer, Integer> contextSizes = new HashMap<>();-- private final DiffViewMode diffMode;-- private final IModel<Boolean> blameModel;-- private final BlobCommentSupport markSupport;-- private Component symbolTooltip;-- private AbstractPostAjaxBehavior callbackBehavior;-- private BlameMessageBehavior blameMessageBehavior;-- private transient List<MarkAwareDiffBlock> diffBlocks;-- private BlameInfo blameInfo;-- public TextDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,- @Nullable BlobCommentSupport markSupport) {- super(id);-- this.depotModel = depotModel;- this.requestModel = requestModel;- this.change = change;- this.diffMode = diffMode;- this.markSupport = markSupport;- this.blameModel = blameModel;-- if (blameModel != null && blameModel.getObject()) {- blameInfo = getBlameInfo();- }- }-- private String getJson(CommentPos mark) {- try {- MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(markInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- private BlameInfo getBlameInfo() {- blameInfo = new BlameInfo();- BlameCommand cmd = new BlameCommand(depotModel.getObject().getDirectory());- String oldPath = change.getOldBlobIdent().path;- if (oldPath != null) {- cmd.commitHash(getOldCommit().name()).file(oldPath);- for (Blame blame: cmd.call().values()) {- for (Range range: blame.getRanges()) {- for (int i=range.getFrom(); i<range.getTo(); i++)- blameInfo.oldBlame.put(i, blame.getCommit());- }- }- }- String newPath = change.getNewBlobIdent().path;- if (newPath != null) {- cmd.commitHash(getNewCommit().name()).file(newPath);- for (Blame blame: cmd.call().values()) {- for (Range range: blame.getRanges()) {- for (int i=range.getFrom(); i<range.getTo(); i++)- blameInfo.newBlame.put(i, blame.getCommit());- }- }- }- return blameInfo;- }-- private WebMarkupContainer newActions() {- WebMarkupContainer actions = new WebMarkupContainer("actions");-- actions.add(new AjaxLink<Void>("blameFile") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(blameModel != null);- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (blameInfo != null) {- blameInfo = null;- } else {- blameInfo = getBlameInfo();- }- target.add(TextDiffPanel.this);- blameModel.setObject(blameInfo != null);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return blameInfo!=null? "active": "";- }-- })).setOutputMarkupId(true));-- Depot depot = depotModel.getObject();- PullRequest request = requestModel.getObject();- CodeComment comment;- if (markSupport != null && markSupport.getOpenComment() != null) {- comment = markSupport.getOpenComment();- } else {- comment = null;- }- DepotFilePage.State viewState = new DepotFilePage.State();- if (comment != null)- viewState.commentId = comment.getId();- viewState.blobIdent = change.getBlobIdent();-- PageParameters params = DepotFilePage.paramsOf(depot, viewState);- actions.add(new BookmarkablePageLink<Void>("viewFile", DepotFilePage.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())) {- // we are in context of a pull request and pull request source branch exists, so we edit source branch instead- Link<Void> editLink = new Link<Void>("editFile") {-- @Override- public void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();- editState.blobIdent.revision = request.getSourceBranch();- editState.blobIdent.path = change.getPath();- editState.mode = Mode.EDIT;- editState.requestCompareInfo = new RequestCompareInfo();- editState.requestCompareInfo.requestId = request.getId();- RequestChangesPage page = (RequestChangesPage) getPage();- editState.requestCompareInfo.compareState = page.getState();- PageParameters params = DepotFilePage.paramsOf(depot, editState);- setResponsePage(DepotFilePage.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) {- // we are on a branch- Link<Void> editLink = new Link<Void>("editFile") {-- @Override- public void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();- editState.blobIdent = change.getBlobIdent();- editState.mode = Mode.EDIT;- PageParameters params = DepotFilePage.paramsOf(depot, editState);- setResponsePage(DepotFilePage.class, params);- }-- };- editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));- actions.add(editLink);- } else {- actions.add(new WebMarkupContainer("editFile").setVisible(false));- }- } else {- actions.add(new WebMarkupContainer("editFile").setVisible(false));- }-- return actions;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));- add(new BlobDiffTitle("title", change));-- add(newActions());-- add(new Label("diffLines", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return renderDiffs();- }-- }).setEscapeModelStrings(false));-- add(callbackBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch (params.getParameterValue("action").toString()) {- case "expand":- if (blameInfo != null) {- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- }- int index = params.getParameterValue("param1").toInt();- Integer lastContextSize = contextSizes.get(index);- if (lastContextSize == null)- lastContextSize = Constants.DIFF_CONTEXT_SIZE;- int contextSize = lastContextSize + Constants.DIFF_EXPAND_SIZE;- contextSizes.put(index, contextSize);-- StringBuilder builder = new StringBuilder();- appendEquals(builder, index, lastContextSize, contextSize);-- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");- expanded = StringUtils.replace(expanded, "\n", "");- String script = String.format("gitplex.textdiff.expand('%s', %d, \"%s\");",- getMarkupId(), index, expanded);- target.appendJavaScript(script);- break;- case "openSelectionPopover":- String jsonOfPosition = String.format("{left: %d, top: %d}",- params.getParameterValue("param1").toInt(),- params.getParameterValue("param2").toInt());- CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");- script = String.format("gitplex.textdiff.openSelectionPopover('%s', %s, %s, '%s', %s);",- getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),- SecurityUtils.getAccount()!=null);- target.appendJavaScript(script);- break;- case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());-- mark = getMark(params, "param1", "param2", "param3", "param4", "param5");- markSupport.onAddComment(target, mark);- script = String.format("gitplex.textdiff.onAddComment($('#%s'), %s);",- getMarkupId(), getJson(mark));- target.appendJavaScript(script);- break;- case "openComment":- Long commentId = params.getParameterValue("param1").toLong();- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);- markSupport.onOpenComment(target, comment);- script = String.format("gitplex.textdiff.onOpenComment($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- break;- }- }-- });-- add(blameMessageBehavior = new BlameMessageBehavior() {-- @Override- protected Depot getDepot() {- return depotModel.getObject();- }- });-- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", depotModel) {-- @Override- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {- setResponsePage(DepotFilePage.class, getQueryHitParams(hit));- }-- @Override- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- WebSession.get().setMetaData(DepotFilePage.SEARCH_RESULT_KEY, (ArrayList<QueryHit>)hits);- setResponsePage(DepotFilePage.class, getFindOccurrencesParams());- }-- @Override- protected String getBlobPath() {- if (getRevision().equals(change.getNewBlobIdent().revision))- return change.getNewBlobIdent().path;- else- return change.getOldBlobIdent().path;- }-- };- add(symbolTooltip);-- setOutputMarkupId(true);- }-- private CommentPos getMark(IRequestParameters params, String leftSideParam,- String beginLineParam, String beginCharParam,- String endLineParam, String endCharParam) {- boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();- int beginLine = params.getParameterValue(beginLineParam).toInt();- int beginChar = params.getParameterValue(beginCharParam).toInt();- int endLine = params.getParameterValue(endLineParam).toInt();- int endChar = params.getParameterValue(endCharParam).toInt();- String commit = leftSide?getOldCommit().name():getNewCommit().name();- return new CommentPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));- }-- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {- MarkAwareDiffBlock block = getDiffBlocks().get(index);- if (index == 0) {- int start = block.getLines().size()-contextSize;- if (start < 0)- start=0;- else if (start > 0)- appendExpander(builder, index, start);- for (int j=start; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else if (index == getDiffBlocks().size()-1) {- int end = block.getLines().size();- int skipped = 0;- if (end > contextSize) {- skipped = end-contextSize;- end = contextSize;- }- for (int j=lastContextSize; j<end; j++)- appendEqual(builder, block, j, lastContextSize);- if (skipped != 0)- appendExpander(builder, index, skipped);- } else if (2*contextSize < block.getLines().size()) {- for (int j=lastContextSize; j<contextSize; j++)- appendEqual(builder, block, j, lastContextSize);- appendExpander(builder, index, block.getLines().size() - 2*contextSize);- for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else {- for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- }- }-- private void appendMarkedEquals(StringBuilder builder, int index) {- MarkAwareDiffBlock block = getDiffBlocks().get(index);- for (int i=0; i<block.getLines().size(); i++)- appendEqual(builder, block, i, 0);- }-- private RevCommit getOldCommit() {- return depotModel.getObject().getRevCommit(change.getOldBlobIdent().revision);- }-- private RevCommit getNewCommit() {- return depotModel.getObject().getRevCommit(change.getNewBlobIdent().revision);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));-- String jsonOfOldCommentInfos;- String jsonOfNewCommentInfos;- String jsonOfMark;- String jsonOfCommentInfo;- String dirtyContainerId;- if (markSupport != null) {- String oldCommitHash = getOldCommit().name();- Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();- Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();- for (CodeComment comment: markSupport.getComments()) {- if (comment.getCommentPos().getRange() != null) {- int line = comment.getCommentPos().getRange().getBeginLine();- List<CommentInfo> commentInfosAtLine;- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = new MarkInfo(comment, oldCommitHash);- if (commentInfo.mark.leftSide) {- commentInfosAtLine = oldCommentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- oldCommentInfos.put(line, commentInfosAtLine);- }- } else {- commentInfosAtLine = newCommentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- newCommentInfos.put(line, commentInfosAtLine);- }- }- commentInfosAtLine.add(commentInfo);- }- }- for (List<CommentInfo> value: oldCommentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }- for (List<CommentInfo> value: newCommentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }-- ObjectMapper mapper = GitPlex.getInstance(ObjectMapper.class);- try {- jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);- jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }-- CommentPos mark = markSupport.getMark();- if (mark != null) {- jsonOfMark = getJson(mark);- } else {- jsonOfMark = "undefined";- }- CodeComment comment = markSupport.getOpenComment();- if (comment != null) {- jsonOfCommentInfo = getJsonOfComment(comment);- } else {- jsonOfCommentInfo = "undefined";- }- dirtyContainerId = "'" + markSupport.getDirtyContainer().getMarkupId() + "'";- } else {- jsonOfMark = "undefined";- jsonOfCommentInfo = "undefined";- jsonOfOldCommentInfos = "undefined";- jsonOfNewCommentInfos = "undefined";- dirtyContainerId = "undefined";- }-- CharSequence callback = callbackBehavior.getCallbackFunction(- explicit("action"), explicit("param1"), explicit("param2"),- explicit("param3"), explicit("param4"), explicit("param5"),- explicit("param6"), explicit("param7"), explicit("param8"));- String script = String.format("gitplex.textdiff.init('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, '%s');",- getMarkupId(), symbolTooltip.getMarkupId(),- change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,- RequestCycle.get().find(AjaxRequestTarget.class) == null,- callback, blameMessageBehavior.getCallback(),- markSupport!=null, jsonOfMark, jsonOfCommentInfo,- jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,- GitPlex.getInstance().getDocLink());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- private String renderDiffs() {- StringBuilder builder = new StringBuilder();- if (blameInfo != null) {- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- }-- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='240'></col>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }- } else {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }- }- for (int i=0; i<getDiffBlocks().size(); i++) {- MarkAwareDiffBlock block = getDiffBlocks().get(i);- if (block.getType() == Type.EQUAL) {- Integer lastContextSize = contextSizes.get(i);- if (lastContextSize == null)- lastContextSize = Constants.DIFF_CONTEXT_SIZE;- appendEquals(builder, i, 0, lastContextSize);- } else if (block.getType() == Type.MARKED_EQUAL) {- appendMarkedEquals(builder, i);- } else if (block.getType () == Type.DELETE) {- if (i+1<getDiffBlocks().size()) {- MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);- if (nextBlock.getType() == Type.INSERT) {- LinkedHashMap<Integer, LineDiff> lineChanges =- DiffUtils.align(block.getLines(), nextBlock.getLines());- if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {- for (int j=0; j<block.getLines().size(); j++) {- LineDiff lineDiff = lineChanges.get(j);- if (lineDiff != null) {- appendDelete(builder, block, j, lineDiff.getTokenDiffs());- } else {- appendDelete(builder, block, j, null);- }- }- Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();- for (LineDiff diff: lineChanges.values()) {- lineChangesByInsert.put(diff.getCompareLine(), diff);- }- for (int j=0; j<nextBlock.getLines().size(); j++) {- LineDiff lineDiff = lineChangesByInsert.get(j);- if (lineDiff != null) {- appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());- } else {- appendInsert(builder, nextBlock, j, null);- }- }- } else {- int prevDeleteLineIndex = 0;- int prevInsertLineIndex = 0;- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {- int deleteLineIndex = entry.getKey();- LineDiff lineChange = entry.getValue();- int insertLineIndex = lineChange.getCompareLine();-- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,- prevInsertLineIndex, insertLineIndex);-- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex, lineChange.getTokenDiffs());-- prevDeleteLineIndex = deleteLineIndex+1;- prevInsertLineIndex = insertLineIndex+1;- }- appendDeletesAndInserts(builder, block, nextBlock,- prevDeleteLineIndex, block.getLines().size(),- prevInsertLineIndex, nextBlock.getLines().size());- }- i++;- } else {- for (int j=0; j<block.getLines().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getLines().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getLines().size(); j++)- appendInsert(builder, block, j, null);- }- }- return builder.toString();- }-- private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,- int fromInsertLineIndex, int toInsertLineIndex) {- if (diffMode == DiffViewMode.UNIFIED) {- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)- appendDelete(builder, deleteBlock, i, null);- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)- appendInsert(builder, insertBlock, i, null);- } else {- int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;- int insertSize = toInsertLineIndex - fromInsertLineIndex;- if (deleteSize < insertSize) {- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)- appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);- for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)- appendInsert(builder, insertBlock, i, null);- } else {- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)- appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);- for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)- appendDelete(builder, deleteBlock, i, null);- }- }- }-- private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {- BriefCommit commit;- if (newLineNo != -1)- commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));- else- commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));- if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)- || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)- || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {- CommitDetailPage.State state = new CommitDetailPage.State();- state.revision = commit.getHash();- state.whitespaceOption = change.getWhitespaceOption();- PageParameters params = CommitDetailPage.paramsOf(depotModel.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>",- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),- DateUtils.formatDate(commit.getCommitter().getWhen()),- HtmlEscape.escapeHtml5(commit.getAuthor().getName())));- } else {- builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));- }- } else {- if (diffMode == DiffViewMode.UNIFIED) {- builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");- } else {- builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");- }- }- blameInfo.lastCommitHash = commit.getHash();- if (newLineNo != -1)- blameInfo.lastNewCommitHash = commit.getHash();- if (oldLineNo != -1)- blameInfo.lastOldCommitHash = commit.getHash();- }-- private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {- if (lastContextSize != 0)- builder.append("<tr class='code expanded'>");- else- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- int newLineNo = block.getNewStart() + lineIndex;-- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, newLineNo);- }- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- }- builder.append("</tr>");- }-- private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int newLineNo = block.getNewStart() + lineIndex;- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'> </td>");- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.DELETE)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- } else {- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- builder.append("<td class='blame noselect'> </td>");- }- builder.append("<td class='number noselect'> </td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content left'> </td>");- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- builder.append("</td>");- }- builder.append("</tr>");- }-- private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- if (diffMode == DiffViewMode.UNIFIED ) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old'> </td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.INSERT)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- } else {- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- builder.append("</td>");- if (blameInfo != null) {- builder.append("<td class='blame noselect'> </td>");- }- builder.append("<td class='number noselect'> </td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content right'> </td>");- }- builder.append("</tr>");- }-- private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {- builder.append("<tr class='code original'>");-- int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- List<CmToken> tokens = deleteBlock.getLines().get(deleteLineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens)- builder.append(token.toHtml(Operation.EQUAL));- }- builder.append("</td>");-- int newLineNo = insertBlock.getNewStart()+insertLineIndex;- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- tokens = insertBlock.getLines().get(insertLineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens)- builder.append(token.toHtml(Operation.EQUAL));- }- builder.append("</td>");-- builder.append("</tr>");- }-- private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,- List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;- int newLineNo = insertBlock.getNewStart() + insertLineIndex;- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, newLineNo);- }- builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect old new'>*</td>");- builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits())- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.INSERT)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- builder.append("</td>");-- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.DELETE)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- builder.append("</td>");- }-- builder.append("</tr>");- }-- private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {- builder.append("<tr class='expander expander").append(blockIndex).append("'>");-- String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- } else {- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");- }- builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- } else {- if (blameInfo != null) {- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)- .append("\"><i class='fa fa-sort'></i></a></td>");- builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- } else {- builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)- .append("\"><i class='fa fa-sort'></i></a></td>");- builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- }- }- builder.append("</tr>");- }-- private List<MarkAwareDiffBlock> getDiffBlocks() {- if (diffBlocks == null) {- diffBlocks = new ArrayList<>();- List<Range> oldRanges = new ArrayList<>();- List<Range> newRanges = new ArrayList<>();- if (markSupport != null) {- List<CommentPos> marks = new ArrayList<>();- CommentPos mark = markSupport.getMark();- if (mark != null) {- marks.add(mark);- }- String oldCommitHash = getOldCommit().name();- for (CodeComment comment: markSupport.getComments()) {- mark = comment.getCommentPos();- marks.add(mark);- }- for (CommentPos each: marks) {- Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);- if (each.getCommit().equals(oldCommitHash)) {- oldRanges.add(range);- } else {- newRanges.add(range);- }- }- }-- for (DiffBlock<List<CmToken>> diffBlock: change.getDiffBlocks()) {- if (diffBlock.getOperation() == Operation.DELETE) {- diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),- diffBlock.getOldStart(), diffBlock.getNewStart()));- } else if (diffBlock.getOperation() == Operation.INSERT) {- diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),- diffBlock.getOldStart(), diffBlock.getNewStart()));- } else {- List<Range> ranges = new ArrayList<>();- for (Range range: oldRanges) {- ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));- }- for (Range range: newRanges) {- ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));- }- ranges = RangeUtils.merge(ranges);-- int lastIndex = 0;- for (Range range: ranges) {- int from = range.getFrom();- int to = range.getTo();- if (from < diffBlock.getUnits().size() && to > 0) {- if (from < lastIndex)- from = lastIndex;- if (to > diffBlock.getUnits().size())- to = diffBlock.getUnits().size();- if (lastIndex < from) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, from);- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));- }- if (from < to) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(from, to);- diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,- diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));- }- lastIndex = to;- }- }-- if (lastIndex < diffBlock.getUnits().size()) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));- }- }- }- }- return diffBlocks;- }-- @Override- protected void onDetach() {- depotModel.detach();- requestModel.detach();-- if (blameModel != null)- blameModel.detach();-- super.onDetach();- }-- private String getJsonOfComment(CodeComment comment) {- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = new MarkInfo(comment, getOldCommit().name());-- String jsonOfCommentInfo;- try {- jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- return jsonOfCommentInfo;- }-- @Override- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCommentDeleted($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- mark(target, null);- }-- @Override- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCloseComment($('#%s'));", getMarkupId());- target.appendJavaScript(script);- mark(target, null);- }-- @Override- public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCommentAdded($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- }-- @Override- public void mark(AjaxRequestTarget target, CommentPos mark) {- String script;- if (mark != null) {- script = String.format(""- + "var $container = $('#%s');"- + "var mark = %s;"- + "gitplex.textdiff.scroll($container, mark);"- + "gitplex.textdiff.mark($container, mark);",- getMarkupId(), getJson(mark));- } else {- script = String.format(""- + "var $container = $('#%s');"- + "gitplex.textdiff.clearMark($container);"- + "$container.removeData('mark');",- getMarkupId());- }- target.appendJavaScript(script);- }-- @Override- public void onUnblame(AjaxRequestTarget target) {- blameInfo = null;- target.add(this);- }-- @SuppressWarnings("unused")- private static class CommentInfo {- long id;-- String title;-- MarkInfo mark;- }-- @SuppressWarnings("unused")- private static class MarkInfo extends TextRange {-- String path;-- boolean leftSide;-- public MarkInfo() {-- }-- public MarkInfo(CodeComment comment, String oldCommitHash) {- super(comment.getCommentPos().getRange());- path = comment.getCommentPos().getPath();- leftSide = comment.getCommentPos().getCommit().equals(oldCommitHash);- }-- public MarkInfo(CommentPos mark, String oldCommitHash) {- super(mark.getRange());- path = mark.getPath();- leftSide = mark.getCommit().equals(oldCommitHash);- }-- }-- private static class BlameInfo implements Serializable {-- Map<Integer, BriefCommit> oldBlame = new HashMap<>();-- Map<Integer, BriefCommit> newBlame = new HashMap<>();-- String lastCommitHash;-- String lastOldCommitHash;-- String lastNewCommitHash;-- }--}+package com.gitplex.server.web.component.diff.blob.text;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+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.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.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.protocol.http.WebSession;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.revwalk.RevCommit;+import org.unbescape.html.HtmlEscape;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;+import com.gitplex.server.web.component.diff.blob.SourceAware;+import com.gitplex.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;+import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;+import com.gitplex.server.web.component.diff.difftitle.BlobDiffTitle;+import com.gitplex.server.web.component.diff.revision.BlobCommentSupport;+import com.gitplex.server.web.component.diff.revision.DiffViewMode;+import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;+import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.file.RequestCompareInfo;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.util.DateUtils;+import com.google.common.base.Preconditions;+import com.gitplex.commons.git.Blame;+import com.gitplex.commons.git.BlobChange;+import com.gitplex.commons.git.BriefCommit;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.command.BlameCommand;+import com.gitplex.commons.lang.diff.DiffBlock;+import com.gitplex.commons.lang.diff.DiffMatchPatch.Operation;+import com.gitplex.commons.lang.diff.DiffUtils;+import com.gitplex.commons.lang.diff.LineDiff;+import com.gitplex.commons.lang.tokenizers.CmToken;+import com.gitplex.commons.util.Range;+import com.gitplex.commons.util.RangeUtils;+import com.gitplex.commons.util.StringUtils;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;++@SuppressWarnings("serial")+public class TextDiffPanel extends Panel implements SourceAware {++ private final IModel<Depot> depotModel;++ private final IModel<PullRequest> requestModel;++ private final BlobChange change;++ private final Map<Integer, Integer> contextSizes = new HashMap<>();++ private final DiffViewMode diffMode;++ private final IModel<Boolean> blameModel;++ private final BlobCommentSupport markSupport;++ private Component symbolTooltip;++ private AbstractPostAjaxBehavior callbackBehavior;++ private BlameMessageBehavior blameMessageBehavior;++ private transient List<MarkAwareDiffBlock> diffBlocks;++ private BlameInfo blameInfo;++ public TextDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,+ BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,+ @Nullable BlobCommentSupport markSupport) {+ super(id);++ this.depotModel = depotModel;+ this.requestModel = requestModel;+ this.change = change;+ this.diffMode = diffMode;+ this.markSupport = markSupport;+ this.blameModel = blameModel;++ if (blameModel != null && blameModel.getObject()) {+ blameInfo = getBlameInfo();+ }+ }++ private String getJson(CommentPos mark) {+ try {+ MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(markInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ private BlameInfo getBlameInfo() {+ blameInfo = new BlameInfo();+ BlameCommand cmd = new BlameCommand(depotModel.getObject().getDirectory());+ String oldPath = change.getOldBlobIdent().path;+ if (oldPath != null) {+ cmd.commitHash(getOldCommit().name()).file(oldPath);+ for (Blame blame: cmd.call().values()) {+ for (Range range: blame.getRanges()) {+ for (int i=range.getFrom(); i<range.getTo(); i++)+ blameInfo.oldBlame.put(i, blame.getCommit());+ }+ }+ }+ String newPath = change.getNewBlobIdent().path;+ if (newPath != null) {+ cmd.commitHash(getNewCommit().name()).file(newPath);+ for (Blame blame: cmd.call().values()) {+ for (Range range: blame.getRanges()) {+ for (int i=range.getFrom(); i<range.getTo(); i++)+ blameInfo.newBlame.put(i, blame.getCommit());+ }+ }+ }+ return blameInfo;+ }++ private WebMarkupContainer newActions() {+ WebMarkupContainer actions = new WebMarkupContainer("actions");++ actions.add(new AjaxLink<Void>("blameFile") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(blameModel != null);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (blameInfo != null) {+ blameInfo = null;+ } else {+ blameInfo = getBlameInfo();+ }+ target.add(TextDiffPanel.this);+ blameModel.setObject(blameInfo != null);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return blameInfo!=null? "active": "";+ }++ })).setOutputMarkupId(true));++ Depot depot = depotModel.getObject();+ PullRequest request = requestModel.getObject();+ CodeComment comment;+ if (markSupport != null && markSupport.getOpenComment() != null) {+ comment = markSupport.getOpenComment();+ } else {+ comment = null;+ }+ DepotFilePage.State viewState = new DepotFilePage.State();+ if (comment != null)+ viewState.commentId = comment.getId();+ viewState.blobIdent = change.getBlobIdent();++ PageParameters params = DepotFilePage.paramsOf(depot, viewState);+ actions.add(new BookmarkablePageLink<Void>("viewFile", DepotFilePage.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())) {+ // we are in context of a pull request and pull request source branch exists, so we edit source branch instead+ Link<Void> editLink = new Link<Void>("editFile") {++ @Override+ public void onClick() {+ DepotFilePage.State editState = new DepotFilePage.State();+ editState.blobIdent.revision = request.getSourceBranch();+ editState.blobIdent.path = change.getPath();+ editState.mode = Mode.EDIT;+ editState.requestCompareInfo = new RequestCompareInfo();+ editState.requestCompareInfo.requestId = request.getId();+ RequestChangesPage page = (RequestChangesPage) getPage();+ editState.requestCompareInfo.compareState = page.getState();+ PageParameters params = DepotFilePage.paramsOf(depot, editState);+ setResponsePage(DepotFilePage.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) {+ // we are on a branch+ Link<Void> editLink = new Link<Void>("editFile") {++ @Override+ public void onClick() {+ DepotFilePage.State editState = new DepotFilePage.State();+ editState.blobIdent = change.getBlobIdent();+ editState.mode = Mode.EDIT;+ PageParameters params = DepotFilePage.paramsOf(depot, editState);+ setResponsePage(DepotFilePage.class, params);+ }++ };+ editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));+ actions.add(editLink);+ } else {+ actions.add(new WebMarkupContainer("editFile").setVisible(false));+ }+ } else {+ actions.add(new WebMarkupContainer("editFile").setVisible(false));+ }++ return actions;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));+ add(new BlobDiffTitle("title", change));++ add(newActions());++ add(new Label("diffLines", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return renderDiffs();+ }++ }).setEscapeModelStrings(false));++ add(callbackBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ switch (params.getParameterValue("action").toString()) {+ case "expand":+ if (blameInfo != null) {+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ }+ int index = params.getParameterValue("param1").toInt();+ Integer lastContextSize = contextSizes.get(index);+ if (lastContextSize == null)+ lastContextSize = Constants.DIFF_CONTEXT_SIZE;+ int contextSize = lastContextSize + Constants.DIFF_EXPAND_SIZE;+ contextSizes.put(index, contextSize);++ StringBuilder builder = new StringBuilder();+ appendEquals(builder, index, lastContextSize, contextSize);++ String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");+ expanded = StringUtils.replace(expanded, "\n", "");+ String script = String.format("gitplex.server.textdiff.expand('%s', %d, \"%s\");",+ getMarkupId(), index, expanded);+ target.appendJavaScript(script);+ break;+ case "openSelectionPopover":+ String jsonOfPosition = String.format("{left: %d, top: %d}",+ params.getParameterValue("param1").toInt(),+ params.getParameterValue("param2").toInt());+ CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");+ script = String.format("gitplex.server.textdiff.openSelectionPopover('%s', %s, %s, '%s', %s);",+ getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),+ SecurityUtils.getAccount()!=null);+ target.appendJavaScript(script);+ break;+ case "addComment":+ Preconditions.checkNotNull(SecurityUtils.getAccount());++ mark = getMark(params, "param1", "param2", "param3", "param4", "param5");+ markSupport.onAddComment(target, mark);+ script = String.format("gitplex.server.textdiff.onAddComment($('#%s'), %s);",+ getMarkupId(), getJson(mark));+ target.appendJavaScript(script);+ break;+ case "openComment":+ Long commentId = params.getParameterValue("param1").toLong();+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);+ markSupport.onOpenComment(target, comment);+ script = String.format("gitplex.server.textdiff.onOpenComment($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ break;+ }+ }++ });++ add(blameMessageBehavior = new BlameMessageBehavior() {++ @Override+ protected Depot getDepot() {+ return depotModel.getObject();+ }+ });++ symbolTooltip = new SymbolTooltipPanel("symbolTooltip", depotModel) {++ @Override+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {+ setResponsePage(DepotFilePage.class, getQueryHitParams(hit));+ }++ @Override+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {+ WebSession.get().setMetaData(DepotFilePage.SEARCH_RESULT_KEY, (ArrayList<QueryHit>)hits);+ setResponsePage(DepotFilePage.class, getFindOccurrencesParams());+ }++ @Override+ protected String getBlobPath() {+ if (getRevision().equals(change.getNewBlobIdent().revision))+ return change.getNewBlobIdent().path;+ else+ return change.getOldBlobIdent().path;+ }++ };+ add(symbolTooltip);++ setOutputMarkupId(true);+ }++ private CommentPos getMark(IRequestParameters params, String leftSideParam,+ String beginLineParam, String beginCharParam,+ String endLineParam, String endCharParam) {+ boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();+ int beginLine = params.getParameterValue(beginLineParam).toInt();+ int beginChar = params.getParameterValue(beginCharParam).toInt();+ int endLine = params.getParameterValue(endLineParam).toInt();+ int endChar = params.getParameterValue(endCharParam).toInt();+ String commit = leftSide?getOldCommit().name():getNewCommit().name();+ return new CommentPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));+ }++ private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {+ MarkAwareDiffBlock block = getDiffBlocks().get(index);+ if (index == 0) {+ int start = block.getLines().size()-contextSize;+ if (start < 0)+ start=0;+ else if (start > 0)+ appendExpander(builder, index, start);+ for (int j=start; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else if (index == getDiffBlocks().size()-1) {+ int end = block.getLines().size();+ int skipped = 0;+ if (end > contextSize) {+ skipped = end-contextSize;+ end = contextSize;+ }+ for (int j=lastContextSize; j<end; j++)+ appendEqual(builder, block, j, lastContextSize);+ if (skipped != 0)+ appendExpander(builder, index, skipped);+ } else if (2*contextSize < block.getLines().size()) {+ for (int j=lastContextSize; j<contextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ appendExpander(builder, index, block.getLines().size() - 2*contextSize);+ for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else {+ for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ }+ }++ private void appendMarkedEquals(StringBuilder builder, int index) {+ MarkAwareDiffBlock block = getDiffBlocks().get(index);+ for (int i=0; i<block.getLines().size(); i++)+ appendEqual(builder, block, i, 0);+ }++ private RevCommit getOldCommit() {+ return depotModel.getObject().getRevCommit(change.getOldBlobIdent().revision);+ }++ private RevCommit getNewCommit() {+ return depotModel.getObject().getRevCommit(change.getNewBlobIdent().revision);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));++ String jsonOfOldCommentInfos;+ String jsonOfNewCommentInfos;+ String jsonOfMark;+ String jsonOfCommentInfo;+ String dirtyContainerId;+ if (markSupport != null) {+ String oldCommitHash = getOldCommit().name();+ Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();+ Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();+ for (CodeComment comment: markSupport.getComments()) {+ if (comment.getCommentPos().getRange() != null) {+ int line = comment.getCommentPos().getRange().getBeginLine();+ List<CommentInfo> commentInfosAtLine;+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = new MarkInfo(comment, oldCommitHash);+ if (commentInfo.mark.leftSide) {+ commentInfosAtLine = oldCommentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ oldCommentInfos.put(line, commentInfosAtLine);+ }+ } else {+ commentInfosAtLine = newCommentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ newCommentInfos.put(line, commentInfosAtLine);+ }+ }+ commentInfosAtLine.add(commentInfo);+ }+ }+ for (List<CommentInfo> value: oldCommentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }+ for (List<CommentInfo> value: newCommentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }++ ObjectMapper mapper = GitPlex.getInstance(ObjectMapper.class);+ try {+ jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);+ jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }++ CommentPos mark = markSupport.getMark();+ if (mark != null) {+ jsonOfMark = getJson(mark);+ } else {+ jsonOfMark = "undefined";+ }+ CodeComment comment = markSupport.getOpenComment();+ if (comment != null) {+ jsonOfCommentInfo = getJsonOfComment(comment);+ } else {+ jsonOfCommentInfo = "undefined";+ }+ dirtyContainerId = "'" + markSupport.getDirtyContainer().getMarkupId() + "'";+ } else {+ jsonOfMark = "undefined";+ jsonOfCommentInfo = "undefined";+ jsonOfOldCommentInfos = "undefined";+ jsonOfNewCommentInfos = "undefined";+ dirtyContainerId = "undefined";+ }++ CharSequence callback = callbackBehavior.getCallbackFunction(+ explicit("action"), explicit("param1"), explicit("param2"),+ explicit("param3"), explicit("param4"), explicit("param5"),+ explicit("param6"), explicit("param7"), explicit("param8"));+ String script = String.format("gitplex.server.textdiff.init('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, '%s');",+ getMarkupId(), symbolTooltip.getMarkupId(),+ change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,+ RequestCycle.get().find(AjaxRequestTarget.class) == null,+ callback, blameMessageBehavior.getCallback(),+ markSupport!=null, jsonOfMark, jsonOfCommentInfo,+ jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,+ GitPlex.getInstance().getDocLink());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ private String renderDiffs() {+ StringBuilder builder = new StringBuilder();+ if (blameInfo != null) {+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ }++ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ builder.append(""+ + "<colgroup>"+ + "<col width='240'></col>"+ + "<col width='60'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ } else {+ builder.append(""+ + "<colgroup>"+ + "<col width='60'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ }+ } else {+ if (blameInfo != null) {+ builder.append(""+ + "<colgroup>"+ + "<col width='70'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "<col width='70'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ } else {+ builder.append(""+ + "<colgroup>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ }+ }+ for (int i=0; i<getDiffBlocks().size(); i++) {+ MarkAwareDiffBlock block = getDiffBlocks().get(i);+ if (block.getType() == Type.EQUAL) {+ Integer lastContextSize = contextSizes.get(i);+ if (lastContextSize == null)+ lastContextSize = Constants.DIFF_CONTEXT_SIZE;+ appendEquals(builder, i, 0, lastContextSize);+ } else if (block.getType() == Type.MARKED_EQUAL) {+ appendMarkedEquals(builder, i);+ } else if (block.getType () == Type.DELETE) {+ if (i+1<getDiffBlocks().size()) {+ MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);+ if (nextBlock.getType() == Type.INSERT) {+ LinkedHashMap<Integer, LineDiff> lineChanges =+ DiffUtils.align(block.getLines(), nextBlock.getLines());+ if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {+ for (int j=0; j<block.getLines().size(); j++) {+ LineDiff lineDiff = lineChanges.get(j);+ if (lineDiff != null) {+ appendDelete(builder, block, j, lineDiff.getTokenDiffs());+ } else {+ appendDelete(builder, block, j, null);+ }+ }+ Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();+ for (LineDiff diff: lineChanges.values()) {+ lineChangesByInsert.put(diff.getCompareLine(), diff);+ }+ for (int j=0; j<nextBlock.getLines().size(); j++) {+ LineDiff lineDiff = lineChangesByInsert.get(j);+ if (lineDiff != null) {+ appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());+ } else {+ appendInsert(builder, nextBlock, j, null);+ }+ }+ } else {+ int prevDeleteLineIndex = 0;+ int prevInsertLineIndex = 0;+ for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {+ int deleteLineIndex = entry.getKey();+ LineDiff lineChange = entry.getValue();+ int insertLineIndex = lineChange.getCompareLine();++ appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,+ prevInsertLineIndex, insertLineIndex);++ appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex, lineChange.getTokenDiffs());++ prevDeleteLineIndex = deleteLineIndex+1;+ prevInsertLineIndex = insertLineIndex+1;+ }+ appendDeletesAndInserts(builder, block, nextBlock,+ prevDeleteLineIndex, block.getLines().size(),+ prevInsertLineIndex, nextBlock.getLines().size());+ }+ i++;+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendInsert(builder, block, j, null);+ }+ }+ return builder.toString();+ }++ private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,+ int fromInsertLineIndex, int toInsertLineIndex) {+ if (diffMode == DiffViewMode.UNIFIED) {+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)+ appendDelete(builder, deleteBlock, i, null);+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)+ appendInsert(builder, insertBlock, i, null);+ } else {+ int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;+ int insertSize = toInsertLineIndex - fromInsertLineIndex;+ if (deleteSize < insertSize) {+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)+ appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);+ for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)+ appendInsert(builder, insertBlock, i, null);+ } else {+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)+ appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);+ for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)+ appendDelete(builder, deleteBlock, i, null);+ }+ }+ }++ private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {+ BriefCommit commit;+ if (newLineNo != -1)+ commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));+ else+ commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));+ if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)+ || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)+ || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {+ CommitDetailPage.State state = new CommitDetailPage.State();+ state.revision = commit.getHash();+ state.whitespaceOption = change.getWhitespaceOption();+ PageParameters params = CommitDetailPage.paramsOf(depotModel.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>",+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),+ DateUtils.formatDate(commit.getCommitter().getWhen()),+ HtmlEscape.escapeHtml5(commit.getAuthor().getName())));+ } else {+ builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));+ }+ } else {+ if (diffMode == DiffViewMode.UNIFIED) {+ builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");+ } else {+ builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");+ }+ }+ blameInfo.lastCommitHash = commit.getHash();+ if (newLineNo != -1)+ blameInfo.lastNewCommitHash = commit.getHash();+ if (oldLineNo != -1)+ blameInfo.lastOldCommitHash = commit.getHash();+ }++ private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {+ if (lastContextSize != 0)+ builder.append("<tr class='code expanded'>");+ else+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ int newLineNo = block.getNewStart() + lineIndex;++ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, newLineNo);+ }+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ }+ builder.append("</tr>");+ }++ private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int newLineNo = block.getNewStart() + lineIndex;+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'> </td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.DELETE)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ } else {+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ builder.append("<td class='blame noselect'> </td>");+ }+ builder.append("<td class='number noselect'> </td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content left'> </td>");+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ builder.append("</td>");+ }+ builder.append("</tr>");+ }++ private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ if (diffMode == DiffViewMode.UNIFIED ) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'> </td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.INSERT)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ } else {+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ builder.append("</td>");+ if (blameInfo != null) {+ builder.append("<td class='blame noselect'> </td>");+ }+ builder.append("<td class='number noselect'> </td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content right'> </td>");+ }+ builder.append("</tr>");+ }++ private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {+ builder.append("<tr class='code original'>");++ int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ List<CmToken> tokens = deleteBlock.getLines().get(deleteLineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens)+ builder.append(token.toHtml(Operation.EQUAL));+ }+ builder.append("</td>");++ int newLineNo = insertBlock.getNewStart()+insertLineIndex;+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ tokens = insertBlock.getLines().get(insertLineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens)+ builder.append(token.toHtml(Operation.EQUAL));+ }+ builder.append("</td>");++ builder.append("</tr>");+ }++ private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,+ List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;+ int newLineNo = insertBlock.getNewStart() + insertLineIndex;+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, newLineNo);+ }+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old new'>*</td>");+ builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits())+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.INSERT)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ builder.append("</td>");++ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.DELETE)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ builder.append("</td>");+ }++ builder.append("</tr>");+ }++ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");++ String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ } else {+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");+ }+ builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ } else {+ if (blameInfo != null) {+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)+ .append("\"><i class='fa fa-sort'></i></a></td>");+ builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ } else {+ builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)+ .append("\"><i class='fa fa-sort'></i></a></td>");+ builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ }+ }+ builder.append("</tr>");+ }++ private List<MarkAwareDiffBlock> getDiffBlocks() {+ if (diffBlocks == null) {+ diffBlocks = new ArrayList<>();+ List<Range> oldRanges = new ArrayList<>();+ List<Range> newRanges = new ArrayList<>();+ if (markSupport != null) {+ List<CommentPos> marks = new ArrayList<>();+ CommentPos mark = markSupport.getMark();+ if (mark != null) {+ marks.add(mark);+ }+ String oldCommitHash = getOldCommit().name();+ for (CodeComment comment: markSupport.getComments()) {+ mark = comment.getCommentPos();+ marks.add(mark);+ }+ for (CommentPos each: marks) {+ Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);+ if (each.getCommit().equals(oldCommitHash)) {+ oldRanges.add(range);+ } else {+ newRanges.add(range);+ }+ }+ }++ for (DiffBlock<List<CmToken>> diffBlock: change.getDiffBlocks()) {+ if (diffBlock.getOperation() == Operation.DELETE) {+ diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),+ diffBlock.getOldStart(), diffBlock.getNewStart()));+ } else if (diffBlock.getOperation() == Operation.INSERT) {+ diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),+ diffBlock.getOldStart(), diffBlock.getNewStart()));+ } else {+ List<Range> ranges = new ArrayList<>();+ for (Range range: oldRanges) {+ ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));+ }+ for (Range range: newRanges) {+ ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));+ }+ ranges = RangeUtils.merge(ranges);++ int lastIndex = 0;+ for (Range range: ranges) {+ int from = range.getFrom();+ int to = range.getTo();+ if (from < diffBlock.getUnits().size() && to > 0) {+ if (from < lastIndex)+ from = lastIndex;+ if (to > diffBlock.getUnits().size())+ to = diffBlock.getUnits().size();+ if (lastIndex < from) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, from);+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));+ }+ if (from < to) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(from, to);+ diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,+ diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));+ }+ lastIndex = to;+ }+ }++ if (lastIndex < diffBlock.getUnits().size()) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));+ }+ }+ }+ }+ return diffBlocks;+ }++ @Override+ protected void onDetach() {+ depotModel.detach();+ requestModel.detach();++ if (blameModel != null)+ blameModel.detach();++ super.onDetach();+ }++ private String getJsonOfComment(CodeComment comment) {+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = new MarkInfo(comment, getOldCommit().name());++ String jsonOfCommentInfo;+ try {+ jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ return jsonOfCommentInfo;+ }++ @Override+ public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.server.textdiff.onCommentDeleted($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ mark(target, null);+ }++ @Override+ public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.server.textdiff.onCloseComment($('#%s'));", getMarkupId());+ target.appendJavaScript(script);+ mark(target, null);+ }++ @Override+ public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.server.textdiff.onCommentAdded($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ }++ @Override+ public void mark(AjaxRequestTarget target, CommentPos mark) {+ String script;+ if (mark != null) {+ script = String.format(""+ + "var $container = $('#%s');"+ + "var mark = %s;"+ + "gitplex.server.textdiff.scroll($container, mark);"+ + "gitplex.server.textdiff.mark($container, mark);",+ getMarkupId(), getJson(mark));+ } else {+ script = String.format(""+ + "var $container = $('#%s');"+ + "gitplex.server.textdiff.clearMark($container);"+ + "$container.removeData('mark');",+ getMarkupId());+ }+ target.appendJavaScript(script);+ }++ @Override+ public void onUnblame(AjaxRequestTarget target) {+ blameInfo = null;+ target.add(this);+ }++ @SuppressWarnings("unused")+ private static class CommentInfo {+ long id;++ String title;++ MarkInfo mark;+ }++ @SuppressWarnings("unused")+ private static class MarkInfo extends TextRange {++ String path;++ boolean leftSide;++ public MarkInfo() {++ }++ public MarkInfo(CodeComment comment, String oldCommitHash) {+ super(comment.getCommentPos().getRange());+ path = comment.getCommentPos().getPath();+ leftSide = comment.getCommentPos().getCommit().equals(oldCommitHash);+ }++ public MarkInfo(CommentPos mark, String oldCommitHash) {+ super(mark.getRange());+ path = mark.getPath();+ leftSide = mark.getCommit().equals(oldCommitHash);+ }++ }++ private static class BlameInfo implements Serializable {++ Map<Integer, BriefCommit> oldBlame = new HashMap<>();++ Map<Integer, BriefCommit> newBlame = new HashMap<>();++ String lastCommitHash;++ String lastOldCommitHash;++ String lastNewCommitHash;++ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex 93f9560686..14af77ccfb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.blob.text;+package com.gitplex.server.web.component.diff.blob.text;import java.util.List;@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.hover.HoverResourceReference;import com.gitplex.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/ajax-indicator.gif b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/ajax-indicator.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/ajax-indicator.gifrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/ajax-indicator.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.css b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.cssrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.js b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.jssimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.jsrename to server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.jsindex f58addc089..9244f6fe57 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js@@ -1,913 +1,913 @@-gitplex.textdiff = {- symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta",- init: function(containerId, symbolTooltipId, oldRev, newRev, scroll, callback, blameMessageCallback,- markSupport, mark, openComment, oldComments, newComments, dirtyContainerId, doclink) {- var $container = $("#" + containerId);- $container.data("dirtyContainerId", dirtyContainerId);- $container.data("callback", callback);- $container.data("blameMessageCallback", blameMessageCallback);- $container.data("symbolHover", function() {- var revision;- var $symbol = $(this);- if ($symbol.hasClass("delete")) {- revision = oldRev;- } else {- var $td = $symbol.closest("td");-- // if is deleted line or if it is on left side of split view- if ($td.hasClass("old") && !$td.hasClass("new") || $td.next().is("td"))- revision = oldRev;- else- revision = newRev;- }- var symbolTooltip = document.getElementById(symbolTooltipId);- if (symbolTooltip.onMouseOverSymbol)- symbolTooltip.onMouseOverSymbol(revision, this);- });- $container.data("onMouseOverContent", function() {- if (!gitplex.mouseState.pressed) {- if ($(this).hasClass("left")) {- $container.find("td.content.right").addClass("noselect");- $container.find("td.content.left").removeClass("noselect");- } else if ($(this).hasClass("right")) {- $container.find("td.content.left").addClass("noselect");- $container.find("td.content.right").removeClass("noselect");- }- }- });- var $symbols = $container.find(gitplex.textdiff.symbolClasses);- $symbols.mouseover($container.data("symbolHover"));- $container.find("td.content").mouseover($container.data("onMouseOverContent"));-- gitplex.textdiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash"));-- if (markSupport) {- $container.selectionPopover("init", function() {- var selection = window.getSelection();- if (!selection.rangeCount) {- return "close";- }- var firstRange = selection.getRangeAt(0).cloneRange();- var lastRange = selection.getRangeAt(selection.rangeCount-1).cloneRange();- var $start = $(firstRange.startContainer);- var $end = $(lastRange.endContainer);-- /*- * offset represents offset within $start or $end node, for instance for below selection- * <span>hello</span><span>world</span>- * ^ ^- * $start will be <span>hello</span> and startOffset will be index of character 'l' which is 2,- * $end will be <span>world</span> and endOffset will be index of character 'd' which will be 4- */- var startOffset = firstRange.startOffset;- var endOffset = lastRange.endOffset;-- var $startDiff;- if (!$start.hasClass("text-diff"))- $startDiff = $start.closest(".text-diff");- else- $startDiff = $start;-- var $endDiff;- if (!$end.hasClass("text-diff"))- $endDiff = $end.closest(".text-diff");- else- $endDiff = $end;-- // selection must be within same file- if ($startDiff.length == 0 || $endDiff.length == 0 || !$startDiff.is($endDiff)) {- return "close";- }-- var $startTd = $start.is("td.content")? $start: $start.closest(".text-diff td.content");- var $endTd = $end.is("td.content")? $end: $end.closest(".text-diff td.content");-- // at least one side of selection must be within a table cell- if ($startTd.length == 0 && $endTd.length == 0) {- return "close";- }-- // make sure we are processing td.content on the same side on split view- function getTd($tr) {- var $td = $startTd.length != 0? $startTd: $endTd;- if ($td.hasClass("left"))- return $tr.find("td.content.left");- else if ($td.hasClass("right"))- return $tr.find("td.content.right");- else- return $tr.find("td.content");- }-- /*- * sometimes the selection returns $start and $end as td instead of- * children under td, for instance:- * <td><span>hello</span><span>world</span></td>- * ^- * in this case, both $start and $end is the whole td, and startOffset- * is index of first span element which is 0, and endOffset is index of- * last span element plus 1 which is 2.- *- * this function returns the equivalent child node and offset under td.- * with above example, the equivalent child node will be <span>hello</span>- * and offset will be 0 for selection start, while equivalent end child node- * is <span>world</span> with offset being 5- *- */- function getNodeAndOffsetUnderTd($td, contentIndex) {- var $contents = $td.contents();- for (var i=0; i<$contents.length; i++) {- if (i == contentIndex) {- return {- node: $($contents[i]),- offset: 0- }- }- }- var $lastContent = $contents.last();- return {- node: $lastContent,- offset: $lastContent.text().length- }- }-- // normalize $start to be within td.content- if ($start.parent().parent().is("td.content")) // $start might be the text node under span- $start = $start.parent();- if (!$start.parent().is("td.content")) {- var $td;- if ($start.is("td.content")) { // this happens if we triple click to select a line in firefox- $td = $start;- } else if ($start.is("tr.code")) { // this may happen if we drag mouse to select multiple lines in firefox- $td = getTd($start);- startOffset = startOffset<=$td.index()? 0: $td.contents().length;- } else if ($start.is("tr.expander") || $start.closest("tr.expander").length != 0) { // this may happen if we drag mouse over to expander line- var $tr = $start.is("tr.expander")? $start.next(): $start.closest("tr.expander").next();- if ($tr.length == 0) {- return "close";- }- $td = getTd($tr);- startOffset = 0;- } else {- var $tr = $startDiff.find("tr.code").first();- if ($tr.length == 0) {- return "close";- }- $td = getTd($tr);- startOffset = 0;- }- var nodeAndOffset = getNodeAndOffsetUnderTd($td, startOffset);- $start = nodeAndOffset.node;- startOffset = nodeAndOffset.offset;- }-- // drag mouse over a line below expander, chrome may set $start as the line- // above expander, below code normalizes this case- $startTd = $start.parent();- var $lastContent = $startTd.contents().last();- var noneSelected = $start.is($lastContent) && startOffset >= $lastContent.text().length;- if (noneSelected && $startTd.parent().next().is("tr.expander")) {- var $tr = $startTd.parent().next().next();- if ($tr.length == 0) {- return "close";- }- var $td = getTd($tr);- $start = $td.contents().first();- startOffset = 0;- }-- // normalize $end to be within td.content- if ($end.parent().parent().is("td.content"))- $end = $end.parent();- if (!$end.parent().is("td.content")) {- var $td;- if ($end.is("td.content")) {- $td = $end;- } else if ($end.is("tr.code")) {- $td = getTd($end);- endOffset = endOffset>$td.index()? $td.contents().length: 0;- } else if ($end.is("tr.expander") || $end.closest("tr.expander").length != 0) {- var $tr = $end.is("tr.expander")? $end.prev(): $end.closest("tr.expander").prev();- if ($tr.length == 0) {- return "close";- }- $td = getTd($tr);- endOffset = $td.contents().length;- } else {- var $tr = $endDiff.find("tr.code").last();- if ($tr.length == 0) {- return "close";- }- $td = getTd($tr);- endOffset = $td.contents().length;- }- var nodeAndOffset = getNodeAndOffsetUnderTd($td, endOffset);- $end = nodeAndOffset.node;- endOffset = nodeAndOffset.offset;- }-- // drag mouse over a line above expander, chrome may set $end as the line- // below expander, below code normalizes this case- $endTd = $end.parent();- var $firstContent = $endTd.contents().first();- var noneSelected = $end.is($firstContent) && endOffset == 0;- if (noneSelected && $endTd.parent().prev().is("tr.expander")) {- var $tr = $endTd.parent().prev().prev();- if ($tr.length == 0) {- return "close";- }- var $td = getTd($tr);- $end = $td.contents().last();- endOffset = $end.text().length;- }-- $startTd = $start.parent();- $endTd = $end.parent();-- // selection must not span the split view- if ($startTd.hasClass("left") && $endTd.hasClass("right")- || $startTd.hasClass("right") && $endTd.hasClass("left")) {- return "close";- }-- var $startTr = $startTd.parent();- var $endTr = $endTd.parent();- if ($startTr.index() > $endTr.index()) {- return "close";- }-- function nextContent($content) {- var $td = $content.parent();- var array = $td.contents().toArray();- var index = array.indexOf($content[0]);- if (index == array.length-1) {- var $nextTr = $td.parent().next();- if ($nextTr.hasClass("expander")) {- $nextTr = $nextTr.next();- }- if ($nextTr.length == 0)- return undefined;- return getTd($nextTr).contents().first();- } else {- return $(array[index+1]);- }- }-- function prevContent($content) {- var $td = $content.parent();- var array = $td.contents().toArray();- var index = array.indexOf($content[0]);- if (index == 0) {- var $prevTr = $td.parent().prev();- if ($prevTr.hasClass("expander")) {- $prevTr = $prevTr.next();- }- if ($prevTr.length == 0)- return undefined;- return getTd($prevTr).contents().last();- } else {- return $(array[index-1]);- }- }-- function hasOldOrNewData($content) {- var $td = $content.parent();- return $td.attr("data-old") || $td.attr("data-new");- }-- /*- * continue to normalize $start and $end. This time we convert below selection:- * <span>begin</span><span>middle</span><span>end</span>- * ^ ^- * into this selection:- * <span>begin</span><span>middle</span><span>end</span>- * ^ ^- * this normalization makes it accurate to detect invalid selections where start- * and end of selection points to different revisions- */- var $content = $start;- while (!$content.is($end) && (startOffset >= $content.text().length || !hasOldOrNewData($content))) {- $content = nextContent($content);- if (!$content) {- return "close";- } else {- $start = $content;- startOffset = 0;- }- }-- $content = $end;- while (!$content.is($start) && (endOffset == 0 || !hasOldOrNewData($content))) {- $content = prevContent($content);- if (!$content) {- return "close";- } else {- $end = $content;- endOffset = $content.text().length;- }- }-- // check if there is anything selected- if ($start.is($end) && startOffset >= endOffset- || !hasOldOrNewData($start) || !hasOldOrNewData($end)) {- return "close";- }-- firstRange.collapse(true);- var startRect = firstRange.getClientRects()[0];- lastRange.collapse(false);- var endRect = lastRange.getClientRects()[0];- if (!startRect || !endRect) {- startRect = selection.getRangeAt(0).getClientRects()[0];- endRect = startRect;- }- var position = {- left: (startRect.left + endRect.right)/2,- top: startRect.top- };- position.left += $(window).scrollLeft();- position.top += $(window).scrollTop();-- function showInvalidSelection() {- var $content = $("<div></div>");- $content.append("<a class='invalid'><i class='fa fa-warning'></i> Invalid selection, click for details</a>");- $content.children("a").attr("href", doclink + "/Diff+Selection");- return {- position: position,- content: $content- }- }-- // all lines between selection has been expanded- if ($startTr.nextAll("tr.expander").filter($endTr.prevAll("tr.expander")).length != 0- || $startTr.prevAll("tr.expander").filter($endTr.nextAll("tr.expander")).length != 0) {- return showInvalidSelection();- }-- /*- * cursor.line represents line number of selection and cursor.ch represents- * character index inside text of the whole line, without considering element- * tags.- */- function getCursor($node, offset) {- $nodeTd = $node.parent();- var oldLine, newLine;- if (!$nodeTd.hasClass("old") && !$nodeTd.hasClass("new")- || $nodeTd.hasClass("old") && $nodeTd.hasClass("new")) {- oldLine = $nodeTd.data("old") + 1;- newLine = $nodeTd.data("new") + 1;- } else if ($nodeTd.hasClass("old")) {- oldLine = $nodeTd.data("old") + 1;- } else {- newLine = $nodeTd.data("new") + 1;- }- var $contents = $nodeTd.contents();- var oldOffset = 0, newOffset = 0;- for (var i=0; i<$contents.length; i++) {- var $content = $($contents[i]);- if ($content.is($node)) {- if ($content.hasClass("delete")) {- oldCh = oldOffset + offset;- newCh = undefined;- newLine = undefined;- } else if ($content.hasClass("insert")) {- oldCh = undefined;- oldLine = undefined;- newCh = newOffset + offset;- } else {- oldCh = oldOffset + offset;- newCh = newOffset + offset;- }- break;- } else {- var len = $content.text().length;- if ($content.hasClass("delete")) {- oldOffset += len;- } else if ($content.hasClass("insert")) {- newOffset += len;- } else {- oldOffset += len;- newOffset += len;- }- }- }- if ($nodeTd.hasClass("left")) {- newLine = newCh = undefined;- } else if ($nodeTd.hasClass("right")) {- oldLine = oldCh = undefined;- }- return {- oldLine: oldLine,- oldCh: oldCh,- newLine: newLine,- newCh: newCh- };- }-- var startCursor = getCursor($start, startOffset);- var endCursor = getCursor($end, endOffset);-- if (startCursor.newLine && endCursor.newLine) {- callback("openSelectionPopover", Math.round(position.left), Math.round(position.top), false,- startCursor.newLine-1, startCursor.newCh, endCursor.newLine-1, endCursor.newCh);- } else if (startCursor.oldLine && endCursor.oldLine) {- callback("openSelectionPopover", Math.round(position.left), Math.round(position.top), true,- startCursor.oldLine-1, startCursor.oldCh, endCursor.oldLine-1, endCursor.oldCh);- } else {- return showInvalidSelection();- }- });-- if (openComment) {- $container.data("openComment", openComment);- }- for (var line in oldComments) {- if (oldComments.hasOwnProperty(line)) {- gitplex.textdiff.addCommentIndicator($container, true, line, oldComments[line][1]);- }- }- for (var line in newComments) {- if (newComments.hasOwnProperty(line)) {- gitplex.textdiff.addCommentIndicator($container, false, line, newComments[line][1]);- }- }-- gitplex.textdiff.highlightCommentTrigger($container);-- if (mark) {- $container.data("mark", mark);- gitplex.textdiff.mark($container, mark);- if (scroll && !gitplex.commons.history.isVisited())- gitplex.textdiff.scroll($container, mark);- }- }-- },- initBlameTooltip: function(containerId, $hashLink) {- var $container = $("#" + containerId);- var alignment = {targetX: 100, targetY: 100, x: 0, y: 0};- $hashLink.hover(function() {- var $commitLink = $(this);- var $content = $commitLink.closest("tr").children("td.content");- var oldLine = $content.data("old");- if (oldLine == undefined)- oldLine = -1;- var newLine = $content.data("new");- if (newLine == undefined)- newLine = -1;-- var tooltipId = "blame-message-" + containerId + "_" + oldLine + "_" + newLine;- $container.data("blameMessageCallback")(tooltipId, $(this).data("hash"));- var $tooltip = $("<div class='blame-message'><div class='loading'>Loading...</div></div>");- $tooltip.attr("id", tooltipId);- $tooltip.data("trigger", this);- $tooltip.data("alignment", alignment);- $container.append($tooltip);- return $tooltip;- }, alignment);- },- openSelectionPopover: function(containerId, position, mark, markUrl, loggedIn) {- var $container = $("#" + containerId);-- var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");- $content.children("a.permanent").attr("href", markUrl);- if (loggedIn) {- $content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");- $content.children("a.comment").click(function() {- if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- $container.data("callback")("addComment", mark.leftSide,- mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);- });- } else {- $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");- }-- $container.selectionPopover("open", {- position: position,- content: $content- });- },- expand: function(containerId, blockIndex, expandedHtml) {- var $container = $("#" + containerId);- var $expanderTr = $container.find(".expander" + blockIndex);- var $prevTr = $expanderTr.prev();- var $nextTr = $expanderTr.next();- $expanderTr.replaceWith(expandedHtml);- var $expandedTrs;- if ($prevTr.length != 0 && $nextTr.length != 0) {- $expandedTrs = $prevTr.nextAll().filter($nextTr.prevAll());- } else if ($prevTr.length != 0) {- $expandedTrs = $prevTr.nextAll();- } else {- $expandedTrs = $nextTr.prevAll();- }- var $symbols = $expandedTrs.find(gitplex.textdiff.symbolClasses);- $symbols.mouseover($container.data("symbolHover"));- $expandedTrs.find("td.content").mouseover($container.data("onMouseOverContent"));- var $firstExpandedTr = $expandedTrs.first();-- function processBlames(index) {- var commitHash = $firstExpandedTr.children("td.blame").eq(index).children("a.hash").data("hash");- var prevCommitHash;- $firstExpandedTr.prevAll().each(function() {- if (!prevCommitHash) {- var $tr = $(this);- var $prevCommitLink = $tr.children("td.blame").eq(index).children("a.hash");- if ($prevCommitLink.length != 0) {- prevCommitHash = $prevCommitLink.data("hash");- }- }- });- if (commitHash == prevCommitHash) {- $firstExpandedTr.children("td.blame").eq(index).html("<div class='same-as-above'>...</div>");- }-- if ($nextTr.length != 0) {- commitHash = $nextTr.children("td.blame").eq(index).children("a.hash").data("hash");- prevCommitHash = undefined;- $nextTr.prevAll().each(function() {- if (!prevCommitHash) {- var $prevCommitLink = $(this).children("td.blame").eq(index).children("a.hash");- if ($prevCommitLink.length != 0) {- prevCommitHash = $prevCommitLink.data("hash");- }- }- });- if (commitHash == prevCommitHash) {- $nextTr.children("td.blame").eq(index).html("<div class='same-as-above'>...</div>");- }- }- }- if ($firstExpandedTr.children("td.blame").length == 1) {- processBlames(0);- } else if ($firstExpandedTr.children("td.blame").length == 2) {- processBlames(0);- processBlames(1);- }-- gitplex.textdiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash"));-- $(window).resize();- },- getMarkInfo: function($container, mark) {- var oldOrNew = mark.leftSide?"old":"new";- var startCursor = [mark.beginLine+1, mark.beginChar];- var endCursor = [mark.endLine+1, mark.endChar];- var $startTd = $container.find("td.content[data-" + oldOrNew + "='" + (startCursor[0]-1) + "']");- var $endTd = $container.find("td.content[data-" + oldOrNew + "='" + (endCursor[0]-1) + "']");- if ($startTd.length == 0) {- console.error("Unable to find start td!");- $startTd = undefined;- } else if ($startTd.length == 2) {- if (oldOrNew == "old") {- $startTd = $startTd.first();- } else {- $startTd = $startTd.last();- }- }- if ($endTd.length == 0) {- console.error("Unable to find end td!");- $endTd = undefined;- } else if ($endTd.length == 2) {- if (oldOrNew == "old") {- $endTd = $endTd.first();- } else {- $endTd = $endTd.last();- }- }- return {- startTd: $startTd,- startCursor: startCursor,- endTd: $endTd,- endCursor: endCursor,- oldOrNew: oldOrNew- };- },- scroll: function($container, mark) {- // use a timer to scroll after possible view port resize- setTimeout(function() {- var markInfo = gitplex.textdiff.getMarkInfo($container, mark);- var $startTd = markInfo.startTd;- var $endTd = markInfo.endTd;- if ($startTd && $endTd) {- var top = $startTd.offset().top;- var bottom = $endTd.offset().top + $endTd.outerHeight();- var markHeight = bottom - top;- var windowHeight = $(window).height();- if (windowHeight <= markHeight) {- $(window).scrollTop(top-50);- } else {- $(window).scrollTop((top+bottom-windowHeight)/2);- }- }- }, 0);- },- mark: function($container, mark) {- gitplex.textdiff.clearMark($container);-- var markInfo = gitplex.textdiff.getMarkInfo($container, mark);- var $startTd = markInfo.startTd;- var $endTd = markInfo.endTd;- if ($startTd && $endTd) {- var startCursor = markInfo.startCursor;- var endCursor = markInfo.endCursor;- var oldOrNew = markInfo.oldOrNew;- var $td = $startTd;- while (true) {- var ch = 0;- $td.addClass("content-mark");- $td.data("beforemark", $td.html());- $td.contents().each(function() {- var $this = $(this);- var text = $this.text();- function markText(from, to) {- var text = $this.text();- var left = text.substring(0, from);- var middle = text.substring(from, to);- var right = text.substring(to);-- if (left.length == 0 && right.length == 0 && $this.is("span")) {- $this.addClass("content-mark");- } else {- var classes;- if ($this.is("span"))- classes = $this.attr("class");- else- classes = "";-- var $current = $this;- if (left.length != 0) {- $current.after("<span></span>");- $current = $current.next();- $current.attr("class", classes).text(left);- }-- $current.after("<span></span>");- $current = $current.next();- $current.attr("class", classes + " content-mark").text(middle);-- if (right.length != 0) {- $current.after("<span></span>");- $current = $current.next();- $current.attr("class", classes).text(right);- }- $this.remove();- }- }- if ($this.hasClass("insert") && oldOrNew == "old"- || $this.hasClass("delete") && oldOrNew == "new") {- if (!$td.is($startTd) && !$td.is($endTd)) {- markText(0, text.length);- } else if ($td.is($startTd) && $td.is($endTd)) {- if (endCursor[1]>ch && startCursor[1]<ch) {- markText(0, text.length);- }- } else if ($td.is($startTd)) {- if (startCursor[1]<ch) {- markText(0, text.length);- }- } else {- if (endCursor[1]>ch) {- markText(0, text.length);- }- }- } else {- var nextCh = ch + text.length;- if (!$td.is($startTd) && !$td.is($endTd)) {- markText(0, text.length);- } else if ($td.is($startTd) && $td.is($endTd)) {- if (endCursor[1]>ch && startCursor[1]<nextCh) {- if (ch>=startCursor[1] && nextCh<=endCursor[1]) {- markText(0, text.length);- } else if (ch<startCursor[1] && nextCh>endCursor[1]) {- markText(startCursor[1]-ch, endCursor[1]-ch);- } else if (ch<startCursor[1]) {- markText(startCursor[1]-ch, text.length);- } else {- markText(0, endCursor[1]-ch);- }- }- } else if ($td.is($startTd)) {- if (ch>=startCursor[1]) {- markText(0, text.length);- } else if (nextCh>startCursor[1]) {- markText(startCursor[1]-ch, text.length);- }- } else {- if (nextCh<=endCursor[1]) {- markText(0, text.length);- } else if (ch<endCursor[1]) {- markText(0, endCursor[1]-ch);- }- }- ch = nextCh;- }- });- if ($td.is($endTd) || $td.length == 0) {- break;- } else {- if ($startTd.hasClass("left")) {- $td = $td.parent().next().children("td.left");- } else if ($startTd.hasClass("right")) {- $td = $td.parent().next().children("td.right");- } else {- $td = $td.parent().next().children("td.content");- }- }- }- }- },- clearMark: function($container) {- $container.find("td.content.content-mark").each(function() {- var $this = $(this);- $this.html($this.data("beforemark"));- $this.removeClass("content-mark");- $this.removeData("beforemark");- $container = $this.closest(".text-diff").parent();- $this.find(gitplex.textdiff.symbolClasses).mouseover($container.data("symbolHover"));- });- },- restoreMark: function($container) {- var mark = $container.data("mark");- if (mark) {- gitplex.textdiff.mark($container, mark);- } else {- gitplex.textdiff.clearMark($container);- }- },- addCommentIndicator: function($container, leftSide, line, comments) {- var oldOrNew = leftSide?"old":"new";- $container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "']").remove();- var $lineNumTd = gitplex.textdiff.getLineNumTd($container, leftSide, line);-- var callback = $container.data("callback");-- var $indicator = $(document.createElement("a"));- $indicator.addClass("comment-indicator");- $indicator.data("comments", comments);- if (comments.length != 1) {- /*- * when there are multiple comments starts with the same line, we should- * display a comment indicator which will display a comment popover with- * list of comment triggers upon click, user can then click one of the- * trigger link to display the actual comment content- */- var oldOrNew = leftSide?"old":"new";- $indicator.append("<i class='fa fa-comments'></i>");- var content = "";- for (var i in comments) {- var comment = comments[i];- var index = parseInt(i) + 1;- content += "<a class='comment-trigger' title='Click to show comment of marked text'>#" + comment.id + "</a>";- }- $indicator.popover({- html: true,- container: $lineNumTd,- placement: "right auto",- template: "<div class='" + oldOrNew + " popover comment-popover' data-line='" + line + "'><div class='arrow'></div><div class='popover-content'></div></div>",- content: content- });- $indicator.on('shown.bs.popover', function () {- $("." + oldOrNew + ".comment-popover[data-line='" + line + "'] a").each(function() {- $(this).mouseover(function() {- var comment = comments[$(this).index()];- gitplex.textdiff.mark($container, comment.mark);- });- $(this).mouseout(function() {- gitplex.textdiff.restoreMark($container);- });- $(this).click(function() {- if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- var comment = comments[$(this).index()];- callback("openComment", comment.id);- });- });- gitplex.textdiff.highlightCommentTrigger($container);- });- } else {- var comment = comments[0];- $indicator.addClass("comment-trigger").attr("title", "Click to show comment of marked text");- $indicator.append("<i class='fa fa-commenting'></i>");- $indicator.mouseover(function() {- gitplex.textdiff.mark($container, comment.mark);- });- $indicator.mouseout(function() {- gitplex.textdiff.restoreMark($container);- });- $indicator.click(function() {- if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- callback("openComment", comment.id);- });- }- $lineNumTd.children(".comment-indicator").remove();- $lineNumTd.prepend($indicator);- },- getLineNumTd: function($container, leftSide, line) {- if (leftSide) {- var $contentTd = $container.find("td.left.content[data-old='" + line + "']");- if ($contentTd.length == 0)- $contentTd = $container.find("td.content[data-old='" + line + "']");- return $contentTd.prevAll("td.number").last();- } else {- var $contentTd = $container.find("td.right.content[data-new='" + line + "']");- if ($contentTd.length == 0)- $contentTd = $container.find("td.content[data-new='" + line + "']");- return $contentTd.prevAll("td.number").first();- }- },- highlightCommentTrigger: function($container) {- $container.find(".comment-trigger").removeClass("active");- var openComment = $container.data("openComment");- if (openComment) {- var line = parseInt(openComment.mark.beginLine);- var $indicator = gitplex.textdiff.getLineNumTd($container, openComment.mark.leftSide, line).children(".comment-indicator");- if ($indicator.length != 0) {- var comments = $indicator.data("comments");- if (comments.length == 1) {- $indicator.addClass("active");- } else {- var oldOrNew = openComment.mark.leftSide?"old":"new";- $container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "'] a").each(function() {- var comment = comments[$(this).index()];- if (comment.id == openComment.id) {- $(this).addClass("active");- }- });- }- }- }- },- onCommentAdded: function($container, comment) {- $container.data("openComment", comment);- $container.data("mark", comment.mark);-- var line = parseInt(comment.mark.beginLine);- var leftSide = comment.mark.leftSide;-- var $indicator = gitplex.textdiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");- var comments;- if ($indicator.length != 0) {- comments = $indicator.data("comments");- } else {- comments = [];- }- comments.push(comment);- gitplex.textdiff.addCommentIndicator($container, leftSide, line, comments);- gitplex.textdiff.highlightCommentTrigger($container);- },- onCommentDeleted: function($container, comment) {- $container.removeData("openComment");-- var line = parseInt(comment.mark.beginLine);- var leftSide = comment.mark.leftSide;- var $indicator = gitplex.textdiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");- var comments = $indicator.data("comments");- if (comments.length == 1) {- $indicator.remove();- } else {- for (var i in comments) {- var each = comments[i];- if (each.id == comment.id) {- comments.splice(i, 1);- break;- }- }- gitplex.textdiff.addCommentIndicator($container, leftSide, line, comments);- }- gitplex.textdiff.highlightCommentTrigger($container);- },- onOpenComment: function($container, comment) {- $container.data("openComment", comment);- $container.data("mark", comment.mark);- gitplex.textdiff.highlightCommentTrigger($container);- gitplex.textdiff.mark($container, comment.mark);- gitplex.textdiff.scroll($container, comment.mark);- },- onCloseComment: function($container) {- $container.removeData("openComment");- gitplex.textdiff.highlightCommentTrigger($container);- },- onAddComment: function($container, mark) {- $container.removeData("openComment");- $container.data("mark", mark);-- $container.selectionPopover("close");- window.getSelection().removeAllRanges();-- // continue to operate DOM in a timer to give browser a chance to- // clear selections- setTimeout(function() {- gitplex.textdiff.highlightCommentTrigger($container);- gitplex.textdiff.mark($container, mark);- gitplex.textdiff.scroll($container, mark);- }, 100);- }-};+gitplex.server.textdiff = {+ symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta",+ init: function(containerId, symbolTooltipId, oldRev, newRev, scroll, callback, blameMessageCallback,+ markSupport, mark, openComment, oldComments, newComments, dirtyContainerId, doclink) {+ var $container = $("#" + containerId);+ $container.data("dirtyContainerId", dirtyContainerId);+ $container.data("callback", callback);+ $container.data("blameMessageCallback", blameMessageCallback);+ $container.data("symbolHover", function() {+ var revision;+ var $symbol = $(this);+ if ($symbol.hasClass("delete")) {+ revision = oldRev;+ } else {+ var $td = $symbol.closest("td");++ // if is deleted line or if it is on left side of split view+ if ($td.hasClass("old") && !$td.hasClass("new") || $td.next().is("td"))+ revision = oldRev;+ else+ revision = newRev;+ }+ var symbolTooltip = document.getElementById(symbolTooltipId);+ if (symbolTooltip.onMouseOverSymbol)+ symbolTooltip.onMouseOverSymbol(revision, this);+ });+ $container.data("onMouseOverContent", function() {+ if (!gitplex.server.mouseState.pressed) {+ if ($(this).hasClass("left")) {+ $container.find("td.content.right").addClass("noselect");+ $container.find("td.content.left").removeClass("noselect");+ } else if ($(this).hasClass("right")) {+ $container.find("td.content.left").addClass("noselect");+ $container.find("td.content.right").removeClass("noselect");+ }+ }+ });+ var $symbols = $container.find(gitplex.server.textdiff.symbolClasses);+ $symbols.mouseover($container.data("symbolHover"));+ $container.find("td.content").mouseover($container.data("onMouseOverContent"));++ gitplex.server.textdiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash"));++ if (markSupport) {+ $container.selectionPopover("init", function() {+ var selection = window.getSelection();+ if (!selection.rangeCount) {+ return "close";+ }+ var firstRange = selection.getRangeAt(0).cloneRange();+ var lastRange = selection.getRangeAt(selection.rangeCount-1).cloneRange();+ var $start = $(firstRange.startContainer);+ var $end = $(lastRange.endContainer);++ /*+ * offset represents offset within $start or $end node, for instance for below selection+ * <span>hello</span><span>world</span>+ * ^ ^+ * $start will be <span>hello</span> and startOffset will be index of character 'l' which is 2,+ * $end will be <span>world</span> and endOffset will be index of character 'd' which will be 4+ */+ var startOffset = firstRange.startOffset;+ var endOffset = lastRange.endOffset;++ var $startDiff;+ if (!$start.hasClass("text-diff"))+ $startDiff = $start.closest(".text-diff");+ else+ $startDiff = $start;++ var $endDiff;+ if (!$end.hasClass("text-diff"))+ $endDiff = $end.closest(".text-diff");+ else+ $endDiff = $end;++ // selection must be within same file+ if ($startDiff.length == 0 || $endDiff.length == 0 || !$startDiff.is($endDiff)) {+ return "close";+ }++ var $startTd = $start.is("td.content")? $start: $start.closest(".text-diff td.content");+ var $endTd = $end.is("td.content")? $end: $end.closest(".text-diff td.content");++ // at least one side of selection must be within a table cell+ if ($startTd.length == 0 && $endTd.length == 0) {+ return "close";+ }++ // make sure we are processing td.content on the same side on split view+ function getTd($tr) {+ var $td = $startTd.length != 0? $startTd: $endTd;+ if ($td.hasClass("left"))+ return $tr.find("td.content.left");+ else if ($td.hasClass("right"))+ return $tr.find("td.content.right");+ else+ return $tr.find("td.content");+ }++ /*+ * sometimes the selection returns $start and $end as td instead of+ * children under td, for instance:+ * <td><span>hello</span><span>world</span></td>+ * ^+ * in this case, both $start and $end is the whole td, and startOffset+ * is index of first span element which is 0, and endOffset is index of+ * last span element plus 1 which is 2.+ *+ * this function returns the equivalent child node and offset under td.+ * with above example, the equivalent child node will be <span>hello</span>+ * and offset will be 0 for selection start, while equivalent end child node+ * is <span>world</span> with offset being 5+ *+ */+ function getNodeAndOffsetUnderTd($td, contentIndex) {+ var $contents = $td.contents();+ for (var i=0; i<$contents.length; i++) {+ if (i == contentIndex) {+ return {+ node: $($contents[i]),+ offset: 0+ }+ }+ }+ var $lastContent = $contents.last();+ return {+ node: $lastContent,+ offset: $lastContent.text().length+ }+ }++ // normalize $start to be within td.content+ if ($start.parent().parent().is("td.content")) // $start might be the text node under span+ $start = $start.parent();+ if (!$start.parent().is("td.content")) {+ var $td;+ if ($start.is("td.content")) { // this happens if we triple click to select a line in firefox+ $td = $start;+ } else if ($start.is("tr.code")) { // this may happen if we drag mouse to select multiple lines in firefox+ $td = getTd($start);+ startOffset = startOffset<=$td.index()? 0: $td.contents().length;+ } else if ($start.is("tr.expander") || $start.closest("tr.expander").length != 0) { // this may happen if we drag mouse over to expander line+ var $tr = $start.is("tr.expander")? $start.next(): $start.closest("tr.expander").next();+ if ($tr.length == 0) {+ return "close";+ }+ $td = getTd($tr);+ startOffset = 0;+ } else {+ var $tr = $startDiff.find("tr.code").first();+ if ($tr.length == 0) {+ return "close";+ }+ $td = getTd($tr);+ startOffset = 0;+ }+ var nodeAndOffset = getNodeAndOffsetUnderTd($td, startOffset);+ $start = nodeAndOffset.node;+ startOffset = nodeAndOffset.offset;+ }++ // drag mouse over a line below expander, chrome may set $start as the line+ // above expander, below code normalizes this case+ $startTd = $start.parent();+ var $lastContent = $startTd.contents().last();+ var noneSelected = $start.is($lastContent) && startOffset >= $lastContent.text().length;+ if (noneSelected && $startTd.parent().next().is("tr.expander")) {+ var $tr = $startTd.parent().next().next();+ if ($tr.length == 0) {+ return "close";+ }+ var $td = getTd($tr);+ $start = $td.contents().first();+ startOffset = 0;+ }++ // normalize $end to be within td.content+ if ($end.parent().parent().is("td.content"))+ $end = $end.parent();+ if (!$end.parent().is("td.content")) {+ var $td;+ if ($end.is("td.content")) {+ $td = $end;+ } else if ($end.is("tr.code")) {+ $td = getTd($end);+ endOffset = endOffset>$td.index()? $td.contents().length: 0;+ } else if ($end.is("tr.expander") || $end.closest("tr.expander").length != 0) {+ var $tr = $end.is("tr.expander")? $end.prev(): $end.closest("tr.expander").prev();+ if ($tr.length == 0) {+ return "close";+ }+ $td = getTd($tr);+ endOffset = $td.contents().length;+ } else {+ var $tr = $endDiff.find("tr.code").last();+ if ($tr.length == 0) {+ return "close";+ }+ $td = getTd($tr);+ endOffset = $td.contents().length;+ }+ var nodeAndOffset = getNodeAndOffsetUnderTd($td, endOffset);+ $end = nodeAndOffset.node;+ endOffset = nodeAndOffset.offset;+ }++ // drag mouse over a line above expander, chrome may set $end as the line+ // below expander, below code normalizes this case+ $endTd = $end.parent();+ var $firstContent = $endTd.contents().first();+ var noneSelected = $end.is($firstContent) && endOffset == 0;+ if (noneSelected && $endTd.parent().prev().is("tr.expander")) {+ var $tr = $endTd.parent().prev().prev();+ if ($tr.length == 0) {+ return "close";+ }+ var $td = getTd($tr);+ $end = $td.contents().last();+ endOffset = $end.text().length;+ }++ $startTd = $start.parent();+ $endTd = $end.parent();++ // selection must not span the split view+ if ($startTd.hasClass("left") && $endTd.hasClass("right")+ || $startTd.hasClass("right") && $endTd.hasClass("left")) {+ return "close";+ }++ var $startTr = $startTd.parent();+ var $endTr = $endTd.parent();+ if ($startTr.index() > $endTr.index()) {+ return "close";+ }++ function nextContent($content) {+ var $td = $content.parent();+ var array = $td.contents().toArray();+ var index = array.indexOf($content[0]);+ if (index == array.length-1) {+ var $nextTr = $td.parent().next();+ if ($nextTr.hasClass("expander")) {+ $nextTr = $nextTr.next();+ }+ if ($nextTr.length == 0)+ return undefined;+ return getTd($nextTr).contents().first();+ } else {+ return $(array[index+1]);+ }+ }++ function prevContent($content) {+ var $td = $content.parent();+ var array = $td.contents().toArray();+ var index = array.indexOf($content[0]);+ if (index == 0) {+ var $prevTr = $td.parent().prev();+ if ($prevTr.hasClass("expander")) {+ $prevTr = $prevTr.next();+ }+ if ($prevTr.length == 0)+ return undefined;+ return getTd($prevTr).contents().last();+ } else {+ return $(array[index-1]);+ }+ }++ function hasOldOrNewData($content) {+ var $td = $content.parent();+ return $td.attr("data-old") || $td.attr("data-new");+ }++ /*+ * continue to normalize $start and $end. This time we convert below selection:+ * <span>begin</span><span>middle</span><span>end</span>+ * ^ ^+ * into this selection:+ * <span>begin</span><span>middle</span><span>end</span>+ * ^ ^+ * this normalization makes it accurate to detect invalid selections where start+ * and end of selection points to different revisions+ */+ var $content = $start;+ while (!$content.is($end) && (startOffset >= $content.text().length || !hasOldOrNewData($content))) {+ $content = nextContent($content);+ if (!$content) {+ return "close";+ } else {+ $start = $content;+ startOffset = 0;+ }+ }++ $content = $end;+ while (!$content.is($start) && (endOffset == 0 || !hasOldOrNewData($content))) {+ $content = prevContent($content);+ if (!$content) {+ return "close";+ } else {+ $end = $content;+ endOffset = $content.text().length;+ }+ }++ // check if there is anything selected+ if ($start.is($end) && startOffset >= endOffset+ || !hasOldOrNewData($start) || !hasOldOrNewData($end)) {+ return "close";+ }++ firstRange.collapse(true);+ var startRect = firstRange.getClientRects()[0];+ lastRange.collapse(false);+ var endRect = lastRange.getClientRects()[0];+ if (!startRect || !endRect) {+ startRect = selection.getRangeAt(0).getClientRects()[0];+ endRect = startRect;+ }+ var position = {+ left: (startRect.left + endRect.right)/2,+ top: startRect.top+ };+ position.left += $(window).scrollLeft();+ position.top += $(window).scrollTop();++ function showInvalidSelection() {+ var $content = $("<div></div>");+ $content.append("<a class='invalid'><i class='fa fa-warning'></i> Invalid selection, click for details</a>");+ $content.children("a").attr("href", doclink + "/Diff+Selection");+ return {+ position: position,+ content: $content+ }+ }++ // all lines between selection has been expanded+ if ($startTr.nextAll("tr.expander").filter($endTr.prevAll("tr.expander")).length != 0+ || $startTr.prevAll("tr.expander").filter($endTr.nextAll("tr.expander")).length != 0) {+ return showInvalidSelection();+ }++ /*+ * cursor.line represents line number of selection and cursor.ch represents+ * character index inside text of the whole line, without considering element+ * tags.+ */+ function getCursor($node, offset) {+ $nodeTd = $node.parent();+ var oldLine, newLine;+ if (!$nodeTd.hasClass("old") && !$nodeTd.hasClass("new")+ || $nodeTd.hasClass("old") && $nodeTd.hasClass("new")) {+ oldLine = $nodeTd.data("old") + 1;+ newLine = $nodeTd.data("new") + 1;+ } else if ($nodeTd.hasClass("old")) {+ oldLine = $nodeTd.data("old") + 1;+ } else {+ newLine = $nodeTd.data("new") + 1;+ }+ var $contents = $nodeTd.contents();+ var oldOffset = 0, newOffset = 0;+ for (var i=0; i<$contents.length; i++) {+ var $content = $($contents[i]);+ if ($content.is($node)) {+ if ($content.hasClass("delete")) {+ oldCh = oldOffset + offset;+ newCh = undefined;+ newLine = undefined;+ } else if ($content.hasClass("insert")) {+ oldCh = undefined;+ oldLine = undefined;+ newCh = newOffset + offset;+ } else {+ oldCh = oldOffset + offset;+ newCh = newOffset + offset;+ }+ break;+ } else {+ var len = $content.text().length;+ if ($content.hasClass("delete")) {+ oldOffset += len;+ } else if ($content.hasClass("insert")) {+ newOffset += len;+ } else {+ oldOffset += len;+ newOffset += len;+ }+ }+ }+ if ($nodeTd.hasClass("left")) {+ newLine = newCh = undefined;+ } else if ($nodeTd.hasClass("right")) {+ oldLine = oldCh = undefined;+ }+ return {+ oldLine: oldLine,+ oldCh: oldCh,+ newLine: newLine,+ newCh: newCh+ };+ }++ var startCursor = getCursor($start, startOffset);+ var endCursor = getCursor($end, endOffset);++ if (startCursor.newLine && endCursor.newLine) {+ callback("openSelectionPopover", Math.round(position.left), Math.round(position.top), false,+ startCursor.newLine-1, startCursor.newCh, endCursor.newLine-1, endCursor.newCh);+ } else if (startCursor.oldLine && endCursor.oldLine) {+ callback("openSelectionPopover", Math.round(position.left), Math.round(position.top), true,+ startCursor.oldLine-1, startCursor.oldCh, endCursor.oldLine-1, endCursor.oldCh);+ } else {+ return showInvalidSelection();+ }+ });++ if (openComment) {+ $container.data("openComment", openComment);+ }+ for (var line in oldComments) {+ if (oldComments.hasOwnProperty(line)) {+ gitplex.server.textdiff.addCommentIndicator($container, true, line, oldComments[line][1]);+ }+ }+ for (var line in newComments) {+ if (newComments.hasOwnProperty(line)) {+ gitplex.server.textdiff.addCommentIndicator($container, false, line, newComments[line][1]);+ }+ }++ gitplex.server.textdiff.highlightCommentTrigger($container);++ if (mark) {+ $container.data("mark", mark);+ gitplex.server.textdiff.mark($container, mark);+ if (scroll && !gitplex.commons.history.isVisited())+ gitplex.server.textdiff.scroll($container, mark);+ }+ }++ },+ initBlameTooltip: function(containerId, $hashLink) {+ var $container = $("#" + containerId);+ var alignment = {targetX: 100, targetY: 100, x: 0, y: 0};+ $hashLink.hover(function() {+ var $commitLink = $(this);+ var $content = $commitLink.closest("tr").children("td.content");+ var oldLine = $content.data("old");+ if (oldLine == undefined)+ oldLine = -1;+ var newLine = $content.data("new");+ if (newLine == undefined)+ newLine = -1;++ var tooltipId = "blame-message-" + containerId + "_" + oldLine + "_" + newLine;+ $container.data("blameMessageCallback")(tooltipId, $(this).data("hash"));+ var $tooltip = $("<div class='blame-message'><div class='loading'>Loading...</div></div>");+ $tooltip.attr("id", tooltipId);+ $tooltip.data("trigger", this);+ $tooltip.data("alignment", alignment);+ $container.append($tooltip);+ return $tooltip;+ }, alignment);+ },+ openSelectionPopover: function(containerId, position, mark, markUrl, loggedIn) {+ var $container = $("#" + containerId);++ var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");+ $content.children("a.permanent").attr("href", markUrl);+ if (loggedIn) {+ $content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");+ $content.children("a.comment").click(function() {+ if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ $container.data("callback")("addComment", mark.leftSide,+ mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);+ });+ } else {+ $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");+ }++ $container.selectionPopover("open", {+ position: position,+ content: $content+ });+ },+ expand: function(containerId, blockIndex, expandedHtml) {+ var $container = $("#" + containerId);+ var $expanderTr = $container.find(".expander" + blockIndex);+ var $prevTr = $expanderTr.prev();+ var $nextTr = $expanderTr.next();+ $expanderTr.replaceWith(expandedHtml);+ var $expandedTrs;+ if ($prevTr.length != 0 && $nextTr.length != 0) {+ $expandedTrs = $prevTr.nextAll().filter($nextTr.prevAll());+ } else if ($prevTr.length != 0) {+ $expandedTrs = $prevTr.nextAll();+ } else {+ $expandedTrs = $nextTr.prevAll();+ }+ var $symbols = $expandedTrs.find(gitplex.server.textdiff.symbolClasses);+ $symbols.mouseover($container.data("symbolHover"));+ $expandedTrs.find("td.content").mouseover($container.data("onMouseOverContent"));+ var $firstExpandedTr = $expandedTrs.first();++ function processBlames(index) {+ var commitHash = $firstExpandedTr.children("td.blame").eq(index).children("a.hash").data("hash");+ var prevCommitHash;+ $firstExpandedTr.prevAll().each(function() {+ if (!prevCommitHash) {+ var $tr = $(this);+ var $prevCommitLink = $tr.children("td.blame").eq(index).children("a.hash");+ if ($prevCommitLink.length != 0) {+ prevCommitHash = $prevCommitLink.data("hash");+ }+ }+ });+ if (commitHash == prevCommitHash) {+ $firstExpandedTr.children("td.blame").eq(index).html("<div class='same-as-above'>...</div>");+ }++ if ($nextTr.length != 0) {+ commitHash = $nextTr.children("td.blame").eq(index).children("a.hash").data("hash");+ prevCommitHash = undefined;+ $nextTr.prevAll().each(function() {+ if (!prevCommitHash) {+ var $prevCommitLink = $(this).children("td.blame").eq(index).children("a.hash");+ if ($prevCommitLink.length != 0) {+ prevCommitHash = $prevCommitLink.data("hash");+ }+ }+ });+ if (commitHash == prevCommitHash) {+ $nextTr.children("td.blame").eq(index).html("<div class='same-as-above'>...</div>");+ }+ }+ }+ if ($firstExpandedTr.children("td.blame").length == 1) {+ processBlames(0);+ } else if ($firstExpandedTr.children("td.blame").length == 2) {+ processBlames(0);+ processBlames(1);+ }++ gitplex.server.textdiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash"));++ $(window).resize();+ },+ getMarkInfo: function($container, mark) {+ var oldOrNew = mark.leftSide?"old":"new";+ var startCursor = [mark.beginLine+1, mark.beginChar];+ var endCursor = [mark.endLine+1, mark.endChar];+ var $startTd = $container.find("td.content[data-" + oldOrNew + "='" + (startCursor[0]-1) + "']");+ var $endTd = $container.find("td.content[data-" + oldOrNew + "='" + (endCursor[0]-1) + "']");+ if ($startTd.length == 0) {+ console.error("Unable to find start td!");+ $startTd = undefined;+ } else if ($startTd.length == 2) {+ if (oldOrNew == "old") {+ $startTd = $startTd.first();+ } else {+ $startTd = $startTd.last();+ }+ }+ if ($endTd.length == 0) {+ console.error("Unable to find end td!");+ $endTd = undefined;+ } else if ($endTd.length == 2) {+ if (oldOrNew == "old") {+ $endTd = $endTd.first();+ } else {+ $endTd = $endTd.last();+ }+ }+ return {+ startTd: $startTd,+ startCursor: startCursor,+ endTd: $endTd,+ endCursor: endCursor,+ oldOrNew: oldOrNew+ };+ },+ scroll: function($container, mark) {+ // use a timer to scroll after possible view port resize+ setTimeout(function() {+ var markInfo = gitplex.server.textdiff.getMarkInfo($container, mark);+ var $startTd = markInfo.startTd;+ var $endTd = markInfo.endTd;+ if ($startTd && $endTd) {+ var top = $startTd.offset().top;+ var bottom = $endTd.offset().top + $endTd.outerHeight();+ var markHeight = bottom - top;+ var windowHeight = $(window).height();+ if (windowHeight <= markHeight) {+ $(window).scrollTop(top-50);+ } else {+ $(window).scrollTop((top+bottom-windowHeight)/2);+ }+ }+ }, 0);+ },+ mark: function($container, mark) {+ gitplex.server.textdiff.clearMark($container);++ var markInfo = gitplex.server.textdiff.getMarkInfo($container, mark);+ var $startTd = markInfo.startTd;+ var $endTd = markInfo.endTd;+ if ($startTd && $endTd) {+ var startCursor = markInfo.startCursor;+ var endCursor = markInfo.endCursor;+ var oldOrNew = markInfo.oldOrNew;+ var $td = $startTd;+ while (true) {+ var ch = 0;+ $td.addClass("content-mark");+ $td.data("beforemark", $td.html());+ $td.contents().each(function() {+ var $this = $(this);+ var text = $this.text();+ function markText(from, to) {+ var text = $this.text();+ var left = text.substring(0, from);+ var middle = text.substring(from, to);+ var right = text.substring(to);++ if (left.length == 0 && right.length == 0 && $this.is("span")) {+ $this.addClass("content-mark");+ } else {+ var classes;+ if ($this.is("span"))+ classes = $this.attr("class");+ else+ classes = "";++ var $current = $this;+ if (left.length != 0) {+ $current.after("<span></span>");+ $current = $current.next();+ $current.attr("class", classes).text(left);+ }++ $current.after("<span></span>");+ $current = $current.next();+ $current.attr("class", classes + " content-mark").text(middle);++ if (right.length != 0) {+ $current.after("<span></span>");+ $current = $current.next();+ $current.attr("class", classes).text(right);+ }+ $this.remove();+ }+ }+ if ($this.hasClass("insert") && oldOrNew == "old"+ || $this.hasClass("delete") && oldOrNew == "new") {+ if (!$td.is($startTd) && !$td.is($endTd)) {+ markText(0, text.length);+ } else if ($td.is($startTd) && $td.is($endTd)) {+ if (endCursor[1]>ch && startCursor[1]<ch) {+ markText(0, text.length);+ }+ } else if ($td.is($startTd)) {+ if (startCursor[1]<ch) {+ markText(0, text.length);+ }+ } else {+ if (endCursor[1]>ch) {+ markText(0, text.length);+ }+ }+ } else {+ var nextCh = ch + text.length;+ if (!$td.is($startTd) && !$td.is($endTd)) {+ markText(0, text.length);+ } else if ($td.is($startTd) && $td.is($endTd)) {+ if (endCursor[1]>ch && startCursor[1]<nextCh) {+ if (ch>=startCursor[1] && nextCh<=endCursor[1]) {+ markText(0, text.length);+ } else if (ch<startCursor[1] && nextCh>endCursor[1]) {+ markText(startCursor[1]-ch, endCursor[1]-ch);+ } else if (ch<startCursor[1]) {+ markText(startCursor[1]-ch, text.length);+ } else {+ markText(0, endCursor[1]-ch);+ }+ }+ } else if ($td.is($startTd)) {+ if (ch>=startCursor[1]) {+ markText(0, text.length);+ } else if (nextCh>startCursor[1]) {+ markText(startCursor[1]-ch, text.length);+ }+ } else {+ if (nextCh<=endCursor[1]) {+ markText(0, text.length);+ } else if (ch<endCursor[1]) {+ markText(0, endCursor[1]-ch);+ }+ }+ ch = nextCh;+ }+ });+ if ($td.is($endTd) || $td.length == 0) {+ break;+ } else {+ if ($startTd.hasClass("left")) {+ $td = $td.parent().next().children("td.left");+ } else if ($startTd.hasClass("right")) {+ $td = $td.parent().next().children("td.right");+ } else {+ $td = $td.parent().next().children("td.content");+ }+ }+ }+ }+ },+ clearMark: function($container) {+ $container.find("td.content.content-mark").each(function() {+ var $this = $(this);+ $this.html($this.data("beforemark"));+ $this.removeClass("content-mark");+ $this.removeData("beforemark");+ $container = $this.closest(".text-diff").parent();+ $this.find(gitplex.server.textdiff.symbolClasses).mouseover($container.data("symbolHover"));+ });+ },+ restoreMark: function($container) {+ var mark = $container.data("mark");+ if (mark) {+ gitplex.server.textdiff.mark($container, mark);+ } else {+ gitplex.server.textdiff.clearMark($container);+ }+ },+ addCommentIndicator: function($container, leftSide, line, comments) {+ var oldOrNew = leftSide?"old":"new";+ $container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "']").remove();+ var $lineNumTd = gitplex.server.textdiff.getLineNumTd($container, leftSide, line);++ var callback = $container.data("callback");++ var $indicator = $(document.createElement("a"));+ $indicator.addClass("comment-indicator");+ $indicator.data("comments", comments);+ if (comments.length != 1) {+ /*+ * when there are multiple comments starts with the same line, we should+ * display a comment indicator which will display a comment popover with+ * list of comment triggers upon click, user can then click one of the+ * trigger link to display the actual comment content+ */+ var oldOrNew = leftSide?"old":"new";+ $indicator.append("<i class='fa fa-comments'></i>");+ var content = "";+ for (var i in comments) {+ var comment = comments[i];+ var index = parseInt(i) + 1;+ content += "<a class='comment-trigger' title='Click to show comment of marked text'>#" + comment.id + "</a>";+ }+ $indicator.popover({+ html: true,+ container: $lineNumTd,+ placement: "right auto",+ template: "<div class='" + oldOrNew + " popover comment-popover' data-line='" + line + "'><div class='arrow'></div><div class='popover-content'></div></div>",+ content: content+ });+ $indicator.on('shown.bs.popover', function () {+ $("." + oldOrNew + ".comment-popover[data-line='" + line + "'] a").each(function() {+ $(this).mouseover(function() {+ var comment = comments[$(this).index()];+ gitplex.server.textdiff.mark($container, comment.mark);+ });+ $(this).mouseout(function() {+ gitplex.server.textdiff.restoreMark($container);+ });+ $(this).click(function() {+ if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ var comment = comments[$(this).index()];+ callback("openComment", comment.id);+ });+ });+ gitplex.server.textdiff.highlightCommentTrigger($container);+ });+ } else {+ var comment = comments[0];+ $indicator.addClass("comment-trigger").attr("title", "Click to show comment of marked text");+ $indicator.append("<i class='fa fa-commenting'></i>");+ $indicator.mouseover(function() {+ gitplex.server.textdiff.mark($container, comment.mark);+ });+ $indicator.mouseout(function() {+ gitplex.server.textdiff.restoreMark($container);+ });+ $indicator.click(function() {+ if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0+ && !confirm("There are unsaved changes, discard and continue?")) {+ return;+ }+ callback("openComment", comment.id);+ });+ }+ $lineNumTd.children(".comment-indicator").remove();+ $lineNumTd.prepend($indicator);+ },+ getLineNumTd: function($container, leftSide, line) {+ if (leftSide) {+ var $contentTd = $container.find("td.left.content[data-old='" + line + "']");+ if ($contentTd.length == 0)+ $contentTd = $container.find("td.content[data-old='" + line + "']");+ return $contentTd.prevAll("td.number").last();+ } else {+ var $contentTd = $container.find("td.right.content[data-new='" + line + "']");+ if ($contentTd.length == 0)+ $contentTd = $container.find("td.content[data-new='" + line + "']");+ return $contentTd.prevAll("td.number").first();+ }+ },+ highlightCommentTrigger: function($container) {+ $container.find(".comment-trigger").removeClass("active");+ var openComment = $container.data("openComment");+ if (openComment) {+ var line = parseInt(openComment.mark.beginLine);+ var $indicator = gitplex.server.textdiff.getLineNumTd($container, openComment.mark.leftSide, line).children(".comment-indicator");+ if ($indicator.length != 0) {+ var comments = $indicator.data("comments");+ if (comments.length == 1) {+ $indicator.addClass("active");+ } else {+ var oldOrNew = openComment.mark.leftSide?"old":"new";+ $container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "'] a").each(function() {+ var comment = comments[$(this).index()];+ if (comment.id == openComment.id) {+ $(this).addClass("active");+ }+ });+ }+ }+ }+ },+ onCommentAdded: function($container, comment) {+ $container.data("openComment", comment);+ $container.data("mark", comment.mark);++ var line = parseInt(comment.mark.beginLine);+ var leftSide = comment.mark.leftSide;++ var $indicator = gitplex.server.textdiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");+ var comments;+ if ($indicator.length != 0) {+ comments = $indicator.data("comments");+ } else {+ comments = [];+ }+ comments.push(comment);+ gitplex.server.textdiff.addCommentIndicator($container, leftSide, line, comments);+ gitplex.server.textdiff.highlightCommentTrigger($container);+ },+ onCommentDeleted: function($container, comment) {+ $container.removeData("openComment");++ var line = parseInt(comment.mark.beginLine);+ var leftSide = comment.mark.leftSide;+ var $indicator = gitplex.server.textdiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");+ var comments = $indicator.data("comments");+ if (comments.length == 1) {+ $indicator.remove();+ } else {+ for (var i in comments) {+ var each = comments[i];+ if (each.id == comment.id) {+ comments.splice(i, 1);+ break;+ }+ }+ gitplex.server.textdiff.addCommentIndicator($container, leftSide, line, comments);+ }+ gitplex.server.textdiff.highlightCommentTrigger($container);+ },+ onOpenComment: function($container, comment) {+ $container.data("openComment", comment);+ $container.data("mark", comment.mark);+ gitplex.server.textdiff.highlightCommentTrigger($container);+ gitplex.server.textdiff.mark($container, comment.mark);+ gitplex.server.textdiff.scroll($container, comment.mark);+ },+ onCloseComment: function($container) {+ $container.removeData("openComment");+ gitplex.server.textdiff.highlightCommentTrigger($container);+ },+ onAddComment: function($container, mark) {+ $container.removeData("openComment");+ $container.data("mark", mark);++ $container.selectionPopover("close");+ window.getSelection().removeAllRanges();++ // continue to operate DOM in a timer to give browser a chance to+ // clear selections+ setTimeout(function() {+ gitplex.server.textdiff.highlightCommentTrigger($container);+ gitplex.server.textdiff.mark($container, mark);+ gitplex.server.textdiff.scroll($container, mark);+ }, 100);+ }+};diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.javasimilarity index 98%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.javaindex f6bfea9981..f41e63e8a3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.diffstat;+package com.gitplex.server.web.component.diff.diffstat;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBarResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBarResourceReference.javaindex 5747d4feea..e139e7d55e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBarResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.diffstat;+package com.gitplex.server.web.component.diff.diffstat;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/diff-stat-bar.css b/server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/diff-stat-bar.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/diff-stat-bar.cssrename to server.web/src/main/java/com/gitplex/server/web/component/diff/diffstat/diff-stat-bar.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.javaindex 48b0f99b6c..2d114affae 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.difftitle;+package com.gitplex.server.web.component.diff.difftitle;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/DiffTitleResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/DiffTitleResourceReference.javaindex 6a15b1d623..8417763a64 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/DiffTitleResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.difftitle;+package com.gitplex.server.web.component.diff.difftitle;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/diff-title.css b/server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/diff-title.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/diff-title.cssrename to server.web/src/main/java/com/gitplex/server/web/component/diff/difftitle/diff-title.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.javaindex 990036ba4d..dfd6263365 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.revision;+package com.gitplex.server.web.component.diff.revision;import java.io.Serializable;import java.util.Collection;@@ -8,8 +8,8 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.support.CommentPos;public interface BlobCommentSupport extends Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.javaindex 604240e3cc..ba83a02991 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.revision;+package com.gitplex.server.web.component.diff.revision;import java.io.Serializable;@@ -6,8 +6,8 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.support.CommentPos;public interface CommentSupport extends Serializable {diff --git a/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/DiffViewMode.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/DiffViewMode.javanew file mode 100644index 0000000000..3d51de231b--- /dev/null+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/DiffViewMode.java@@ -0,0 +1,5 @@+package com.gitplex.server.web.component.diff.revision;++public enum DiffViewMode {+ UNIFIED, SPLIT+}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.javaindex be6f108109..27cd14e935 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.revision;+package com.gitplex.server.web.component.diff.revision;import java.nio.file.Paths;import java.util.ArrayList;@@ -53,23 +53,6 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.comment.CodeCommentPanel;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.comment.comparecontext.CompareContextPanel;-import com.gitplex.web.component.diff.blob.BlobDiffPanel;-import com.gitplex.web.component.diff.blob.SourceAware;-import com.gitplex.web.component.diff.diffstat.DiffStatBar;-import com.gitplex.web.util.SuggestionUtils;import com.google.common.base.Objects;import com.google.common.collect.Lists;import com.gitplex.commons.antlr.codeassist.InputCompletion;@@ -88,6 +71,23 @@ import com.gitplex.commons.wicket.behavior.inputassist.InputAssistBehavior;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.menu.MenuItem;import com.gitplex.commons.wicket.component.menu.MenuLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+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.comparecontext.CompareContextPanel;+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;+import com.gitplex.server.web.util.SuggestionUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -100,7 +100,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel@SuppressWarnings("serial")public class RevisionDiffPanel extends Panel {- private static final String COOKIE_VIEW_MODE = "gitplex.diff.viewmode";+ private static final String COOKIE_VIEW_MODE = "gitplex.server.diff.viewmode";private static final String BODY_ID = "body";@@ -399,7 +399,7 @@ public class RevisionDiffPanel extends Panel {SourceAware sourceAware = getSourceAware(prevBlameFile);sourceAware.onUnblame(target);}- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}};@@ -425,7 +425,7 @@ public class RevisionDiffPanel extends Panel {super.renderHead(response);String anchor = getAnchor();- String script = String.format("gitplex.revisionDiff.init(%s);", anchor!=null?"'"+anchor+"'":"undefined");+ String script = String.format("gitplex.server.revisionDiff.init(%s);", anchor!=null?"'"+anchor+"'":"undefined");response.render(OnDomReadyHeaderItem.forScript(script));}@@ -784,7 +784,7 @@ public class RevisionDiffPanel extends Panel {commentSupport.onMark(target, null);}- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}});@@ -843,7 +843,7 @@ public class RevisionDiffPanel extends Panel {sourceAware.onCommentAdded(target, comment);commentSupport.onCommentOpened(target, comment);- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}});@@ -867,7 +867,7 @@ public class RevisionDiffPanel extends Panel {sourceAware.onCommentClosed(target, prevComment);}commentSupport.onAddComment(target, commentPos);- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}@Override@@ -946,7 +946,7 @@ public class RevisionDiffPanel extends Panel {}commentSupport.onCommentOpened(target, comment);- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}private @Nullable IModel<Boolean> getBlobBlameModel(BlobChange change) {@@ -982,7 +982,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.revisionDiff.initComment();"));+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.revisionDiff.initComment();"));}};@@ -1099,7 +1099,7 @@ public class RevisionDiffPanel extends Panel {sourceAware.onCommentClosed(target, comment);commentSupport.onCommentOpened(target, null);}- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");}});@@ -1137,7 +1137,7 @@ public class RevisionDiffPanel extends Panel {public void onClick(AjaxRequestTarget target) {if (SecurityUtils.getAccount() != null) {((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);- target.appendJavaScript("gitplex.revisionDiff.scrollToCommentBottom();");+ target.appendJavaScript("gitplex.server.revisionDiff.scrollToCommentBottom();");} else {Session.get().warn("Please login to resolve/unresolve comment");}@@ -1262,7 +1262,7 @@ public class RevisionDiffPanel extends Panel {if (sourceAware != null)sourceAware.onCommentDeleted(target, comment);commentSupport.onCommentOpened(target, null);- target.appendJavaScript("gitplex.revisionDiff.reposition();");+ target.appendJavaScript("gitplex.server.revisionDiff.reposition();");CommentPos mark = getMark();if (mark != null) {sourceAware = getSourceAware(mark.getPath());diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.javaindex c3d5942f08..fc8c874fab 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.diff.revision;+package com.gitplex.server.web.component.diff.revision;import java.util.List;@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class RevisionDiffResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.css b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.cssrename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.js b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.jssimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.jsrename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.jsindex 74e8600887..ee37085bb2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js@@ -1,4 +1,4 @@-gitplex.revisionDiff = {+gitplex.server.revisionDiff = {init: function(anchor) {var cookieName = "revisionDiff.showDiffStats";var $body = $(".revision-diff>.body");@@ -14,9 +14,9 @@ gitplex.revisionDiff = {$diffStatsToggle.addClass("expanded");Cookies.set(cookieName, "yes", {expires: Infinity});}- gitplex.revisionDiff.reposition();+ gitplex.server.revisionDiff.reposition();});- gitplex.revisionDiff.reposition();+ gitplex.server.revisionDiff.reposition();if (anchor) {var $anchor = $("#"+anchor);if ($anchor.length != 0) {@@ -112,5 +112,5 @@ gitplex.revisionDiff = {}};$(function() {- $(window).on("scroll resize", gitplex.revisionDiff.reposition);+ $(window).on("scroll resize", gitplex.server.revisionDiff.reposition);});diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/vgrabber.png b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/vgrabber.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/vgrabber.pngrename to server.web/src/main/java/com/gitplex/server/web/component/diff/revision/vgrabber.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java b/server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.javaindex 3569bf8f82..f76d99071a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.fullbranchmatch;+package com.gitplex.server.web.component.fullbranchmatch;import java.util.ArrayList;import java.util.List;@@ -6,17 +6,17 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.util.SuggestionUtils;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.antlr.codeassist.ParentedElement;import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;import com.gitplex.commons.antlr.parser.Element;import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class FullBranchMatchBehavior extends ANTLRAssistBehavior {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java b/server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.javarename to server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.javaindex 57bf7a03ac..19b23ab72e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.fullbranchmatch;+package com.gitplex.server.web.component.fullbranchmatch;import java.io.Serializable;@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;@SuppressWarnings("serial")public class FullBranchMatchInput extends TextField<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.javaindex f0539bec4c..1bce4cf2eb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java@@ -1,132 +1,132 @@-package com.gitplex.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.BookmarkablePageLink;-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.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.web.page.account.members.MemberPrivilegeSourcePage;-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 BookmarkablePageLink<Void>("avatarLink",- MemberEffectivePrivilegePage.class, params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);- link = new BookmarkablePageLink<Void>("nameLink",- MemberEffectivePrivilegePage.class, params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = MemberPrivilegeSourcePage.paramsOf(- membership, getAuthorization().getDepot());- link = new BookmarkablePageLink<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;- }-- }--}+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.BookmarkablePageLink;+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.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;+import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;+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 BookmarkablePageLink<Void>("avatarLink",+ MemberEffectivePrivilegePage.class, params);+ link.add(new Avatar("avatar", permission.getUser()));+ item.add(link);+ link = new BookmarkablePageLink<Void>("nameLink",+ MemberEffectivePrivilegePage.class, params);+ link.add(new Label("name", permission.getUser().getDisplayName()));+ item.add(link);++ params = MemberPrivilegeSourcePage.paramsOf(+ membership, getAuthorization().getDepot());+ link = new BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.javaindex 10875397c7..cfa66e5979 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.greaterprivilege;+package com.gitplex.server.web.component.greaterprivilege;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/greater-privileges.css b/server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/greater-privileges.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/greater-privileges.cssrename to server.web/src/main/java/com/gitplex/server/web/component/greaterprivilege/greater-privileges.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.java b/server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.javaindex 6b659c61c3..11d2b78944 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pathmatch;+package com.gitplex.server.web.component.pathmatch;import java.util.ArrayList;import java.util.List;@@ -6,8 +6,6 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.util.SuggestionUtils;import com.gitplex.commons.antlr.codeassist.FenceAware;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.antlr.codeassist.ParentedElement;@@ -15,6 +13,8 @@ import com.gitplex.commons.antlr.grammar.ElementSpec;import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.core.util.includeexclude.IncludeExcludeParser;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class PathMatchBehavior extends ANTLRAssistBehavior {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.java b/server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.javarename to server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.javaindex c7862a4c74..cee21f7d19 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pathmatch;+package com.gitplex.server.web.component.pathmatch;import java.io.Serializable;@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")public class PathMatchInput extends TextField<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.html b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.java b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.javarename to server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.javaindex d96bb64687..ac678f38b5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pathselector;+package com.gitplex.server.web.component.pathselector;import java.io.IOException;import java.util.ArrayList;@@ -28,11 +28,11 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.BlobIcon;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.BlobIcon;@SuppressWarnings("serial")public abstract class PathSelector extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelectorResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelectorResourceReference.javaindex d44b84233d..eb9aa0d9f2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelectorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pathselector;+package com.gitplex.server.web.component.pathselector;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/path-selector.css b/server.web/src/main/java/com/gitplex/server/web/component/pathselector/path-selector.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pathselector/path-selector.cssrename to server.web/src/main/java/com/gitplex/server/web/component/pathselector/path-selector.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.javaindex bf635d09f0..8e739f96bc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.privilegeselection;+package com.gitplex.server.web.component.privilegeselection;import javax.annotation.Nullable;@@ -7,7 +7,7 @@ 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.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;@SuppressWarnings("serial")public abstract class PrivilegeSelectionPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.html b/server.web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java b/server.web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.javaindex 0dd4d6aba9..50f0a78258 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.privilegesource;+package com.gitplex.server.web.component.privilegesource;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.depotaccess.PrivilegeSource;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.depotaccess.PrivilegeSource;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class PrivilegeSourcePanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.javaindex 55b8d22b3b..f8a06cc13d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java@@ -1,10 +1,10 @@-package com.gitplex.web.component.pullrequest.requestassignee;+package com.gitplex.server.web.component.pullrequest.requestassignee;import java.io.Serializable;import javax.annotation.Nullable;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;@SuppressWarnings("serial")public class Assignee implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.javaindex fb9a330b58..1ca0c807f6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java@@ -1,13 +1,13 @@-package com.gitplex.web.component.pullrequest.requestassignee;+package com.gitplex.server.web.component.pullrequest.requestassignee;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.commons.wicket.component.select2.Select2Choice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;@SuppressWarnings("serial")public class AssigneeChoice extends Select2Choice<Assignee> {@@ -45,9 +45,9 @@ public class AssigneeChoice extends Select2Choice<Assignee> {// getSettings().setMinimumInputLength(1);getSettings().setPlaceholder("Type to find an assignee");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.javaindex e9f24e9143..7c0afd149c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.requestassignee;+package com.gitplex.server.web.component.pullrequest.requestassignee;import java.util.ArrayList;import java.util.Collection;@@ -10,19 +10,19 @@ import org.apache.wicket.model.IModel;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.ObjectPermission;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.avatar.AvatarManager;import com.google.common.collect.Lists;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.ObjectPermission;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.avatar.AvatarManager;public class AssigneeProvider extends ChoiceProvider<Assignee> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.javaindex 9b8e2314e9..5151e98f47 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java@@ -1,88 +1,88 @@-package com.gitplex.web.component.pullrequest.requestreviewer;--import java.util.Date;-import java.util.HashSet;-import java.util.Set;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.model.IModel;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.manager.PullRequestReviewInvitationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.avatar.RemoveableAvatar;-import com.gitplex.web.model.EntityModel;-import com.gitplex.web.model.UserModel;--@SuppressWarnings("serial")-public class ReviewerAvatar extends RemoveableAvatar {-- private final PullRequestReviewInvitation invitation;-- private final IModel<PullRequest> requestModel;-- public ReviewerAvatar(String id, PullRequestReviewInvitation invitation) {- super(id, new UserModel(invitation.getUser()));-- this.invitation = invitation;- requestModel = new EntityModel<PullRequest>(invitation.getRequest());- }-- @Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = requestModel.getObject();- setEnabled(request.isOpen() && SecurityUtils.canModify(request));- }-- @Override- public void onClick(AjaxRequestTarget target) {- Date now = new Date();- PullRequest request = requestModel.getObject();- Set<Account> prevInvited = new HashSet<>();- for (PullRequestReviewInvitation each: request.getReviewInvitations()) {- if (each.getStatus() != PullRequestReviewInvitation.Status.EXCLUDED)- prevInvited.add(each.getUser());- if (each.getUser().equals(invitation.getUser())) {- each.setStatus(PullRequestReviewInvitation.Status.EXCLUDED);- each.setDate(new Date());- }- }- request.checkGates(true);-- Set<Account> nowInvited = new HashSet<>();- for (PullRequestReviewInvitation each: request.getReviewInvitations()) {- if (each.getStatus() != PullRequestReviewInvitation.Status.EXCLUDED)- nowInvited.add(each.getUser());- }-- if (nowInvited.contains(invitation.getUser())) {- getSession().warn("Reviewer '" + invitation.getUser().getDisplayName()- + "' is required by gatekeeper and can not be removed");- } else {- nowInvited.removeAll(prevInvited);- if (!nowInvited.isEmpty()) {- getSession().warn("Reviewer '" + invitation.getUser().getDisplayName()- + "' is removed and user '" + nowInvited.iterator().next().getDisplayName()- + "' is added as reviewer automatically to satisfy gatekeeper requirement.");- }- }- if (!request.isNew()) {- PullRequestReviewInvitationManager reviewInvitationManager =- GitPlex.getInstance(PullRequestReviewInvitationManager.class);- reviewInvitationManager.update(request.getReviewInvitations(), now);- }- }-- @Override- protected void onDetach() {- requestModel.detach();-- super.onDetach();- }--}+package com.gitplex.server.web.component.pullrequest.requestreviewer;++import java.util.Date;+import java.util.HashSet;+import java.util.Set;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.IModel;++import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.RemoveableAvatar;+import com.gitplex.server.web.model.EntityModel;+import com.gitplex.server.web.model.UserModel;++@SuppressWarnings("serial")+public class ReviewerAvatar extends RemoveableAvatar {++ private final PullRequestReviewInvitation invitation;++ private final IModel<PullRequest> requestModel;++ public ReviewerAvatar(String id, PullRequestReviewInvitation invitation) {+ super(id, new UserModel(invitation.getUser()));++ this.invitation = invitation;+ requestModel = new EntityModel<PullRequest>(invitation.getRequest());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = requestModel.getObject();+ setEnabled(request.isOpen() && SecurityUtils.canModify(request));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ Date now = new Date();+ PullRequest request = requestModel.getObject();+ Set<Account> prevInvited = new HashSet<>();+ for (PullRequestReviewInvitation each: request.getReviewInvitations()) {+ if (each.getStatus() != PullRequestReviewInvitation.Status.EXCLUDED)+ prevInvited.add(each.getUser());+ if (each.getUser().equals(invitation.getUser())) {+ each.setStatus(PullRequestReviewInvitation.Status.EXCLUDED);+ each.setDate(new Date());+ }+ }+ request.checkGates(true);++ Set<Account> nowInvited = new HashSet<>();+ for (PullRequestReviewInvitation each: request.getReviewInvitations()) {+ if (each.getStatus() != PullRequestReviewInvitation.Status.EXCLUDED)+ nowInvited.add(each.getUser());+ }++ if (nowInvited.contains(invitation.getUser())) {+ getSession().warn("Reviewer '" + invitation.getUser().getDisplayName()+ + "' is required by gatekeeper and can not be removed");+ } else {+ nowInvited.removeAll(prevInvited);+ if (!nowInvited.isEmpty()) {+ getSession().warn("Reviewer '" + invitation.getUser().getDisplayName()+ + "' is removed and user '" + nowInvited.iterator().next().getDisplayName()+ + "' is added as reviewer automatically to satisfy gatekeeper requirement.");+ }+ }+ if (!request.isNew()) {+ PullRequestReviewInvitationManager reviewInvitationManager =+ GitPlex.getInstance(PullRequestReviewInvitationManager.class);+ reviewInvitationManager.update(request.getReviewInvitations(), now);+ }+ }++ @Override+ protected void onDetach() {+ requestModel.detach();++ super.onDetach();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.javasimilarity index 73%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.javaindex c4dfeb70a6..3d3d9e8a30 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.requestreviewer;+package com.gitplex.server.web.component.pullrequest.requestreviewer;import java.util.Date;@@ -7,14 +7,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.manager.PullRequestReviewInvitationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;@SuppressWarnings("serial")public abstract class ReviewerChoice extends SelectToAddChoice<Account> {@@ -42,9 +42,9 @@ public abstract class ReviewerChoice extends SelectToAddChoice<Account> {super.onInitialize();getSettings().setPlaceholder("Select user to add as reviewer...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.javaindex 39aceaa8ed..743ba96942 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java@@ -1,15 +1,15 @@-package com.gitplex.web.component.pullrequest.requestreviewer;+package com.gitplex.server.web.component.pullrequest.requestreviewer;import java.util.Iterator;import java.util.List;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.web.Constants;-import com.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;public class ReviewerProvider extends AbstractAccountChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.javaindex a8419efea9..a3a2aee2fb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.requeststatus;+package com.gitplex.server.web.component.pullrequest.requeststatus;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequest.Status;-import com.gitplex.core.entity.support.CloseInfo;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest.Status;+import com.gitplex.server.core.entity.support.CloseInfo;@SuppressWarnings("serial")public class RequestStatusPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.javaindex 0be0dda8ae..529fe2c988 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.reviewresult;+package com.gitplex.server.web.component.pullrequest.reviewresult;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebComponent;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.PullRequestReview;import com.gitplex.commons.wicket.behavior.dropdown.DropdownHover;import com.gitplex.commons.wicket.component.floating.AlignPlacement;+import com.gitplex.server.core.entity.PullRequestReview;@SuppressWarnings("serial")public class ReviewResultIcon extends WebComponent {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultResourceReference.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultResourceReference.javaindex 2dd1a1e302..820017f567 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.reviewresult;+package com.gitplex.server.web.component.pullrequest.reviewresult;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.html b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.javaindex 553d9051a1..4745ce69af 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java@@ -1,15 +1,15 @@-package com.gitplex.web.component.pullrequest.reviewresult;+package com.gitplex.server.web.component.pullrequest.reviewresult;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.manager.PullRequestReviewManager;-import com.gitplex.core.security.SecurityUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.manager.PullRequestReviewManager;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")class ReviewResultTooltip extends GenericPanel<PullRequestReview> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/review-result.css b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/review-result.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/review-result.cssrename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/review-result.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.javaindex aa117910a0..8cabaf5bf0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.verificationstatus;+package com.gitplex.server.web.component.pullrequest.verificationstatus;import java.util.ArrayList;import java.util.List;@@ -17,9 +17,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestVerification;import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestVerification;@SuppressWarnings("serial")public class VerificationStatusPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.javaindex 391dd26d46..4b94bf0473 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.pullrequest.verificationstatus;+package com.gitplex.server.web.component.pullrequest.verificationstatus;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/verification-status.css b/server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/verification-status.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/verification-status.cssrename to server.web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/verification-status.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.java b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.javaindex 9edaa81400..9f8ac44b68 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.refmatch;+package com.gitplex.server.web.component.refmatch;import java.util.ArrayList;import java.util.Collection;@@ -9,7 +9,6 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Ref;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.antlr.codeassist.FenceAware;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.antlr.codeassist.ParentedElement;@@ -18,6 +17,7 @@ import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;import com.gitplex.commons.util.Range;import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;import com.gitplex.core.util.includeexclude.IncludeExcludeParser;+import com.gitplex.server.core.entity.Depot;@SuppressWarnings("serial")public class RefMatchBehavior extends ANTLRAssistBehavior {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.java b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.javarename to server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.javaindex bb3713da61..693922f323 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.refmatch;+package com.gitplex.server.web.component.refmatch;import java.io.Serializable;@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.util.includeexclude.IncludeExcludeUtils;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;@SuppressWarnings("serial")public class RefMatchInput extends TextField<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.html b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 94ef10c414..bcdce391ee 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.revisionpicker;+package com.gitplex.server.web.component.revisionpicker;import javax.annotation.Nullable;@@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.DepotPicker;-import com.gitplex.web.model.AffinalDepotsModel;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.DepotPicker;+import com.gitplex.server.web.model.AffinalDepotsModel;@SuppressWarnings("serial")public abstract class AffinalRevisionPicker extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.javaindex 96a283270c..5177ad1f76 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.revisionpicker;+package com.gitplex.server.web.component.revisionpicker;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -8,10 +8,10 @@ import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;@SuppressWarnings("serial")abstract class CreateTagPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.javaindex 36c3385416..a45af983f4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.revisionpicker;+package com.gitplex.server.web.component.revisionpicker;import javax.annotation.Nullable;@@ -7,11 +7,11 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.DepotAndRevision;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.modal.ModalPanel;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.DepotAndRevision;@SuppressWarnings("serial")public abstract class RevisionPicker extends DropdownLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPickerResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPickerResourceReference.javaindex d2a93fbdb2..5754213f22 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPickerResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.revisionpicker;+package com.gitplex.server.web.component.revisionpicker;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.html b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.javaindex 87afab050d..b7a3b4c0d2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java@@ -1,476 +1,476 @@-package com.gitplex.web.component.revisionpicker;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.io.IOException;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.AttributeModifier;-import org.apache.wicket.Component;-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.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-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.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.errors.AmbiguousObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Ref;-import org.unbescape.html.HtmlEscape;--import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.RefInfo;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;-import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;-import com.gitplex.commons.wicket.component.modal.ModalPanel;-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;-import com.gitplex.commons.wicket.component.tabbable.Tab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;--@SuppressWarnings("serial")-public abstract class RevisionSelector extends Panel {-- private static final int PAGE_SIZE = 25;-- private final IModel<Depot> depotModel;-- private static final String COMMIT_FLAG = "*";-- private static final String ADD_FLAG = "~";-- private final String revision;-- private final boolean canCreateBranch;-- private final boolean canCreateTag;-- private boolean branchesActive;-- private Label feedback;-- private String feedbackMessage;-- private TextField<String> revField;-- private String revInput;-- private List<String> refs;-- private List<String> findRefs() {- List<String> names = new ArrayList<>();-- if (branchesActive) {- for (RefInfo ref: depotModel.getObject().getBranches())- names.add(GitUtils.ref2branch(ref.getRef().getName()));- } else {- for (RefInfo ref: depotModel.getObject().getTags())- names.add(GitUtils.ref2tag(ref.getRef().getName()));- }- return names;- }-- private void onSelectTab(AjaxRequestTarget target) {- refs = findRefs();- revField.setModel(Model.of(""));- revInput = null;- target.add(revField);- newItemsView(target);- String script = String.format("gitplex.revisionSelector.bindInputKeys('%s');", getMarkupId(true));- target.appendJavaScript(script);- target.focusComponent(revField);- }-- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision, boolean canCreateRef) {- super(id);-- Preconditions.checkArgument(revision!=null || !canCreateRef);-- this.depotModel = depotModel;- this.revision = revision;- if (canCreateRef) {- Depot depot = depotModel.getObject();- ObjectId commitId = depot.getRevCommit(revision);- canCreateBranch = SecurityUtils.canPushRef(depot, Constants.R_HEADS, ObjectId.zeroId(), commitId);- canCreateTag = SecurityUtils.canPushRef(depot, Constants.R_TAGS, ObjectId.zeroId(), commitId);- } else {- canCreateBranch = false;- canCreateTag = false;- }- if (revision != null) {- Ref ref = depotModel.getObject().getRef(revision);- branchesActive = ref == null || GitUtils.ref2tag(ref.getName()) == null;- } else {- branchesActive = true;- }-- refs = findRefs();- }-- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision) {- this(id, depotModel, revision, false);- }-- public RevisionSelector(String id, IModel<Depot> depotModel) {- this(id, depotModel, null, false);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- revField = new TextField<String>("revision", Model.of(""));- revField.add(AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (branchesActive) {- if (canCreateBranch) {- return "Find or create branch";- } else {- return "Find branch";- }- } else {- if (canCreateTag) {- return "Find or create tag";- } else {- return "Find tag";- }- }- }-- }));- revField.setOutputMarkupId(true);- add(revField);-- feedback = new Label("feedback", new PropertyModel<String>(RevisionSelector.this, "feedbackMessage")) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(feedbackMessage != null);- }-- };- feedback.setOutputMarkupPlaceholderTag(true);- add(feedback);-- add(new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- String value = params.getParameterValue("value").toString();- if (StringUtils.isNotBlank(value)) {- if (value.startsWith(COMMIT_FLAG)) {- selectRevision(target, value.substring(COMMIT_FLAG.length()));- } else if (value.startsWith(ADD_FLAG)) {- value = value.substring(ADD_FLAG.length());- onCreateRef(target, value);- } else {- selectRevision(target, value);- }- } else if (StringUtils.isNotBlank(revInput)) {- selectRevision(target, revInput.trim());- }- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);- String script = String.format("gitplex.revisionSelector.init('%s', %s);",- getMarkupId(true), getCallbackFunction(explicit("value")));- response.render(OnDomReadyHeaderItem.forScript(script));- }-- });-- revField.add(new InputChangeBehavior() {-- @Override- protected void onInputChange(AjaxRequestTarget target) {- revInput = revField.getInput();- newItemsView(target);- }-- });-- List<Tab> tabs = new ArrayList<>();- AjaxActionTab branchesTab;- tabs.add(branchesTab = new AjaxActionTab(Model.of("branches")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- branchesActive = true;- onSelectTab(target);- }-- });- AjaxActionTab tagsTab;- tabs.add(tagsTab = new AjaxActionTab(Model.of("tags")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- branchesActive = false;- onSelectTab(target);- }-- });- if (branchesActive)- branchesTab.setSelected(true);- else- tagsTab.setSelected(true);-- add(new Tabbable("tabs", tabs));-- newItemsView(null);-- setOutputMarkupId(true);- }-- @Nullable- protected String getRevisionUrl(String revision) {- return null;- }-- private List<String> getItemValues(String revInput, int page) {- List<String> itemValues = new ArrayList<>();- int count = page*PAGE_SIZE;- if (StringUtils.isNotBlank(revInput)) {- revInput = revInput.trim().toLowerCase();- boolean found = false;- for (String ref: refs) {- if (ref.equalsIgnoreCase(revInput))- found = true;- if (itemValues.size() < count && ref.toLowerCase().contains(revInput))- itemValues.add(ref);- }- if (itemValues.size() < count && !found) {- Depot depot = depotModel.getObject();- try {- if (depot.getRepository().resolve(revInput) != null) {- itemValues.add(COMMIT_FLAG + revInput);- } else if (branchesActive) {- if (canCreateBranch) {- String refName = Constants.R_HEADS + revInput;- if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {- itemValues.add(ADD_FLAG + revInput);- }- }- } else {- if (canCreateTag) {- String refName = Constants.R_TAGS + revInput;- if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {- itemValues.add(ADD_FLAG + revInput);- }- }- }- } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {- } catch (IOException e) {- throw new RuntimeException(e);- }- }- } else {- if (refs.size() > count)- itemValues.addAll(refs.subList(0, count));- else- itemValues.addAll(refs);- }- return itemValues;- }-- private void onCreateRef(AjaxRequestTarget target, final String refName) {- if (branchesActive) {- depotModel.getObject().createBranch(refName, revision);- selectRevision(target, refName);- } else {- ModalPanel modal = new ModalPanel(target) {-- @Override- protected Component newContent(String id) {- return new CreateTagPanel(id, depotModel, refName, revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String tagName) {- close(target);- onSelect(target, tagName);- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- close(target);- }-- };- }-- };- onModalOpened(target, modal);- }- }-- protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {-- }-- private Component newItem(String itemId, String itemValue) {- String ref;- if (itemValue.startsWith(COMMIT_FLAG))- ref = itemValue.substring(COMMIT_FLAG.length());- else if (itemValue.startsWith(ADD_FLAG))- ref = itemValue.substring(ADD_FLAG.length());- else- ref = itemValue;-- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (itemValue.startsWith(ADD_FLAG)) {- onCreateRef(target, ref);- } else {- selectRevision(target, ref);- }- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- if (!itemValue.startsWith(ADD_FLAG)) {- String url = getRevisionUrl(ref);- if (url != null)- tag.put("href", url);- }- }-- };- if (itemValue.startsWith(COMMIT_FLAG)) {- link.add(new Label("label", ref));- link.add(AttributeAppender.append("class", "icon commit"));- } else if (itemValue.startsWith(ADD_FLAG)) {- String label;- if (branchesActive)- label = "<div class='name'>Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";- else- label = "<div class='name'>Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";- label += "<div class='revision'>from " + HtmlEscape.escapeHtml5(revision) + "</div>";- link.add(new Label("label", label).setEscapeModelStrings(false));- link.add(AttributeAppender.append("class", "icon add"));- } else if (ref.equals(revision)) {- link.add(new Label("label", ref));- link.add(AttributeAppender.append("class", "icon current"));- } else {- link.add(new Label("label", ref));- }- WebMarkupContainer item = new WebMarkupContainer(itemId);- item.setOutputMarkupId(true);- item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));- item.add(link);-- return item;- }-- private void newItemsView(@Nullable AjaxRequestTarget target) {- WebMarkupContainer itemsContainer = new WebMarkupContainer("items");- itemsContainer.setOutputMarkupId(true);- RepeatingView itemsView;- itemsContainer.add(itemsView = new RepeatingView("items"));- List<String> itemValues = getItemValues(revInput, 1);- for (int i=0; i<itemValues.size(); i++) {- Component item = newItem(itemsView.newChildId(), itemValues.get(i));- if (i == 0)- item.add(AttributeAppender.append("class", "active"));- itemsView.add(item);- }- itemsContainer.add(new InfiniteScrollBehavior(PAGE_SIZE) {-- @Override- protected void appendPage(AjaxRequestTarget target, int page) {- List<String> itemValues = getItemValues(revInput, page);- if (itemValues.size() > PAGE_SIZE*(page-1)) {- List<String> newItemValues = itemValues.subList(PAGE_SIZE*(page-1), itemValues.size());- for (String itemValue: newItemValues) {- Component item = newItem(itemsView.newChildId(), itemValue);- itemsView.add(item);- String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",- itemsContainer.getMarkupId(), item.getMarkupId());- target.prependJavaScript(script);- target.add(item);- }- }- }-- });-- if (target != null) {- replace(itemsContainer);- target.add(itemsContainer);- } else {- add(itemsContainer);- }- }-- private void selectRevision(AjaxRequestTarget target, String revision) {- try {- if (depotModel.getObject().getRevCommit(revision, false) != null) {- onSelect(target, revision);- } else {- feedbackMessage = "Can not find commit of revision " + revision + "";- target.add(feedback);- }- } catch (Exception e) {- feedbackMessage = Throwables.getRootCause(e).getMessage();- target.add(feedback);- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new RevisionSelectorResourceReference()));- }-- protected abstract void onSelect(AjaxRequestTarget target, String revision);-- @Override- protected void onDetach() {- depotModel.detach();-- super.onDetach();- }--}+package com.gitplex.server.web.component.revisionpicker;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.io.IOException;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;+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.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+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.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.errors.AmbiguousObjectException;+import org.eclipse.jgit.errors.IncorrectObjectTypeException;+import org.eclipse.jgit.errors.RevisionSyntaxException;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.Ref;+import org.unbescape.html.HtmlEscape;++import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.RefInfo;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.behavior.InputChangeBehavior;+import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.commons.wicket.component.modal.ModalPanel;+import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;+import com.gitplex.commons.wicket.component.tabbable.Tab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;++@SuppressWarnings("serial")+public abstract class RevisionSelector extends Panel {++ private static final int PAGE_SIZE = 25;++ private final IModel<Depot> depotModel;++ private static final String COMMIT_FLAG = "*";++ private static final String ADD_FLAG = "~";++ private final String revision;++ private final boolean canCreateBranch;++ private final boolean canCreateTag;++ private boolean branchesActive;++ private Label feedback;++ private String feedbackMessage;++ private TextField<String> revField;++ private String revInput;++ private List<String> refs;++ private List<String> findRefs() {+ List<String> names = new ArrayList<>();++ if (branchesActive) {+ for (RefInfo ref: depotModel.getObject().getBranches())+ names.add(GitUtils.ref2branch(ref.getRef().getName()));+ } else {+ for (RefInfo ref: depotModel.getObject().getTags())+ names.add(GitUtils.ref2tag(ref.getRef().getName()));+ }+ return names;+ }++ private void onSelectTab(AjaxRequestTarget target) {+ refs = findRefs();+ revField.setModel(Model.of(""));+ revInput = null;+ target.add(revField);+ newItemsView(target);+ String script = String.format("gitplex.server.revisionSelector.bindInputKeys('%s');", getMarkupId(true));+ target.appendJavaScript(script);+ target.focusComponent(revField);+ }++ public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision, boolean canCreateRef) {+ super(id);++ Preconditions.checkArgument(revision!=null || !canCreateRef);++ this.depotModel = depotModel;+ this.revision = revision;+ if (canCreateRef) {+ Depot depot = depotModel.getObject();+ ObjectId commitId = depot.getRevCommit(revision);+ canCreateBranch = SecurityUtils.canPushRef(depot, Constants.R_HEADS, ObjectId.zeroId(), commitId);+ canCreateTag = SecurityUtils.canPushRef(depot, Constants.R_TAGS, ObjectId.zeroId(), commitId);+ } else {+ canCreateBranch = false;+ canCreateTag = false;+ }+ if (revision != null) {+ Ref ref = depotModel.getObject().getRef(revision);+ branchesActive = ref == null || GitUtils.ref2tag(ref.getName()) == null;+ } else {+ branchesActive = true;+ }++ refs = findRefs();+ }++ public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision) {+ this(id, depotModel, revision, false);+ }++ public RevisionSelector(String id, IModel<Depot> depotModel) {+ this(id, depotModel, null, false);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ revField = new TextField<String>("revision", Model.of(""));+ revField.add(AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (branchesActive) {+ if (canCreateBranch) {+ return "Find or create branch";+ } else {+ return "Find branch";+ }+ } else {+ if (canCreateTag) {+ return "Find or create tag";+ } else {+ return "Find tag";+ }+ }+ }++ }));+ revField.setOutputMarkupId(true);+ add(revField);++ feedback = new Label("feedback", new PropertyModel<String>(RevisionSelector.this, "feedbackMessage")) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(feedbackMessage != null);+ }++ };+ feedback.setOutputMarkupPlaceholderTag(true);+ add(feedback);++ add(new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ String value = params.getParameterValue("value").toString();+ if (StringUtils.isNotBlank(value)) {+ if (value.startsWith(COMMIT_FLAG)) {+ selectRevision(target, value.substring(COMMIT_FLAG.length()));+ } else if (value.startsWith(ADD_FLAG)) {+ value = value.substring(ADD_FLAG.length());+ onCreateRef(target, value);+ } else {+ selectRevision(target, value);+ }+ } else if (StringUtils.isNotBlank(revInput)) {+ selectRevision(target, revInput.trim());+ }+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ String script = String.format("gitplex.server.revisionSelector.init('%s', %s);",+ getMarkupId(true), getCallbackFunction(explicit("value")));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ });++ revField.add(new InputChangeBehavior() {++ @Override+ protected void onInputChange(AjaxRequestTarget target) {+ revInput = revField.getInput();+ newItemsView(target);+ }++ });++ List<Tab> tabs = new ArrayList<>();+ AjaxActionTab branchesTab;+ tabs.add(branchesTab = new AjaxActionTab(Model.of("branches")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ branchesActive = true;+ onSelectTab(target);+ }++ });+ AjaxActionTab tagsTab;+ tabs.add(tagsTab = new AjaxActionTab(Model.of("tags")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ branchesActive = false;+ onSelectTab(target);+ }++ });+ if (branchesActive)+ branchesTab.setSelected(true);+ else+ tagsTab.setSelected(true);++ add(new Tabbable("tabs", tabs));++ newItemsView(null);++ setOutputMarkupId(true);+ }++ @Nullable+ protected String getRevisionUrl(String revision) {+ return null;+ }++ private List<String> getItemValues(String revInput, int page) {+ List<String> itemValues = new ArrayList<>();+ int count = page*PAGE_SIZE;+ if (StringUtils.isNotBlank(revInput)) {+ revInput = revInput.trim().toLowerCase();+ boolean found = false;+ for (String ref: refs) {+ if (ref.equalsIgnoreCase(revInput))+ found = true;+ if (itemValues.size() < count && ref.toLowerCase().contains(revInput))+ itemValues.add(ref);+ }+ if (itemValues.size() < count && !found) {+ Depot depot = depotModel.getObject();+ try {+ if (depot.getRepository().resolve(revInput) != null) {+ itemValues.add(COMMIT_FLAG + revInput);+ } else if (branchesActive) {+ if (canCreateBranch) {+ String refName = Constants.R_HEADS + revInput;+ if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {+ itemValues.add(ADD_FLAG + revInput);+ }+ }+ } else {+ if (canCreateTag) {+ String refName = Constants.R_TAGS + revInput;+ if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {+ itemValues.add(ADD_FLAG + revInput);+ }+ }+ }+ } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } else {+ if (refs.size() > count)+ itemValues.addAll(refs.subList(0, count));+ else+ itemValues.addAll(refs);+ }+ return itemValues;+ }++ private void onCreateRef(AjaxRequestTarget target, final String refName) {+ if (branchesActive) {+ depotModel.getObject().createBranch(refName, revision);+ selectRevision(target, refName);+ } else {+ ModalPanel modal = new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new CreateTagPanel(id, depotModel, refName, revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String tagName) {+ close(target);+ onSelect(target, tagName);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close(target);+ }++ };+ }++ };+ onModalOpened(target, modal);+ }+ }++ protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {++ }++ private Component newItem(String itemId, String itemValue) {+ String ref;+ if (itemValue.startsWith(COMMIT_FLAG))+ ref = itemValue.substring(COMMIT_FLAG.length());+ else if (itemValue.startsWith(ADD_FLAG))+ ref = itemValue.substring(ADD_FLAG.length());+ else+ ref = itemValue;++ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (itemValue.startsWith(ADD_FLAG)) {+ onCreateRef(target, ref);+ } else {+ selectRevision(target, ref);+ }+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ if (!itemValue.startsWith(ADD_FLAG)) {+ String url = getRevisionUrl(ref);+ if (url != null)+ tag.put("href", url);+ }+ }++ };+ if (itemValue.startsWith(COMMIT_FLAG)) {+ link.add(new Label("label", ref));+ link.add(AttributeAppender.append("class", "icon commit"));+ } else if (itemValue.startsWith(ADD_FLAG)) {+ String label;+ if (branchesActive)+ label = "<div class='name'>Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";+ else+ label = "<div class='name'>Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";+ label += "<div class='revision'>from " + HtmlEscape.escapeHtml5(revision) + "</div>";+ link.add(new Label("label", label).setEscapeModelStrings(false));+ link.add(AttributeAppender.append("class", "icon add"));+ } else if (ref.equals(revision)) {+ link.add(new Label("label", ref));+ link.add(AttributeAppender.append("class", "icon current"));+ } else {+ link.add(new Label("label", ref));+ }+ WebMarkupContainer item = new WebMarkupContainer(itemId);+ item.setOutputMarkupId(true);+ item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));+ item.add(link);++ return item;+ }++ private void newItemsView(@Nullable AjaxRequestTarget target) {+ WebMarkupContainer itemsContainer = new WebMarkupContainer("items");+ itemsContainer.setOutputMarkupId(true);+ RepeatingView itemsView;+ itemsContainer.add(itemsView = new RepeatingView("items"));+ List<String> itemValues = getItemValues(revInput, 1);+ for (int i=0; i<itemValues.size(); i++) {+ Component item = newItem(itemsView.newChildId(), itemValues.get(i));+ if (i == 0)+ item.add(AttributeAppender.append("class", "active"));+ itemsView.add(item);+ }+ itemsContainer.add(new InfiniteScrollBehavior(PAGE_SIZE) {++ @Override+ protected void appendPage(AjaxRequestTarget target, int page) {+ List<String> itemValues = getItemValues(revInput, page);+ if (itemValues.size() > PAGE_SIZE*(page-1)) {+ List<String> newItemValues = itemValues.subList(PAGE_SIZE*(page-1), itemValues.size());+ for (String itemValue: newItemValues) {+ Component item = newItem(itemsView.newChildId(), itemValue);+ itemsView.add(item);+ String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",+ itemsContainer.getMarkupId(), item.getMarkupId());+ target.prependJavaScript(script);+ target.add(item);+ }+ }+ }++ });++ if (target != null) {+ replace(itemsContainer);+ target.add(itemsContainer);+ } else {+ add(itemsContainer);+ }+ }++ private void selectRevision(AjaxRequestTarget target, String revision) {+ try {+ if (depotModel.getObject().getRevCommit(revision, false) != null) {+ onSelect(target, revision);+ } else {+ feedbackMessage = "Can not find commit of revision " + revision + "";+ target.add(feedback);+ }+ } catch (Exception e) {+ feedbackMessage = Throwables.getRootCause(e).getMessage();+ target.add(feedback);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new RevisionSelectorResourceReference()));+ }++ protected abstract void onSelect(AjaxRequestTarget target, String revision);++ @Override+ protected void onDetach() {+ depotModel.detach();++ super.onDetach();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.javaindex 6ef2da9113..26e7a67cf4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.revisionpicker;+package com.gitplex.server.web.component.revisionpicker;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class RevisionSelectorResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-picker.css b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-picker.cssrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-picker.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-selector.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.cssrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-selector.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-selector.jssimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.jsrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-selector.jsindex bddc8fc763..3467776fe1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/revision-selector.js@@ -1,43 +1,43 @@-gitplex.revisionSelector = {- init: function(containerId, callback) {- var $container = $("#" + containerId);- $container.data("callback", callback);- var $floating = $container.closest(".floating");- $floating.on("open click", function() {- $container.find("input").focus();- });- gitplex.revisionSelector.bindInputKeys(containerId);- },- bindInputKeys: function(containerId) {- var $container = $("#" + containerId);- var callback = $container.data("callback");- var $input = $container.find("input");- $input.bind("keydown", "return", function() {- var $active = $container.find("ul.items li.active");- if ($active.length != 0)- callback($active.data("value"));- else- callback();- });- $input.bind("keydown", "up", function(e) {- e.preventDefault();- var $active = $container.find("ul.items li.active");- var $prev = $active.prev("li:not(.loading-indicator)");- if ($prev.length != 0) {- $active.removeClass("active");- $prev.addClass("active");- }- $container.find("ul.items").scrollIntoView("li.active", 8, 8);- });- $input.bind("keydown", "down", function(e) {- e.preventDefault();- var $active = $container.find("ul.items li.active");- var $next = $active.next("li:not(.loading-indicator)");- if ($next.length != 0) {- $active.removeClass("active");- $next.addClass("active");- }- $container.find("ul.items").scrollIntoView("li.active", 8, 8);- });- }+gitplex.server.revisionSelector = {+ init: function(containerId, callback) {+ var $container = $("#" + containerId);+ $container.data("callback", callback);+ var $floating = $container.closest(".floating");+ $floating.on("open click", function() {+ $container.find("input").focus();+ });+ gitplex.server.revisionSelector.bindInputKeys(containerId);+ },+ bindInputKeys: function(containerId) {+ var $container = $("#" + containerId);+ var callback = $container.data("callback");+ var $input = $container.find("input");+ $input.bind("keydown", "return", function() {+ var $active = $container.find("ul.items li.active");+ if ($active.length != 0)+ callback($active.data("value"));+ else+ callback();+ });+ $input.bind("keydown", "up", function(e) {+ e.preventDefault();+ var $active = $container.find("ul.items li.active");+ var $prev = $active.prev("li:not(.loading-indicator)");+ if ($prev.length != 0) {+ $active.removeClass("active");+ $prev.addClass("active");+ }+ $container.find("ul.items").scrollIntoView("li.active", 8, 8);+ });+ $input.bind("keydown", "down", function(e) {+ e.preventDefault();+ var $active = $container.find("ul.items li.active");+ var $next = $active.next("li:not(.loading-indicator)");+ if ($next.length != 0) {+ $active.removeClass("active");+ $next.addClass("active");+ }+ $container.find("ul.items").scrollIntoView("li.active", 8, 8);+ });+ }};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/search.gif b/server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/search.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/search.gifrename to server.web/src/main/java/com/gitplex/server/web/component/revisionpicker/search.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.javaindex d812e01f86..9e41ad90ce 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/roleselection/RoleSelectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.roleselection;+package com.gitplex.server.web.component.roleselection;import javax.annotation.Nullable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.java b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/OptionChangeCallback.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.javarename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/OptionChangeCallback.javaindex 08adbed784..29020febfc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/OptionChangeCallback.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.sourceformat;+package com.gitplex.server.web.component.sourceformat;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatPanel.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatPanel.javaindex 05addc25c8..2081ead420 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.sourceformat;+package com.gitplex.server.web.component.sourceformat;import javax.annotation.Nullable;import javax.servlet.http.Cookie;@@ -168,7 +168,7 @@ public class SourceFormatPanel extends Panel {response.render(JavaScriptReferenceHeaderItem.forReference(new SourceFormatResourceReference()));- String script = String.format("gitplex.sourceFormat.init('%s');", getMarkupId());+ String script = String.format("gitplex.server.sourceFormat.init('%s');", getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatResourceReference.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatResourceReference.javaindex 907e0120d5..1430599354 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/SourceFormatResourceReference.java@@ -1,12 +1,12 @@-package com.gitplex.web.component.sourceformat;+package com.gitplex.server.web.component.sourceformat;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class SourceFormatResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.css b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.cssrename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.js b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.jssimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.jsrename to server.web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.jsindex a8d35c1312..842fa467d0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.js@@ -1,9 +1,9 @@-gitplex.sourceFormat = {- init: function(containerId) {- var $container = $("#" + containerId);-- $container.find(".indent-type>select").prepend("<optgroup label='Indent type'></optgroup>");- $container.find(".tab-size>select").prepend("<optgroup label='Tab size'></optgroup>");- $container.find(".line-wrap-mode>select").prepend("<optgroup label='Line wrap mode'></optgroup>");- }+gitplex.server.sourceFormat = {+ init: function(containerId) {+ var $container = $("#" + containerId);++ $container.find(".indent-type>select").prepend("<optgroup label='Indent type'></optgroup>");+ $container.find(".tab-size>select").prepend("<optgroup label='Tab size'></optgroup>");+ $container.find(".line-wrap-mode>select").prepend("<optgroup label='Line wrap mode'></optgroup>");+ }};\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.javarename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex f282bc387b..dd3716bad2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.symboltooltip;+package com.gitplex.server.web.component.symboltooltip;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -28,16 +28,16 @@ import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.request.resource.ResourceReference;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.search.SearchManager;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;-import com.gitplex.search.query.SymbolQuery;-import com.gitplex.search.query.TextQuery;-import com.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.search.SearchManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.SymbolQuery;+import com.gitplex.server.search.query.TextQuery;+import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;+import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;import com.gitplex.commons.wicket.behavior.RunTaskBehavior;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;@@ -93,7 +93,7 @@ public abstract class SymbolTooltipPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- String script = String.format("gitplex.symboltooltip.removeTooltip(document.getElementById('%s'));",+ String script = String.format("gitplex.server.symboltooltip.removeTooltip(document.getElementById('%s'));",SymbolTooltipPanel.this.getMarkupId());target.prependJavaScript(script);onSelect(target, hit);@@ -140,7 +140,7 @@ public abstract class SymbolTooltipPanel extends Panel {@Overrideprotected void runTask(AjaxRequestTarget target) {- String script = String.format("gitplex.symboltooltip.removeTooltip(document.getElementById('%s'));",+ String script = String.format("gitplex.server.symboltooltip.removeTooltip(document.getElementById('%s'));",SymbolTooltipPanel.this.getMarkupId());target.prependJavaScript(script);@@ -198,7 +198,7 @@ public abstract class SymbolTooltipPanel extends Panel {throw new RuntimeException(e);}target.add(content);- String script = String.format("gitplex.symboltooltip.doneQuery('%s');", content.getMarkupId());+ String script = String.format("gitplex.server.symboltooltip.doneQuery('%s');", content.getMarkupId());target.appendJavaScript(script);}@@ -210,7 +210,7 @@ public abstract class SymbolTooltipPanel extends Panel {ResourceReference ajaxIndicator = new PackageResourceReference(SymbolTooltipPanel.class, "ajax-indicator.gif");- String script = String.format("gitplex.symboltooltip.init('%s', %s, '%s');",+ String script = String.format("gitplex.server.symboltooltip.init('%s', %s, '%s');",getMarkupId(), getCallbackFunction(explicit("revision"), explicit("symbol")),RequestCycle.get().urlFor(ajaxIndicator, new PageParameters()));response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipResourceReference.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipResourceReference.javaindex f1d43d5d1c..ee684d1112 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipResourceReference.java@@ -1,12 +1,12 @@-package com.gitplex.web.component.symboltooltip;+package com.gitplex.server.web.component.symboltooltip;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class SymbolTooltipResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/ajax-indicator.gif b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/ajax-indicator.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/ajax-indicator.gifrename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/ajax-indicator.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.css b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/symbol-tooltip.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.cssrename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/symbol-tooltip.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.js b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/symbol-tooltip.jssimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.jsrename to server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/symbol-tooltip.jsindex a17d7cbc18..203c208f52 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/symbol-tooltip.js@@ -1,4 +1,4 @@-gitplex.symboltooltip = {+gitplex.server.symboltooltip = {init: function(containerId, queryCallback, ajaxIndicatorUrl) {var container = document.getElementById(containerId);@@ -16,7 +16,7 @@ gitplex.symboltooltip = {if (container.tooltip.hideTimer)clearTimeout(container.tooltip.hideTimer);container.tooltip.hideTimer = setTimeout(function(){- gitplex.symboltooltip.removeTooltip(container);+ gitplex.server.symboltooltip.removeTooltip(container);}, 200);}};@@ -30,7 +30,7 @@ gitplex.symboltooltip = {container.onMouseOverSymbol = function(revision, symbolEl) {var $symbol = $(symbolEl);- if (gitplex.mouseState.pressed || !gitplex.mouseState.moved || $symbol.text() == "@")+ if (gitplex.server.mouseState.pressed || !gitplex.server.mouseState.moved || $symbol.text() == "@")return;cancelShow();@@ -50,7 +50,7 @@ gitplex.symboltooltip = {if (container.tooltip.symbolEl == symbolEl)return;else- gitplex.symboltooltip.removeTooltip(container);+ gitplex.server.symboltooltip.removeTooltip(container);}var $tooltip = $("<div class='symbol-tooltip' id='" + containerId@@ -100,7 +100,7 @@ gitplex.symboltooltip = {$(function() {$(window).scroll(function() {$(".symbol-tooltip-container").each(function() {- gitplex.symboltooltip.removeTooltip(this);+ gitplex.server.symboltooltip.removeTooltip(this);});});});\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.javaindex f761b38112..21f3210002 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.teamchoice;+package com.gitplex.server.web.component.teamchoice;import java.util.Collection;import java.util.List;@@ -6,11 +6,11 @@ import java.util.List;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<Team> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.javaindex 01fe59b98f..d7aa4aa59e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.teamchoice;+package com.gitplex.server.web.component.teamchoice;import java.util.List;@@ -6,13 +6,13 @@ import org.apache.wicket.model.IModel;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.web.Constants;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.web.Constants;public class TeamChoiceProvider extends AbstractTeamChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.javaindex 6d1134707e..1692e166e7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.component.teamchoice;+package com.gitplex.server.web.component.teamchoice;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class TeamChoiceResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.javasimilarity index 70%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.javaindex da6645e323..6993368eb5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java@@ -1,4 +1,4 @@-package com.gitplex.web.component.teamchoice;+package com.gitplex.server.web.component.teamchoice;import java.util.Collection;@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Team;import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;+import com.gitplex.server.core.entity.Team;@SuppressWarnings("serial")public class TeamMultiChoice extends Select2MultiChoice<Team> {@@ -21,9 +21,9 @@ public class TeamMultiChoice extends Select2MultiChoice<Team> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose teams ...");- getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.java b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.javarename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.javaindex 964e2578a0..d67ca5acc6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java@@ -1,11 +1,11 @@-package com.gitplex.web.component.teamchoice;+package com.gitplex.server.web.component.teamchoice;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Team;import com.gitplex.commons.wicket.component.select2.Select2Choice;+import com.gitplex.server.core.entity.Team;@SuppressWarnings("serial")public class TeamSingleChoice extends Select2Choice<Team> {@@ -19,9 +19,9 @@ public class TeamSingleChoice extends Select2Choice<Team> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose a team ...");- getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/team-choice.js b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.jssimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/team-choice.jsrename to server.web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.jsindex cdc6bfb326..021a1c9e48 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/team-choice.js+++ b/server.web/src/main/java/com/gitplex/server/web/component/teamchoice/team-choice.js@@ -1,4 +1,4 @@-gitplex.teamChoiceFormatter = {+gitplex.server.teamChoiceFormatter = {formatSelection: function(team) {return team.name;},diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.javaindex 45c1afb85a..aa0990071b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.java@@ -1,15 +1,15 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import java.util.ArrayList;import java.util.List;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class DepotAccess {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.javaindex 67aa4c0f50..878f56dccf 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsDepotCollaborator implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.html b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.javaindex 78c0c76145..e336a54574 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;@SuppressWarnings("serial")public class IsDepotCollaboratorPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.javaindex 7c0495e253..13fa971dd0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.java@@ -1,9 +1,9 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsDepotOwner implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.javasimilarity index 74%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.javaindex 1fc15caccd..8949fd18fb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsOrganizationAdmin implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.html b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.javaindex 6364582538..9ba3eb946b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.web.page.account.members.MemberTeamListPage;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.web.page.account.members.MemberTeamListPage;@SuppressWarnings("serial")public class IsOrganizationAdminPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.javaindex db4321012c..a636eced39 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsOrganizationMember implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.html b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.javaindex aae4b27ac6..d9857edf16 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.java@@ -1,14 +1,14 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.setting.ProfileEditPage;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.setting.ProfileEditPage;public class IsOrganizationMemberPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.javaindex 39d76f3353..909d3de736 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.java@@ -1,9 +1,9 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsPublicDepot implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.javaindex 7c4237fc85..e575f9b62b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.java@@ -1,9 +1,9 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsSystemAdministrator implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.javaindex feeb10ca1a..d9c7fb1a21 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.java@@ -1,12 +1,12 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public class IsTeamMember implements PrivilegeSource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.html b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.javaindex 2fb386508c..a60ff595f7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -6,10 +6,10 @@ 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.core.entity.TeamMembership;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.page.account.teams.TeamDepotListPage;-import com.gitplex.web.page.account.teams.TeamMemberListPage;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+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 {diff --git a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.java b/server.web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.javasimilarity index 64%rename from gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.javarename to server.web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.javaindex 41477aefdd..4fa8d0c90e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.java+++ b/server.web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.java@@ -1,10 +1,10 @@-package com.gitplex.web.depotaccess;+package com.gitplex.server.web.depotaccess;import java.io.Serializable;import org.apache.wicket.Component;-import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.server.core.security.privilege.DepotPrivilege;public interface PrivilegeSource extends Serializable {diff --git a/server.web/src/main/java/com/gitplex/server/web/editable/EditSupportLocator.java b/server.web/src/main/java/com/gitplex/server/web/editable/EditSupportLocator.javanew file mode 100644index 0000000000..811906172d--- /dev/null+++ b/server.web/src/main/java/com/gitplex/server/web/editable/EditSupportLocator.java@@ -0,0 +1,5 @@+package com.gitplex.server.web.editable;++public class EditSupportLocator {++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.javaindex 2b48b5ab60..b026f64b0a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.accountchoice;+package com.gitplex.server.web.editable.accountchoice;import java.lang.reflect.Method;import java.util.List;@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.eclipse.jgit.util.StringUtils;-import com.gitplex.core.annotation.AccountChoice;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.EditSupport;import com.gitplex.commons.wicket.editable.EditableUtils;@@ -18,6 +17,7 @@ import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.AccountChoice;@SuppressWarnings("serial")public class AccountEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.javaindex 3afdc1d77c..b1ce66269d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.accountchoice;+package com.gitplex.server.web.editable.accountchoice;import java.io.Serializable;import java.util.ArrayList;@@ -9,15 +9,15 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.web.component.accountchoice.AccountMultiChoice;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;+import com.gitplex.server.web.component.accountchoice.AccountMultiChoice;@SuppressWarnings("serial")public class AccountMultiChoiceEditor extends PropertyEditor<List<String>> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.javaindex 45d5dc0a9d..3b33dc34c7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java@@ -1,18 +1,18 @@-package com.gitplex.web.editable.accountchoice;+package com.gitplex.server.web.editable.accountchoice;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.component.accountchoice.AccountChoiceProvider;-import com.gitplex.web.component.accountchoice.AccountSingleChoice;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;+import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;@SuppressWarnings("serial")public class AccountSingleChoiceEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.javaindex 5d55df9cdd..e3279da8fa 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.branchchoice;+package com.gitplex.server.web.editable.branchchoice;import java.lang.reflect.Method;import java.util.ArrayList;@@ -10,7 +10,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.eclipse.jgit.util.StringUtils;-import com.gitplex.core.annotation.BranchChoice;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -19,6 +18,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.BranchChoice;@SuppressWarnings("serial")public class BranchEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 089ace67d0..41b4bb0eef 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.branchchoice;+package com.gitplex.server.web.editable.branchchoice;import java.util.ArrayList;import java.util.Collection;@@ -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.core.entity.Depot;-import com.gitplex.web.component.branchchoice.BranchChoiceProvider;-import com.gitplex.web.component.branchchoice.BranchMultiChoice;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;+import com.gitplex.server.web.component.branchchoice.BranchMultiChoice;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 5b394e3811..4c48cd6d1d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -1,17 +1,17 @@-package com.gitplex.web.editable.branchchoice;+package com.gitplex.server.web.editable.branchchoice;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.core.entity.Depot;-import com.gitplex.web.component.branchchoice.BranchChoiceProvider;-import com.gitplex.web.component.branchchoice.BranchSingleChoice;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;+import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class BranchSingleChoiceEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.javaindex ad6e49f512..7f2a2aa398 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.branchmatch;+package com.gitplex.server.web.editable.branchmatch;import java.lang.reflect.Method;import java.util.Set;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import com.gitplex.core.annotation.BranchMatch;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -15,6 +14,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.BranchMatch;@SuppressWarnings("serial")public class BranchMatchEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.javaindex c4dd1dcc31..57f77429af 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.branchmatch;+package com.gitplex.server.web.editable.branchmatch;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -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.core.entity.Depot;-import com.gitplex.web.component.branchmatch.BranchMatchInput;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.branchmatch.BranchMatchInput;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class BranchMatchEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.javaindex a068dd8c99..42c9d70765 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.filechoice;+package com.gitplex.server.web.editable.filechoice;import java.util.ArrayList;import java.util.List;@@ -8,8 +8,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.core.annotation.FileChoice;-import com.gitplex.web.util.SuggestionUtils;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.commons.antlr.codeassist.InputCompletion;@@ -22,6 +20,8 @@ import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.annotation.FileChoice;+import com.gitplex.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class FileChoiceEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.javaindex 1076bf30b6..13d0659090 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.filechoice;+package com.gitplex.server.web.editable.filechoice;import java.lang.reflect.Method;import java.util.Set;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import com.gitplex.core.annotation.FileChoice;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -15,6 +14,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.FileChoice;@SuppressWarnings("serial")public class FileEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.javaindex 0f55029da2..92b1f60de6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.fullbranchmatch;+package com.gitplex.server.web.editable.fullbranchmatch;import java.lang.reflect.Method;import java.util.Set;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import com.gitplex.core.annotation.FullBranchMatch;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -15,6 +14,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.FullBranchMatch;@SuppressWarnings("serial")public class FullBranchMatchEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.javaindex f620c72ad7..e4e89a06cc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.fullbranchmatch;+package com.gitplex.server.web.editable.fullbranchmatch;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -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.core.entity.Depot;-import com.gitplex.web.component.fullbranchmatch.FullBranchMatchInput;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.fullbranchmatch.FullBranchMatchInput;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class FullBranchMatchEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.javaindex 13151ead95..121bfcfa93 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.pathmatch;+package com.gitplex.server.web.editable.pathmatch;import java.lang.reflect.Method;import java.util.Set;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import com.gitplex.core.annotation.PathMatch;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -15,6 +14,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.PathMatch;@SuppressWarnings("serial")public class PathMatchEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.javaindex 19ff931597..cad0e17b7a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.pathmatch;+package com.gitplex.server.web.editable.pathmatch;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -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.core.entity.Depot;-import com.gitplex.web.component.pathmatch.PathMatchInput;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.pathmatch.PathMatchInput;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class PathMatchEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.javaindex eeec5f0efd..6cd6a1d024 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.refmatch;+package com.gitplex.server.web.editable.refmatch;import java.lang.reflect.Method;import java.util.Set;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import com.gitplex.core.annotation.RefMatch;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -15,6 +14,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.RefMatch;@SuppressWarnings("serial")public class RefMatchEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.javaindex 47713306b0..6bbc9cac02 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.refmatch;+package com.gitplex.server.web.editable.refmatch;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -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.core.entity.Depot;-import com.gitplex.web.component.refmatch.RefMatchInput;-import com.gitplex.web.page.depot.DepotPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.component.refmatch.RefMatchInput;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class RefMatchEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.java b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.javarename to server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.javaindex 96d376de54..3f166023b8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.teamchoice;+package com.gitplex.server.web.editable.teamchoice;import java.lang.reflect.Method;import java.util.Collection;@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.eclipse.jgit.util.StringUtils;-import com.gitplex.core.annotation.TeamChoice;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.EditSupport;@@ -18,6 +17,7 @@ import com.gitplex.commons.wicket.editable.NotDefinedLabel;import com.gitplex.commons.wicket.editable.PropertyContext;import com.gitplex.commons.wicket.editable.PropertyEditor;import com.gitplex.commons.wicket.editable.PropertyViewer;+import com.gitplex.server.core.annotation.TeamChoice;@SuppressWarnings("serial")public class TeamEditSupport implements EditSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.javaindex d83acfc078..f4b510524f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.editable.teamchoice;+package com.gitplex.server.web.editable.teamchoice;import java.io.Serializable;import java.util.ArrayList;@@ -10,17 +10,17 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.web.component.teamchoice.TeamChoiceProvider;-import com.gitplex.web.component.teamchoice.TeamMultiChoice;-import com.gitplex.web.page.account.AccountPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;+import com.gitplex.server.web.component.teamchoice.TeamMultiChoice;+import com.gitplex.server.web.page.account.AccountPage;@SuppressWarnings("serial")public class TeamMultiChoiceEditor extends PropertyEditor<Collection<String>> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.html b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.javarename to server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.javaindex 01bb7a971d..d7dd15b660 100644--- a/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java@@ -1,21 +1,21 @@-package com.gitplex.web.editable.teamchoice;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.web.component.teamchoice.TeamChoiceProvider;-import com.gitplex.web.component.teamchoice.TeamSingleChoice;-import com.gitplex.web.page.account.AccountPage;import com.gitplex.commons.wicket.editable.ErrorContext;import com.gitplex.commons.wicket.editable.PathSegment;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.PropertyEditor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;+import com.gitplex.server.web.component.teamchoice.TeamSingleChoice;+import com.gitplex.server.web.page.account.AccountPage;@SuppressWarnings("serial")public class TeamSingleChoiceEditor extends PropertyEditor<String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.java b/server.web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.javarename to server.web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.javaindex 461ed0fd28..80c029ad59 100644--- a/gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.java+++ b/server.web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.java@@ -1,4 +1,4 @@-package com.gitplex.web.mapper;+package com.gitplex.server.web.mapper;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Request;diff --git a/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.java b/server.web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.javarename to server.web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.javaindex 8476cfcaf8..e687ca4704 100644--- a/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.java+++ b/server.web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.java@@ -1,4 +1,4 @@-package com.gitplex.web.mapper;+package com.gitplex.server.web.mapper;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Request;diff --git a/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.java b/server.web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.javarename to server.web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.javaindex 8981d6c3b1..a1e5cd97c1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.java+++ b/server.web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.java@@ -1,4 +1,4 @@-package com.gitplex.web.mapper;+package com.gitplex.server.web.mapper;import org.apache.wicket.core.request.mapper.ResourceMapper;import org.apache.wicket.request.IRequestHandler;diff --git a/gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.java b/server.web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.javarename to server.web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.javaindex fc63071cf3..34c8f3a286 100644--- a/gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.java+++ b/server.web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.java@@ -1,13 +1,13 @@-package com.gitplex.web.mapper;+package com.gitplex.server.web.mapper;import java.util.ArrayList;import java.util.List;import org.apache.wicket.request.Url;-import com.gitplex.core.util.validation.AccountNameValidator;-import com.gitplex.core.util.validation.DepotNameValidator;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.util.validation.AccountNameValidator;+import com.gitplex.server.core.util.validation.DepotNameValidator;public class MapperUtils {diff --git a/gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.java b/server.web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.javasimilarity index 61%rename from gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.javarename to server.web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.javaindex ec29023b95..f0cc088f3e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.java+++ b/server.web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.java@@ -1,71 +1,71 @@-package com.gitplex.web.mapper;+package com.gitplex.server.web.mapper;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Request;import org.apache.wicket.request.mapper.CompoundRequestMapper;-import com.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorEffectivePrivilegePage;-import com.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.web.page.account.members.MemberListPage;-import com.gitplex.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.web.page.account.members.MemberTeamListPage;-import com.gitplex.web.page.account.members.NewMembersPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.account.overview.NewDepotPage;-import com.gitplex.web.page.account.overview.NewOrganizationPage;-import com.gitplex.web.page.account.setting.AvatarEditPage;-import com.gitplex.web.page.account.setting.PasswordEditPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.gitplex.web.page.account.tasks.TaskListPage;-import com.gitplex.web.page.account.teams.NewTeamPage;-import com.gitplex.web.page.account.teams.TeamDepotListPage;-import com.gitplex.web.page.account.teams.TeamEditPage;-import com.gitplex.web.page.account.teams.TeamListPage;-import com.gitplex.web.page.account.teams.TeamMemberListPage;-import com.gitplex.web.page.admin.DatabaseBackupPage;-import com.gitplex.web.page.admin.MailSettingPage;-import com.gitplex.web.page.admin.SystemSettingPage;-import com.gitplex.web.page.admin.account.NewUserPage;-import com.gitplex.web.page.admin.account.UserListPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.web.page.depot.comments.CodeCommentPage;-import com.gitplex.web.page.depot.comments.DepotCommentsPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;-import com.gitplex.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;-import com.gitplex.web.page.depot.setting.gatekeeper.GateKeeperPage;-import com.gitplex.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;-import com.gitplex.web.page.depot.tags.DepotTagsPage;-import com.gitplex.web.page.init.ServerInitPage;-import com.gitplex.web.page.init.WelcomePage;-import com.gitplex.web.page.layout.CreateDepotPage;-import com.gitplex.web.page.security.ForgetPage;-import com.gitplex.web.page.security.LoginPage;-import com.gitplex.web.page.security.LogoutPage;-import com.gitplex.web.page.security.RegisterPage;-import com.gitplex.web.page.test.RunModePage;-import com.gitplex.web.page.test.TestPage;-import com.gitplex.web.resource.ArchiveResourceReference;-import com.gitplex.web.resource.AttachmentResourceReference;-import com.gitplex.web.resource.BlobResourceReference;import com.gitplex.commons.wicket.NoVersionMountedMapper;+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.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.branches.DepotBranchesPage;+import com.gitplex.server.web.page.depot.comments.CodeCommentPage;+import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;+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.file.DepotFilePage;+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.integrationpreview.IntegrationPreviewPage;+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.DepotTeamListPage;+import com.gitplex.server.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;+import com.gitplex.server.web.page.depot.setting.gatekeeper.GateKeeperPage;+import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;+import com.gitplex.server.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;+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.RunModePage;+import com.gitplex.server.web.page.test.TestPage;+import com.gitplex.server.web.resource.ArchiveResourceReference;+import com.gitplex.server.web.resource.AttachmentResourceReference;+import com.gitplex.server.web.resource.BlobResourceReference;public class UrlMapper extends CompoundRequestMapper {diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.java b/server.web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.javaindex f4e2a0f8ea..bd830390b4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.java@@ -1,4 +1,4 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;import java.util.ArrayList;import java.util.Collection;@@ -7,10 +7,10 @@ import java.util.List;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")public class AffinalDepotsModel extends LoadableDetachableModel<Collection<Depot>> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.java b/server.web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.javaindex 0ffecd02d9..0d7fa97689 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.java@@ -1,4 +1,4 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;import java.util.ArrayList;import java.util.HashMap;@@ -10,8 +10,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.entity.Depot;import com.gitplex.commons.git.RefInfo;+import com.gitplex.server.core.entity.Depot;public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.java b/server.web/src/main/java/com/gitplex/server/web/model/DepotModel.javasimilarity index 72%rename from gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/DepotModel.javaindex 910813f324..c779f53055 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/DepotModel.java@@ -1,6 +1,6 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;-import com.gitplex.core.entity.Depot;+import com.gitplex.server.core.entity.Depot;/** Shortcut for {@link EntityModel}<Repository> */public class DepotModel extends EntityModel<Depot> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.java b/server.web/src/main/java/com/gitplex/server/web/model/EntityModel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/EntityModel.javaindex 051c1337c8..17de20cd1f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/EntityModel.java@@ -1,4 +1,4 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;import javax.annotation.Nullable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.java b/server.web/src/main/java/com/gitplex/server/web/model/ReviewersModel.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/ReviewersModel.javaindex bc84ef6083..abb6fd02f0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/ReviewersModel.java@@ -1,4 +1,4 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;import java.util.ArrayList;import java.util.List;@@ -6,8 +6,8 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;@SuppressWarnings("serial")public class ReviewersModel extends LoadableDetachableModel<List<PullRequestReviewInvitation>>{diff --git a/gitplex.web/src/main/java/com/gitplex/web/model/UserModel.java b/server.web/src/main/java/com/gitplex/server/web/model/UserModel.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/model/UserModel.javarename to server.web/src/main/java/com/gitplex/server/web/model/UserModel.javaindex a906cd617f..0f6bafb838 100644--- a/gitplex.web/src/main/java/com/gitplex/web/model/UserModel.java+++ b/server.web/src/main/java/com/gitplex/server/web/model/UserModel.java@@ -1,6 +1,6 @@-package com.gitplex.web.model;+package com.gitplex.server.web.model;-import com.gitplex.core.entity.Account;+import com.gitplex.server.core.entity.Account;public class UserModel extends EntityModel<Account> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.javasimilarity index 72%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.javaindex 3f78f058b0..e1ce1ef180 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java@@ -1,96 +1,96 @@-package com.gitplex.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.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorPage;-import com.gitplex.web.page.account.members.MemberListPage;-import com.gitplex.web.page.account.members.MemberPage;-import com.gitplex.web.page.account.members.NewMembersPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.account.overview.NewDepotPage;-import com.gitplex.web.page.account.overview.NewOrganizationPage;-import com.gitplex.web.page.account.setting.AvatarEditPage;-import com.gitplex.web.page.account.setting.PasswordEditPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.gitplex.web.page.account.tasks.TaskListPage;-import com.gitplex.web.page.account.teams.TeamListPage;-import com.gitplex.web.page.account.teams.TeamPage;-import com.gitplex.commons.wicket.component.tabbable.PageTab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@SuppressWarnings("serial")-public abstract class AccountLayoutPage extends AccountPage {-- public AccountLayoutPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BookmarkablePageLink<Void> avatarLink = new BookmarkablePageLink<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(), null));-- 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()));- }--}+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.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.commons.wicket.component.tabbable.PageTab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.Avatar;+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();++ BookmarkablePageLink<Void> avatarLink = new BookmarkablePageLink<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(), null));++ 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/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountPage.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountPage.javaindex 94cfd518d4..beb6692436 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java@@ -1,65 +1,65 @@-package com.gitplex.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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.model.UserModel;-import com.gitplex.web.page.layout.LayoutPage;-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());- }--}+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.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.model.UserModel;+import com.gitplex.server.web.page.layout.LayoutPage;+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/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.javaindex 99ca221b07..e53ebc2597 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account;+package com.gitplex.server.web.page.account;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.java b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountTab.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountTab.javaindex 8b1f0910de..2c698ece55 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account;+package com.gitplex.server.web.page.account;import org.apache.wicket.Component;import org.apache.wicket.model.Model;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.html b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.java b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.javaindex 12405fb5fd..f1454695ba 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account;+package com.gitplex.server.web.page.account;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/account.css b/server.web/src/main/java/com/gitplex/server/web/page/account/account.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/account.cssrename to server.web/src/main/java/com/gitplex/server/web/page/account/account.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.javaindex 2ecd645e3f..5b898dcced 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java@@ -1,168 +1,168 @@-package com.gitplex.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.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;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account collaborator = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<>("avatarLink",- CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));- link.add(new Avatar("avatar", collaborator));- item.add(link);-- link = new BookmarkablePageLink<>("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));- }--}+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.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;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.Avatar;+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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Account> item) {+ Account collaborator = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<>("avatarLink",+ CollaboratorDepotListPage.class,+ CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));+ link.add(new Avatar("avatar", collaborator));+ item.add(link);++ link = new BookmarkablePageLink<>("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/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.javaindex 12fdf60442..9dee85faef 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java@@ -1,406 +1,406 @@-package com.gitplex.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.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;-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.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--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) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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, Constants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add Repository...");- getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<UserAuthorization> item) {- UserAuthorization authorization = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<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 BookmarkablePageLink<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) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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);- }--}+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.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;+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.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;+import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;++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) {+ return new PrivilegeSelectionPanel(id, false, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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, Constants.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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<UserAuthorization> item) {+ UserAuthorization authorization = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<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 BookmarkablePageLink<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) {+ return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javaindex a64965bebc..3e561230a1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java@@ -1,240 +1,240 @@-package com.gitplex.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.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;-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.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--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) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new BookmarkablePageLink<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;- }-- }--}+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.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;+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.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;++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) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<DepotPermission> item) {+ DepotPermission permission = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>(+ "depotLink",+ DepotEffectivePrivilegePage.class,+ DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));+ link.add(new Label("name", permission.getDepot().getName()));+ item.add(link);++ link = new BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.javaindex a0bb9ef8f6..4922bf307c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java@@ -1,123 +1,123 @@-package com.gitplex.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.BookmarkablePageLink;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.component.tabbable.PageTab;-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@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 BookmarkablePageLink<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 BookmarkablePageLink<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));- }--}+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.BookmarkablePageLink;+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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.component.tabbable.PageTab;+import com.gitplex.commons.wicket.component.tabbable.PageTabLink;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.page.account.AccountLayoutPage;++@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 BookmarkablePageLink<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 BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.javaindex a979c06574..985c537d9c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.account.collaborators;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.component.privilegesource.PrivilegeSourcePanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;import com.google.common.base.Preconditions;@SuppressWarnings("serial")diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.javaindex 4419e4bf1d..9fe5d5ca01 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java@@ -1,245 +1,245 @@-package com.gitplex.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.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;-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.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--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) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new BookmarkablePageLink<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;- }-- }--}+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.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;+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.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;++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) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<DepotPermission> item) {+ DepotPermission permission = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>(+ "depotLink",+ DepotEffectivePrivilegePage.class,+ DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));+ link.add(new Label("name", permission.getDepot().getName()));+ item.add(link);++ link = new BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.javaindex 6d75cbcdbd..f83e8ab2b2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java@@ -1,446 +1,446 @@-package com.gitplex.web.page.account.members;--import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;-import static com.gitplex.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.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;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.roleselection.RoleSelectionPanel;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--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) {- return new RoleSelectionPanel(id, filterRole) {-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- close();- filterRole = ROLE_ADMIN;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- 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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<OrganizationMembership> item) {- OrganizationMembership membership = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<>("avatarLink", MemberTeamListPage.class,- MemberTeamListPage.paramsOf(membership));- link.add(new Avatar("avatar", membership.getUser()));- item.add(link);-- link = new BookmarkablePageLink<>("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) {- return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- 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) {- 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 BookmarkablePageLink<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));- }--}+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.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;+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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.Avatar;+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 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) {+ return new RoleSelectionPanel(id, filterRole) {++ @Override+ protected void onSelectAdmin(AjaxRequestTarget target) {+ close();+ filterRole = ROLE_ADMIN;+ target.add(filterContainer);+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ @Override+ protected void onSelectOrdinary(AjaxRequestTarget target) {+ 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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<OrganizationMembership> item) {+ OrganizationMembership membership = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<>("avatarLink", MemberTeamListPage.class,+ MemberTeamListPage.paramsOf(membership));+ link.add(new Avatar("avatar", membership.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<>("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) {+ return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {++ @Override+ protected void onSelectOrdinary(AjaxRequestTarget target) {+ 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) {+ 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 BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.javaindex e0624d6d8a..44ce72ce26 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java@@ -1,214 +1,214 @@-package com.gitplex.web.page.account.members;--import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;-import static com.gitplex.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.BookmarkablePageLink;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.roleselection.RoleSelectionPanel;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.ConfirmOnClick;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.tabbable.PageTab;-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@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) {- return new RoleSelectionPanel(id, getMembership().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- close();- getMembership().setAdmin(false);- GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());- setResponsePage(getPageClass(), getPageParameters());- Session.get().success("Role updated");- }-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- 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 BookmarkablePageLink<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 BookmarkablePageLink<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));- }--}+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.BookmarkablePageLink;+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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.ConfirmOnClick;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.tabbable.PageTab;+import com.gitplex.commons.wicket.component.tabbable.PageTabLink;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;++@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) {+ return new RoleSelectionPanel(id, getMembership().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {++ @Override+ protected void onSelectOrdinary(AjaxRequestTarget target) {+ close();+ getMembership().setAdmin(false);+ GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());+ setResponsePage(getPageClass(), getPageParameters());+ Session.get().success("Role updated");+ }++ @Override+ protected void onSelectAdmin(AjaxRequestTarget target) {+ 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 BookmarkablePageLink<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 BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.javaindex f46509d773..655027f96e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java@@ -1,17 +1,17 @@-package com.gitplex.web.page.account.members;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.privilegesource.PrivilegeSourcePanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;import com.google.common.base.Preconditions;@SuppressWarnings("serial")diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.javaindex 6dc5ad696e..a3cf121db4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.members;+package com.gitplex.server.web.page.account.members;import java.util.ArrayList;import java.util.Collection;@@ -22,22 +22,22 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.json.JSONException;import org.json.JSONWriter;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.teamchoice.TeamChoiceResourceReference;-import com.gitplex.web.page.account.teams.TeamMemberListPage;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.gitplex.commons.wicket.component.select2.ChoiceProvider;import com.gitplex.commons.wicket.component.select2.Response;import com.gitplex.commons.wicket.component.select2.ResponseFiller;import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;+import com.gitplex.server.web.page.account.teams.TeamMemberListPage;@SuppressWarnings("serial")public class MemberTeamListPage extends MemberPage {@@ -131,9 +131,9 @@ public class MemberTeamListPage extends MemberPage {super.onInitialize();getSettings().setPlaceholder("Select team to join...");- getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.javaindex a09766db9a..f463a3d930 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.members;+package com.gitplex.server.web.page.account.members;import java.util.ArrayList;import java.util.Arrays;@@ -15,17 +15,17 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.teamchoice.TeamChoiceProvider;-import com.gitplex.web.component.teamchoice.TeamMultiChoice;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.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")diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.javaindex 62d4022aaf..9e70cb44dd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.members;+package com.gitplex.server.web.page.account.members;import java.util.ArrayList;import java.util.HashSet;@@ -11,15 +11,15 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.Constants;-import com.gitplex.web.component.accountchoice.AccountChoiceProvider;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.component.select2.Response;import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;public class NonMemberChoiceProvider extends AccountChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.java b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.javaindex 6b5ae8148c..ccaf75582d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.members;+package com.gitplex.server.web.page.account.members;import java.util.Collection;@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;public class NonMemberChoices extends Select2MultiChoice<Account> {@@ -23,9 +23,9 @@ public class NonMemberChoices extends Select2MultiChoice<Account> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose new members...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.javaindex 0538458a6d..092750c97e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java@@ -1,10 +1,10 @@-package com.gitplex.web.page.account.overview;+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.core.entity.Account;-import com.gitplex.web.page.account.AccountLayoutPage;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.page.account.AccountLayoutPage;@SuppressWarnings("serial")public class AccountOverviewPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.javaindex dd71d19fb1..e72386014c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.overview;+package com.gitplex.server.web.page.account.overview;import java.util.ArrayList;import java.util.Collections;@@ -18,13 +18,13 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.page.depot.file.DepotFilePage;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.javaindex d578a9e760..4fb969eba7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java@@ -1,20 +1,20 @@-package com.gitplex.web.page.account.overview;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class NewDepotPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.javaindex 23a88889e7..d6f8504dc6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java@@ -1,20 +1,20 @@-package com.gitplex.web.page.account.overview;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;@SuppressWarnings("serial")public class NewOrganizationPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.javaindex 636c8e41e1..bf534fba0a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java@@ -1,39 +1,39 @@-package com.gitplex.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.core.entity.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()));- }-+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.core.entity.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/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.javaindex cfa700f0ba..00ea36bd5f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java@@ -1,108 +1,108 @@-package com.gitplex.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.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.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;--import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.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 BookmarkablePageLink<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()));- }--}+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.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.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;++import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+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 BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.javaindex 727feed9b6..c1d679404e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java@@ -1,15 +1,15 @@-package com.gitplex.web.page.account.setting;+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.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.AccountTab;import com.gitplex.commons.wicket.component.tabbable.PageTab;import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.account.AccountTab;@SuppressWarnings("serial")public abstract class AccountSettingPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.javaindex 3e81057220..2a88cc2a34 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java@@ -1,117 +1,117 @@-package com.gitplex.web.page.account.setting;--import java.util.Map;--import org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException;-import org.apache.commons.fileupload.FileUploadException;-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;-import org.apache.wicket.markup.html.form.upload.FileUploadField;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.util.lang.Bytes;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.component.avatar.AvatarChanged;-import com.gitplex.commons.util.FileUtils;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--@SuppressWarnings("serial")-public class AvatarEditPage extends AccountSettingPage {-- private static final int MAX_IMAGE_SIZE = 2; // In megabytes-- public AvatarEditPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- final Form<?> form = new Form<Void>("form") {-- @Override- protected void onFileUploadException(FileUploadException e, Map<String, Object> model) {- if (e instanceof SizeLimitExceededException)- error("Upload must be less than " + FileUtils.byteCountToDisplaySize(getMaxSize().bytes()));- }-- };- add(form);- form.add(new NotificationPanel("feedback", form));- form.setOutputMarkupId(true);-- form.setMaxSize(Bytes.megabytes(MAX_IMAGE_SIZE));- form.setMultiPart(true);-- final FileUploadField uploadField = new FileUploadField("file");- form.add(uploadField);-- uploadField.add(new AjaxFormSubmitBehavior("change") {-- @Override- protected void onSubmit(AjaxRequestTarget target) {- super.onSubmit(target);- FileUpload upload = uploadField.getFileUpload();- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- avatarManager.useAvatar(accountModel.getObject(), upload);- form.success("Avatar has been updated.");- target.add(form);- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));- }-- @Override- protected void onError(AjaxRequestTarget target) {- super.onError(target);- target.add(form);- }-- });-- form.add(new AjaxLink<Void>("reset") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountModel.getObject().getAvatarUploadDate() != null);- }-- @Override- public void onClick(AjaxRequestTarget target) {- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- avatarManager.useAvatar(accountModel.getObject(), null);- form.success("Avatar has been reset");- target.add(form);- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));- }-- });-- add(new Label("maxSize", MAX_IMAGE_SIZE));-- setOutputMarkupId(true);- }-- @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));- }--}+package com.gitplex.server.web.page.account.setting;++import java.util.Map;++import org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException;+import org.apache.commons.fileupload.FileUploadException;+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;+import org.apache.wicket.markup.html.form.upload.FileUploadField;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.lang.Bytes;++import com.gitplex.commons.util.FileUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.avatar.AvatarManager;+import com.gitplex.server.web.component.avatar.AvatarChanged;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++@SuppressWarnings("serial")+public class AvatarEditPage extends AccountSettingPage {++ private static final int MAX_IMAGE_SIZE = 2; // In megabytes++ public AvatarEditPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ final Form<?> form = new Form<Void>("form") {++ @Override+ protected void onFileUploadException(FileUploadException e, Map<String, Object> model) {+ if (e instanceof SizeLimitExceededException)+ error("Upload must be less than " + FileUtils.byteCountToDisplaySize(getMaxSize().bytes()));+ }++ };+ add(form);+ form.add(new NotificationPanel("feedback", form));+ form.setOutputMarkupId(true);++ form.setMaxSize(Bytes.megabytes(MAX_IMAGE_SIZE));+ form.setMultiPart(true);++ final FileUploadField uploadField = new FileUploadField("file");+ form.add(uploadField);++ uploadField.add(new AjaxFormSubmitBehavior("change") {++ @Override+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);+ FileUpload upload = uploadField.getFileUpload();+ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ avatarManager.useAvatar(accountModel.getObject(), upload);+ form.success("Avatar has been updated.");+ target.add(form);+ send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));+ }++ @Override+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);+ target.add(form);+ }++ });++ form.add(new AjaxLink<Void>("reset") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accountModel.getObject().getAvatarUploadDate() != null);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);+ avatarManager.useAvatar(accountModel.getObject(), null);+ form.success("Avatar has been reset");+ target.add(form);+ send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, accountModel.getObject()));+ }++ });++ add(new Label("maxSize", MAX_IMAGE_SIZE));++ setOutputMarkupId(true);+ }++ @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));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.javaindex cfa0d72567..a94df8c8c9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.javaindex fa5d097031..d5af91eac3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPassword.java@@ -5,7 +5,7 @@** Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $*/-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.javaindex 4cb8bdd12c..130c4be1ca 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java@@ -1,13 +1,13 @@-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import org.apache.shiro.authc.credential.PasswordService;-import com.gitplex.web.page.account.AccountPage;import com.gitplex.commons.loader.AppLoader;import com.gitplex.commons.wicket.WicketUtils;+import com.gitplex.server.web.page.account.AccountPage;public class OldPasswordValidator implements ConstraintValidator<OldPassword, String> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.javaindex f0b50f738d..de2860ae3f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.javaindex 4d0b114a33..e30ce6a70e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import java.util.HashSet;import java.util.Set;@@ -8,13 +8,13 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.overview.AccountOverviewPage;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")public class PasswordEditPage extends AccountSettingPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.javaindex 36894ee0f5..907325d7ce 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.setting;+package com.gitplex.server.web.page.account.setting;import java.io.Serializable;import java.util.HashSet;@@ -11,14 +11,14 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;-import com.gitplex.web.page.account.AccountPage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;+import com.gitplex.server.web.page.account.AccountPage;@SuppressWarnings("serial")public class ProfileEditPage extends AccountSettingPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/avatar-edit.css b/server.web/src/main/java/com/gitplex/server/web/page/account/setting/avatar-edit.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/setting/avatar-edit.cssrename to server.web/src/main/java/com/gitplex/server/web/page/account/setting/avatar-edit.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.javaindex cd1ac06e1d..19a6d111d9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.tasks;+package com.gitplex.server.web.page.account.tasks;import java.util.ArrayList;import java.util.List;@@ -21,16 +21,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestTask;-import com.gitplex.web.Constants;-import com.gitplex.web.component.BranchLink;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.util.DateUtils;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.AbstractEntity;import com.gitplex.commons.hibernate.dao.Dao;@@ -38,6 +28,16 @@ import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.component.datatable.DefaultDataTable;import com.gitplex.commons.wicket.component.datatable.EntityDataProvider;import com.gitplex.commons.wicket.component.datatable.SelectionColumn;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestTask;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.BranchLink;+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.util.DateUtils;@SuppressWarnings("serial")public class TaskListPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.javaindex 5be9a6b767..3755b1a5c5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java@@ -1,15 +1,15 @@-package com.gitplex.web.page.account.teams;+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.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.web.Constants;-import com.gitplex.web.component.accountchoice.AccountChoiceProvider;import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;public class MemberChoiceProvider extends AccountChoiceProvider {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.javasimilarity index 66%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.javaindex f1e00985c0..727df38d14 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.teams;+package com.gitplex.server.web.page.account.teams;import java.util.Collection;@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.core.entity.Account;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;public class MemberChoices extends Select2MultiChoice<Account> {@@ -22,9 +22,9 @@ public class MemberChoices extends Select2MultiChoice<Account> {protected void onInitialize() {super.onInitialize();getSettings().setPlaceholder("Choose team members...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.accountChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.javaindex 0acc8ea11b..853d9f87b8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.teams;+package com.gitplex.server.web.page.account.teams;import java.io.Serializable;@@ -6,17 +6,17 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")public class NewTeamPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.javaindex 21f9eed117..272205bb17 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java@@ -1,450 +1,450 @@-package com.gitplex.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.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;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.modal.ModalLink;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--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) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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, Constants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add repository...");- getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.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;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<TeamAuthorization> item) {- TeamAuthorization authorization = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotTeamListPage.class,- DepotTeamListPage.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) {- return new GreaterPrivilegesPanel(id, item.getModel()) {-- @Override- protected void onClose(AjaxRequestTarget target) {- close(target);- }-- };- }-- });- 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) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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());- }--}+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.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;+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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;+import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;+import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamListPage;++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) {+ return new PrivilegeSelectionPanel(id, false, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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, Constants.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;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<TeamAuthorization> item) {+ TeamAuthorization authorization = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotTeamListPage.class,+ DepotTeamListPage.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) {+ return new GreaterPrivilegesPanel(id, item.getModel()) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close(target);+ }++ };+ }++ });+ 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) {+ return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.javaindex 54ed71f6ee..c76cef9e2d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.teams;+package com.gitplex.server.web.page.account.teams;import java.io.Serializable;@@ -8,17 +8,17 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")public class TeamEditPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.javaindex 96ffb7de39..e9e9f0ba50 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java@@ -1,202 +1,202 @@-package com.gitplex.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.BookmarkablePageLink;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;--import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;--@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 BookmarkablePageLink<>("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(), new TooltipConfig()));- 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();- }--}+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.BookmarkablePageLink;+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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.AvatarLink;+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.components.TooltipConfig;++@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 BookmarkablePageLink<>("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(), new TooltipConfig()));+ 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/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.javaindex aa49956a67..1b9bed9c18 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java@@ -1,327 +1,327 @@-package com.gitplex.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.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;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.members.MemberListPage;-import com.gitplex.web.page.account.members.MemberTeamListPage;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--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, Constants.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.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.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;- }-- }, Constants.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 BookmarkablePageLink<Void>("avatarLink",- MemberTeamListPage.class, params);- link.add(new Avatar("avatar", member));- item.add(link);-- link = new BookmarkablePageLink<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 BookmarkablePageLink<Void>("organizationMembers",- MemberListPage.class, MemberListPage.paramsOf(getAccount())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- });- }--}+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.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;+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.google.common.base.Preconditions;+import com.google.common.collect.Lists;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.TeamMembership;+import com.gitplex.server.core.manager.OrganizationMembershipManager;+import com.gitplex.server.core.manager.TeamMembershipManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.avatar.AvatarManager;+import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;+import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.page.account.members.MemberListPage;+import com.gitplex.server.web.page.account.members.MemberTeamListPage;++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, Constants.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;+ }++ }, Constants.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 BookmarkablePageLink<Void>("avatarLink",+ MemberTeamListPage.class, params);+ link.add(new Avatar("avatar", member));+ item.add(link);++ link = new BookmarkablePageLink<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 BookmarkablePageLink<Void>("organizationMembers",+ MemberListPage.class, MemberListPage.paramsOf(getAccount())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getAccount()));+ }++ });+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.html b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.java b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.javaindex 38f2b9697d..0b24a5be63 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.account.teams;+package com.gitplex.server.web.page.account.teams;import java.util.ArrayList;import java.util.List;@@ -14,19 +14,19 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Team;-import com.gitplex.core.manager.TeamManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;import com.google.common.base.Preconditions;import com.gitplex.commons.wicket.ConfirmOnClick;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;import com.gitplex.commons.wicket.component.tabbable.PageTab;import com.gitplex.commons.wicket.component.tabbable.PageTabLink;import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.manager.TeamManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")public abstract class TeamPage extends AccountLayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.javaindex 0cf07856de..5f3b8876d8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java@@ -1,51 +1,51 @@-package com.gitplex.web.page.admin;--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 com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.admin.account.NewUserPage;-import com.gitplex.web.page.admin.account.UserListPage;-import com.gitplex.web.page.layout.LayoutPage;-import com.gitplex.commons.wicket.component.tabbable.PageTab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@SuppressWarnings("serial")-public abstract class AdministrationPage extends LayoutPage {-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManageSystem();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));- tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));- 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));-- add(new Tabbable("tabs", tabs));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new AdministrationResourceReference()));- }-- @Override- protected Component newContextHead(String componentId) {- return new Label(componentId, "Server Administration");- }--}+package com.gitplex.server.web.page.admin;++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 com.gitplex.commons.wicket.component.tabbable.PageTab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.admin.account.NewUserPage;+import com.gitplex.server.web.page.admin.account.UserListPage;+import com.gitplex.server.web.page.layout.LayoutPage;++@SuppressWarnings("serial")+public abstract class AdministrationPage extends LayoutPage {++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManageSystem();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));+ tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));+ 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));++ add(new Tabbable("tabs", tabs));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AdministrationResourceReference()));+ }++ @Override+ protected Component newContextHead(String componentId) {+ return new Label(componentId, "Server Administration");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationResourceReference.javaindex db767b4d53..7da4a544e2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.javaindex 86bc02fd30..72a9c4f5c3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import org.apache.wicket.Component;import org.apache.wicket.model.Model;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.javaindex 40e3ad5458..3e4d9e868c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.javaindex 58f61e04d5..b6b68789da 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java@@ -1,9 +1,9 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import java.io.Serializable;-import com.gitplex.core.setting.BackupSetting;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.setting.BackupSetting;@Editablepublic class BackupSettingHolder implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.javaindex b028eae346..cd4ee8fe24 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import java.io.File;import java.io.IOException;@@ -8,12 +8,12 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.request.resource.AbstractResource;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.ConfigManager;import com.gitplex.commons.bootstrap.BootstrapUtils;import com.gitplex.commons.hibernate.PersistManager;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.ConfigManager;@SuppressWarnings("serial")public class DatabaseBackupPage extends AdministrationPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.javaindex a270ca9c98..252ab78a44 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java@@ -1,9 +1,9 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import java.io.Serializable;-import com.gitplex.core.setting.MailSetting;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.setting.MailSetting;@Editablepublic class MailSettingHolder implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.javaindex da2b7acde4..60c78e0862 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import java.io.Serializable;@@ -12,17 +12,17 @@ import org.apache.wicket.util.visit.IVisitor;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.MailManager;import com.google.common.collect.Sets;import com.gitplex.commons.wicket.behavior.testform.TestFormBehavior;import com.gitplex.commons.wicket.behavior.testform.TestResult;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.EditorChanged;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.MailManager;@SuppressWarnings("serial")public class MailSettingPage extends AdministrationPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.javaindex 67646bf348..470a3feca6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java@@ -1,11 +1,11 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import org.apache.wicket.markup.html.form.Form;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.setting.SecuritySetting;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.setting.SecuritySetting;@SuppressWarnings("serial")public class SecuritySettingPage extends AdministrationPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.javaindex 4cbb8cc9fe..e3a078ae72 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java@@ -1,11 +1,11 @@-package com.gitplex.web.page.admin;+package com.gitplex.server.web.page.admin;import org.apache.wicket.markup.html.form.Form;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.setting.SystemSetting;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.setting.SystemSetting;@SuppressWarnings("serial")public class SystemSettingPage extends AdministrationPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.javaindex 154834964f..84274bef1b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java@@ -1,15 +1,15 @@-package com.gitplex.web.page.admin.account;+package com.gitplex.server.web.page.admin.account;import org.apache.wicket.Session;import org.apache.wicket.markup.html.form.Form;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.page.admin.AdministrationPage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class NewUserPage extends AdministrationPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.javaindex 2d95737a61..01363a7f57 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/TypeSelectionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.admin.account;+package com.gitplex.server.web.page.admin.account;import javax.annotation.Nullable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.javaindex ebf3f8201f..ba67cde0f8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java@@ -1,183 +1,183 @@-package com.gitplex.web.page.admin.account;--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.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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.gitplex.web.page.admin.AdministrationPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--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 PageableListView<Account> accountsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer accountsContainer;-- private WebMarkupContainer noAccountsContainer;-- private String searchInput;-- @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(accountsContainer);- 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);- }-- });-- accountsContainer = new WebMarkupContainer("accounts") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!accountsView.getModelObject().isEmpty());- }-- };- accountsContainer.setOutputMarkupPlaceholderTag(true);- add(accountsContainer);-- accountsContainer.add(accountsView = new PageableListView<Account>("accounts", new LoadableDetachableModel<List<Account>>() {-- @Override- protected List<Account> load() {- List<Account> accounts = new ArrayList<>();- for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {- if (account.matches(searchInput) && !account.isOrganization()) {- accounts.add(account);- }- }- accounts.sort((account1, account2) -> account1.getDisplayName().compareTo(account2.getDisplayName()));- return accounts;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account account = item.getModelObject();-- item.add(new AvatarLink("avatarLink", item.getModelObject(), null));- item.add(new AccountLink("nameLink", item.getModelObject()));- item.add(new Label("email", account.getEmail()));-- item.add(new Link<Void>("setting") {-- @Override- public void onClick() {- PageParameters params = AccountPage.paramsOf(item.getModelObject());- setResponsePage(ProfileEditPage.class, params);- }-- });-- Long accountId = account.getId();- item.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- target.add(accountsContainer);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- @Override- protected Account getAccount() {- return GitPlex.getInstance(AccountManager.class).load(accountId);- }- };- }-- @Override- protected void onConfigure() {- super.onConfigure();-- Account account = item.getModelObject();- setVisible(SecurityUtils.canManage(account) && !account.equals(getLoginUser()));- }-- });- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- add(noAccountsContainer = new WebMarkupContainer("noAccounts") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsView.getModelObject().isEmpty());- }-- });- noAccountsContainer.setOutputMarkupPlaceholderTag(true);- }--}+package com.gitplex.server.web.page.admin.account;++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.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.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;+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 PageableListView<Account> accountsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer accountsContainer;++ private WebMarkupContainer noAccountsContainer;++ private String searchInput;++ @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(accountsContainer);+ 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);+ }++ });++ accountsContainer = new WebMarkupContainer("accounts") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!accountsView.getModelObject().isEmpty());+ }++ };+ accountsContainer.setOutputMarkupPlaceholderTag(true);+ add(accountsContainer);++ accountsContainer.add(accountsView = new PageableListView<Account>("accounts", new LoadableDetachableModel<List<Account>>() {++ @Override+ protected List<Account> load() {+ List<Account> accounts = new ArrayList<>();+ for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {+ if (account.matches(searchInput) && !account.isOrganization()) {+ accounts.add(account);+ }+ }+ accounts.sort((account1, account2) -> account1.getDisplayName().compareTo(account2.getDisplayName()));+ return accounts;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Account> item) {+ Account account = item.getModelObject();++ item.add(new AvatarLink("avatarLink", item.getModelObject(), null));+ item.add(new AccountLink("nameLink", item.getModelObject()));+ item.add(new Label("email", account.getEmail()));++ item.add(new Link<Void>("setting") {++ @Override+ public void onClick() {+ PageParameters params = AccountPage.paramsOf(item.getModelObject());+ setResponsePage(ProfileEditPage.class, params);+ }++ });++ Long accountId = account.getId();+ item.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ConfirmDeleteAccountModal(target) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ target.add(accountsContainer);+ target.add(pagingNavigator);+ target.add(noAccountsContainer);+ }++ @Override+ protected Account getAccount() {+ return GitPlex.getInstance(AccountManager.class).load(accountId);+ }+ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ Account account = item.getModelObject();+ setVisible(SecurityUtils.canManage(account) && !account.equals(getLoginUser()));+ }++ });+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accountsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ add(noAccountsContainer = new WebMarkupContainer("noAccounts") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accountsView.getModelObject().isEmpty());+ }++ });+ noAccountsContainer.setOutputMarkupPlaceholderTag(true);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/administration.css b/server.web/src/main/java/com/gitplex/server/web/page/admin/administration.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/admin/administration.cssrename to server.web/src/main/java/com/gitplex/server/web/page/admin/administration.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.javaindex e24ca6cb0b..9779e9d18a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.java@@ -1,12 +1,12 @@-package com.gitplex.web.page.base;+package com.gitplex.server.web.page.base;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;-import com.gitplex.web.page.base.fontext.FontExtResourceReference;import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;+import com.gitplex.server.web.page.base.fontext.FontExtResourceReference;public class BaseCssResourceReference extends CommonDependentCssResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.javaindex 1e3346927a..f7a4942a38 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.base;+package com.gitplex.server.web.page.base;import java.util.List;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentResourceReference.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentResourceReference.javaindex fd0214bd7d..7c277ba74b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseDependentResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.base;+package com.gitplex.server.web.page.base;import java.util.ArrayList;import java.util.List;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.html b/server.web/src/main/java/com/gitplex/server/web/page/base/BasePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/base/BasePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.java b/server.web/src/main/java/com/gitplex/server/web/page/base/BasePage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/BasePage.javaindex 0be70d8cd1..0cf83246ac 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/BasePage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.base;+package com.gitplex.server.web.page.base;import javax.annotation.Nullable;@@ -12,12 +12,12 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.page.init.ServerInitPage;-import com.gitplex.web.page.security.LoginPage;import com.gitplex.commons.wicket.page.CommonPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.page.init.ServerInitPage;+import com.gitplex.server.web.page.security.LoginPage;@SuppressWarnings("serial")public abstract class BasePage extends CommonPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.javaindex 7785e982ef..7e52c0bef9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.base;+package com.gitplex.server.web.page.base;import java.util.List;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/apple-touch-icon.png b/server.web/src/main/java/com/gitplex/server/web/page/base/apple-touch-icon.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/apple-touch-icon.pngrename to server.web/src/main/java/com/gitplex/server/web/page/base/apple-touch-icon.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/base.css b/server.web/src/main/java/com/gitplex/server/web/page/base/base.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/base.cssrename to server.web/src/main/java/com/gitplex/server/web/page/base/base.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/base.js b/server.web/src/main/java/com/gitplex/server/web/page/base/base.jssimilarity index 63%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/base.jsrename to server.web/src/main/java/com/gitplex/server/web/page/base/base.jsindex c7b7e05998..c8e85f725d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/base.js+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/base.js@@ -1,4 +1,4 @@-gitplex.mouseState = {+gitplex.server.mouseState = {pressed: false,moved: false};@@ -6,24 +6,24 @@ gitplex.mouseState = {$(document).ready(function() {$(window).load(function() {$(document).mousedown(function() {- gitplex.mouseState.pressed = true;- gitplex.mouseState.moved = false;+ gitplex.server.mouseState.pressed = true;+ gitplex.server.mouseState.moved = false;});$(document).mouseup(function() {- gitplex.mouseState.pressed = false;- gitplex.mouseState.moved = false;+ gitplex.server.mouseState.pressed = false;+ gitplex.server.mouseState.moved = false;});$(document).mousemove(function(e) {// IE fires mouse move event after mouse click sometimes, so we check// if mouse is really moved hereif (e.clientX != self.clientX || e.clientY != self.clientY) {- gitplex.mouseState.moved = true;+ gitplex.server.mouseState.moved = true;self.clientX = e.clientX;self.clientY = e.clientY;}});$(document).scroll(function() {- gitplex.mouseState.moved = false;+ gitplex.server.mouseState.moved = false;});});});diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/favicon.ico b/server.web/src/main/java/com/gitplex/server/web/page/base/favicon.icosimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/favicon.icorename to server.web/src/main/java/com/gitplex/server/web/page/base/favicon.icodiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/FontExtResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/FontExtResourceReference.javaindex 631978c333..e55681afe3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/FontExtResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.base.fontext;+package com.gitplex.server.web.page.base.fontext;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/cheatsheet.html b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/cheatsheet.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/cheatsheet.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/cheatsheet.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.css b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.cssrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.eot b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.eotsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.eotrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.eotdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.svg b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.svgsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.svgrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.svgdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.ttf b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.ttfsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.ttfrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.ttfdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.woff b/server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.woffsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.woffrename to server.web/src/main/java/com/gitplex/server/web/page/base/fontext/fontext.woffdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.javaindex 149853c20f..82e261390c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java@@ -1,220 +1,220 @@-package com.gitplex.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.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-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.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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.web.page.depot.comments.DepotCommentsPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.moreinfo.MoreInfoPanel;-import com.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;-import com.gitplex.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.web.page.depot.tags.DepotTagsPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.tabbable.PageTab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@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, DepotFilePage.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("Code Comments"), "fa fa-fw fa-commenting",- 0, DepotCommentsPage.class, DepotCommentsPage.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()));- }-- @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 BookmarkablePageLink<>("accountLink",- AccountOverviewPage.class, AccountOverviewPage.paramsOf(getAccount()));- accountLink.add(new Label("accountName", getAccount().getName()));- fragment.add(accountLink);-- Link<Void> depotLink = new BookmarkablePageLink<>("depotLink",- DepotFilePage.class, DepotFilePage.paramsOf(getDepot()));- depotLink.add(new Label("depotName", getDepot().getName()));- fragment.add(depotLink);- fragment.add(new DropdownLink("depotMoreInfo") {-- @Override- protected Component newContent(String id) {- return new MoreInfoPanel(id, depotModel) {-- @Override- protected void onPromptForkOption(AjaxRequestTarget target) {- close();- }-- };- }-- });- return fragment;- }--}+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.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+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.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.google.common.base.Preconditions;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.tabbable.PageTab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.page.account.AccountPage;+import com.gitplex.server.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;+import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;+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.file.DepotFilePage;+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;++@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, DepotFilePage.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("Code Comments"), "fa fa-fw fa-commenting",+ 0, DepotCommentsPage.class, DepotCommentsPage.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()));+ }++ @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 BookmarkablePageLink<>("accountLink",+ AccountOverviewPage.class, AccountOverviewPage.paramsOf(getAccount()));+ accountLink.add(new Label("accountName", getAccount().getName()));+ fragment.add(accountLink);++ Link<Void> depotLink = new BookmarkablePageLink<>("depotLink",+ DepotFilePage.class, DepotFilePage.paramsOf(getDepot()));+ depotLink.add(new Label("depotName", getDepot().getName()));+ fragment.add(depotLink);+ fragment.add(new DropdownLink("depotMoreInfo") {++ @Override+ protected Component newContent(String id) {+ return new MoreInfoPanel(id, depotModel) {++ @Override+ protected void onPromptForkOption(AjaxRequestTarget target) {+ close();+ }++ };+ }++ });+ return fragment;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.javaindex 21635e234d..1d23e45105 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot;+package com.gitplex.server.web.page.depot;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class DepotResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.javasimilarity index 98%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.javaindex 8bd6656291..cbc43c52de 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot;+package com.gitplex.server.web.page.depot;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.javaindex 283979b94f..7fa051eea4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot;+package com.gitplex.server.web.page.depot;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.javaindex 31462107ee..0dff457999 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot;+package com.gitplex.server.web.page.depot;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -7,8 +7,8 @@ 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.core.entity.Depot;-import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class NoBranchesPage extends DepotPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.javaindex 60c79bc1c6..a4abe1ee22 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot;+package com.gitplex.server.web.page.depot;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.javaindex 962806334e..52289b29b0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/AheadBehind.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.branches;+package com.gitplex.server.web.page.depot.branches;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javaindex 04fce4b65e..f564a4391f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.branches;+package com.gitplex.server.web.page.depot.branches;import java.io.IOException;import java.io.Serializable;@@ -46,28 +46,6 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.BranchWatch;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.manager.BranchWatchManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.branchchoice.BranchChoiceProvider;-import com.gitplex.web.component.branchchoice.BranchSingleChoice;-import com.gitplex.web.component.contributorpanel.ContributorPanel;-import com.gitplex.web.component.revisionpicker.RevisionPicker;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.SearchOption;-import com.gitplex.web.page.depot.pullrequest.requestlist.SortOption;-import com.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Status;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.RefInfo;@@ -75,6 +53,28 @@ import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.BranchWatch;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.manager.BranchWatchManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;+import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;+import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+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.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+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.SortOption;+import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption.Status;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.javaindex 1822f1ddc1..bd7b819d7f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.branches;+package com.gitplex.server.web.page.depot.branches;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/ajax-indicator.gif b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/ajax-indicator.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/ajax-indicator.gifrename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/ajax-indicator.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/depot-branches.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/branches/depot-branches.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/depot-branches.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/branches/depot-branches.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.javasimilarity index 70%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.javaindex 8665a607cf..4cfcb94705 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java@@ -1,17 +1,17 @@-package com.gitplex.web.page.depot.comments;+package com.gitplex.server.web.page.depot.comments;import org.apache.wicket.RestartResponseException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.CodeCommentRelation;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.CodeCommentRelation;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class CodeCommentPage extends DepotPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.javaindex 811f734019..66cbdbc8f9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.comments;+package com.gitplex.server.web.page.depot.comments;import java.util.List;@@ -7,13 +7,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.CodeCommentInfoManager;-import com.gitplex.web.component.comment.CodeCommentAware;-import com.gitplex.web.component.comment.CodeCommentFilter;-import com.gitplex.web.component.comment.CodeCommentListPanel;-import com.gitplex.web.page.depot.DepotPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.CodeCommentInfoManager;+import com.gitplex.server.web.component.comment.CodeCommentAware;+import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.component.comment.CodeCommentListPanel;+import com.gitplex.server.web.page.depot.DepotPage;@SuppressWarnings("serial")public class DepotCommentsPage extends DepotPage implements CodeCommentAware {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.javaindex 372e2a4ff2..c3306ecec1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.comments;+package com.gitplex.server.web.page.depot.comments;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/depot-comments.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/comments/depot-comments.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/depot-comments.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/comments/depot-comments.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javaindex 89dc3fa795..dda27e5550 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java@@ -1,544 +1,544 @@-package com.gitplex.web.page.depot.commit;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;-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.BookmarkablePageLink;-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.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.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.web.component.avatar.ContributorAvatars;-import com.gitplex.web.component.commitmessage.CommitMessageLabel;-import com.gitplex.web.component.contributorpanel.ContributorPanel;-import com.gitplex.web.component.createbranch.CreateBranchLink;-import com.gitplex.web.component.createtag.CreateTagLink;-import com.gitplex.web.component.diff.revision.CommentSupport;-import com.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.tags.DepotTagsPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.RefInfo;-import com.gitplex.commons.lang.diff.WhitespaceOption;-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;--@SuppressWarnings("serial")-public class CommitDetailPage extends DepotPage implements CommentSupport {-- private static final String PARAM_REVISION = "revision";-- // make sure to use a different value from wicket:id according to wicket bug:- // https://issues.apache.org/jira/browse/WICKET-6069- private static final String PARAM_COMPARE_WITH = "compare-with";-- private static final String PARAM_BLAME_FILE = "blame-file";-- private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";-- private static final String PARAM_PATH_FILTER = "path-filter";-- private static final String PARAM_COMMENT = "comment";-- private static final String PARAM_MARK = "mark";-- private State state;-- private ObjectId resolvedRevision;-- private ObjectId resolvedCompareWith;-- private RevisionDiffPanel revisionDiff;-- public CommitDetailPage(PageParameters params) {- super(params);-- state = new State(params);- resolvedRevision = getDepot().getRevCommit(state.revision).copy();- if (state.compareWith != null)- resolvedCompareWith = getDepot().getRevCommit(state.compareWith).copy();- }-- private RevCommit getCommit() {- return getDepot().getRevCommit(state.revision);- }-- private List<RevCommit> getParents() {- List<RevCommit> parents = new ArrayList<>();- for (RevCommit parent: getCommit().getParents())- parents.add(parent);- return parents;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));-- DepotFilePage.State browseState = new DepotFilePage.State();- browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));-- add(new CreateBranchLink("createBranch", depotModel, state.revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String branch) {- setResponsePage(DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot()));- }-- });-- add(new CreateTagLink("createTag", depotModel, state.revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String tag) {- setResponsePage(DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot()));- }-- });-- String message = GitUtils.getDetailMessage(getCommit());- if (message != null) {- add(new CommitMessageLabel("detail", depotModel, Model.of(message)));- } else {- add(new WebMarkupContainer("detail").setVisible(false));- }-- add(new AjaxLazyLoadPanel("refs") {-- @Override- public Component getLazyLoadComponent(String markupId) {- Fragment fragment = new Fragment(markupId, "refsFrag", CommitDetailPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- String script = String.format("gitplex.commitdetail.initRefs('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- fragment.add(new ListView<RefInfo>("refs", new LoadableDetachableModel<List<RefInfo>>() {-- @Override- protected List<RefInfo> load() {- Set<ObjectId> descendants = GitPlex.getInstance(CommitInfoManager.class)- .getDescendants(getDepot(), getCommit().getId());- descendants.add(getCommit().getId());-- List<RefInfo> refs = new ArrayList<>();- refs.addAll(getDepot().getBranches());- refs.addAll(getDepot().getTags());- return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());- }-- }) {-- @Override- protected void populateItem(ListItem<RefInfo> item) {- String ref = item.getModelObject().getRef().getName();- String branch = GitUtils.ref2branch(ref);- if (branch != null) {- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent.revision = branch;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.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));- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent.revision = tag;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.getObject(), state));- link.add(new Label("label", tag));- item.add(link);- item.add(AttributeAppender.append("class", "tag"));- }- }-- });- return fragment;- }-- });-- add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));- add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));-- add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));- add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));-- newParentsContainer(null);-- if (getCommit().getParentCount() != 0) {- newRevisionDiff(null);- } else {- add(new WebMarkupContainer("revisionDiff").setVisible(false));- }- }-- private void newParentsContainer(@Nullable AjaxRequestTarget target) {- WebMarkupContainer parentsContainer = new WebMarkupContainer("parents");- parentsContainer.setOutputMarkupId(true);- if (getParents().size() == 1) {- RevCommit parent = getParents().get(0);- State newState = new State();- newState.revision = parent.name();- newState.whitespaceOption = state.whitespaceOption;- newState.pathFilter = state.pathFilter;- Link<Void> link = new BookmarkablePageLink<Void>("parent", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));- link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));- parentsContainer.add(link);- parentsContainer.add(new WebMarkupContainer("parents").setVisible(false));- } else {- parentsContainer.add(new WebMarkupContainer("parent").setVisible(false));- parentsContainer.add(new Label("count", getParents().size() + " parents"));- parentsContainer.add(new ListView<RevCommit>("parents", new LoadableDetachableModel<List<RevCommit>>() {-- @Override- protected List<RevCommit> load() {- return getParents();- }-- }) {-- @Override- protected void populateItem(ListItem<RevCommit> item) {- RevCommit parent = item.getModelObject();-- State newState = new State();- newState.revision = parent.name();- newState.whitespaceOption = state.whitespaceOption;- newState.pathFilter = state.pathFilter;-- Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));- link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));- item.add(link);-- item.add(new AjaxLink<Void>("diff") {-- @Override- public void onClick(AjaxRequestTarget target) {- state.compareWith = item.getModelObject().name();- resolvedCompareWith = item.getModelObject().copy();-- target.add(parentsContainer);- newRevisionDiff(target);- pushState(target);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (item.getModelObject().equals(getCompareWith()))- add(AttributeAppender.append("class", "active"));- }-- });- }-- });- }- if (target != null) {- replace(parentsContainer);- target.add(parentsContainer);- } else {- add(parentsContainer);- }- }-- private ObjectId getCompareWith() {- List<RevCommit> parents = getParents();- if (resolvedCompareWith != null) {- if (parents.contains(resolvedCompareWith))- return resolvedCompareWith;- else- return parents.get(0);- } else {- return parents.get(0);- }- }-- private void newRevisionDiff(@Nullable AjaxRequestTarget target) {- IModel<String> blameModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.blameFile;- }-- @Override- public void setObject(String object) {- state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<String> pathFilterModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.pathFilter;- }-- @Override- public void setObject(String object) {- state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {-- @Override- public void detach() {- }-- @Override- public WhitespaceOption getObject() {- return state.whitespaceOption;- }-- @Override- public void setObject(WhitespaceOption object) {- state.whitespaceOption = object;- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- newParentsContainer(target);- pushState(target);- }-- };- revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,- Model.of((PullRequest)null), getCompareWith().name(), state.revision,- pathFilterModel, whitespaceOptionModel, blameModel, this);- revisionDiff.setOutputMarkupId(true);- if (target != null) {- replace(revisionDiff);- target.add(revisionDiff);- } else {- add(revisionDiff);- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));- }-- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);- params.set(PARAM_REVISION, state.revision);- if (state.compareWith != null)- params.set(PARAM_COMPARE_WITH, state.compareWith);- if (state.whitespaceOption != WhitespaceOption.DEFAULT)- params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());- if (state.pathFilter != null)- params.set(PARAM_PATH_FILTER, state.pathFilter);- if (state.blameFile != null)- params.set(PARAM_BLAME_FILE, state.blameFile);- if (state.commentId != null)- params.set(PARAM_COMMENT, state.commentId);- if (state.mark != null)- params.set(PARAM_MARK, state.mark.toString());- return params;- }-- public static PageParameters paramsOf(Depot depot, 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));- }-- private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(CommitDetailPage.class, params);- pushState(target, url.toString(), state);- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);-- state = (State) data;- newRevisionDiff(target);- }-- public static class State implements Serializable {-- private static final long serialVersionUID = 1L;-- public String revision;-- @Nullable- public String compareWith;-- @Nullable- public Long commentId;-- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;-- @Nullable- public String pathFilter;-- @Nullable- public String blameFile;-- @Nullable- public CommentPos mark;-- public State() {- }-- public State(PageParameters params) {- revision = GitUtils.normalizePath(params.get(PARAM_REVISION).toString());- compareWith = params.get(PARAM_COMPARE_WITH).toString();- whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());- pathFilter = params.get(PARAM_PATH_FILTER).toString();- blameFile = params.get(PARAM_BLAME_FILE).toString();- commentId = params.get(PARAM_COMMENT).toOptionalLong();- mark = CommentPos.fromString(params.get(PARAM_MARK).toString());- }-- }-- @Override- public CommentPos getMark() {- return state.mark;- }-- @Override- public String getMarkUrl(CommentPos mark) {- State markState = new State();- markState.mark = mark;- markState.whitespaceOption = state.whitespaceOption;- markState.compareWith = state.compareWith;- markState.pathFilter = state.pathFilter;- markState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), markState)).toString();- }-- @Override- public String getCommentUrl(CodeComment comment) {- State commentState = new State();- String compareWith = getCompareWith().name();- commentState.mark = comment.getCommentPos();- commentState.commentId = comment.getId();- commentState.whitespaceOption = state.whitespaceOption;- commentState.compareWith = compareWith;- commentState.pathFilter = state.pathFilter;- commentState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), commentState)).toString();- }-- @Override- public CodeComment getOpenComment() {- if (state.commentId != null)- return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);- else- return null;- }-- @Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- state.commentId = comment.getId();- state.mark = comment.getCommentPos();- } else {- state.commentId = null;- state.mark = null;- }- pushState(target);- }-- @Override- public void onMark(AjaxRequestTarget target, CommentPos mark) {- state.mark = mark;- pushState(target);- }-- @Override- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {- state.commentId = null;- state.mark = mark;- pushState(target);- }-- /*- * In case we are on a branch, this operation makes sure that the branch resolves- * to a certain commit during the life cycle of our page, unless the page is- * refreshed. This can avoid the issue that displayed file content and subsequent- * operations encounters different commit if someone commits to the branch while- * we are staying on the page.- */- @Override- protected Map<String, ObjectId> getObjectIdCache() {- Map<String, ObjectId> objectIdCache = new HashMap<>();- if (resolvedRevision != null)- objectIdCache.put(state.revision, resolvedRevision);- if (resolvedCompareWith != null)- objectIdCache.put(state.compareWith, resolvedCompareWith);- return objectIdCache;- }-- @Override- public String getAnchor() {- return null;- }--}+package com.gitplex.server.web.page.depot.commit;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;+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.BookmarkablePageLink;+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.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.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import com.google.common.base.Preconditions;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.RefInfo;+import com.gitplex.commons.lang.diff.WhitespaceOption;+import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.web.component.avatar.ContributorAvatars;+import com.gitplex.server.web.component.commitmessage.CommitMessageLabel;+import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+import com.gitplex.server.web.component.createbranch.CreateBranchLink;+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.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.tags.DepotTagsPage;++@SuppressWarnings("serial")+public class CommitDetailPage extends DepotPage implements CommentSupport {++ private static final String PARAM_REVISION = "revision";++ // make sure to use a different value from wicket:id according to wicket bug:+ // https://issues.apache.org/jira/browse/WICKET-6069+ private static final String PARAM_COMPARE_WITH = "compare-with";++ private static final String PARAM_BLAME_FILE = "blame-file";++ private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";++ private static final String PARAM_PATH_FILTER = "path-filter";++ private static final String PARAM_COMMENT = "comment";++ private static final String PARAM_MARK = "mark";++ private State state;++ private ObjectId resolvedRevision;++ private ObjectId resolvedCompareWith;++ private RevisionDiffPanel revisionDiff;++ public CommitDetailPage(PageParameters params) {+ super(params);++ state = new State(params);+ resolvedRevision = getDepot().getRevCommit(state.revision).copy();+ if (state.compareWith != null)+ resolvedCompareWith = getDepot().getRevCommit(state.compareWith).copy();+ }++ private RevCommit getCommit() {+ return getDepot().getRevCommit(state.revision);+ }++ private List<RevCommit> getParents() {+ List<RevCommit> parents = new ArrayList<>();+ for (RevCommit parent: getCommit().getParents())+ parents.add(parent);+ return parents;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));++ DepotFilePage.State browseState = new DepotFilePage.State();+ browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);+ PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);+ add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));++ add(new CreateBranchLink("createBranch", depotModel, state.revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String branch) {+ setResponsePage(DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot()));+ }++ });++ add(new CreateTagLink("createTag", depotModel, state.revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String tag) {+ setResponsePage(DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot()));+ }++ });++ String message = GitUtils.getDetailMessage(getCommit());+ if (message != null) {+ add(new CommitMessageLabel("detail", depotModel, Model.of(message)));+ } else {+ add(new WebMarkupContainer("detail").setVisible(false));+ }++ add(new AjaxLazyLoadPanel("refs") {++ @Override+ public Component getLazyLoadComponent(String markupId) {+ Fragment fragment = new Fragment(markupId, "refsFrag", CommitDetailPage.this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("gitplex.server.commitdetail.initRefs('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };+ fragment.add(new ListView<RefInfo>("refs", new LoadableDetachableModel<List<RefInfo>>() {++ @Override+ protected List<RefInfo> load() {+ Set<ObjectId> descendants = GitPlex.getInstance(CommitInfoManager.class)+ .getDescendants(getDepot(), getCommit().getId());+ descendants.add(getCommit().getId());++ List<RefInfo> refs = new ArrayList<>();+ refs.addAll(getDepot().getBranches());+ refs.addAll(getDepot().getTags());+ return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());+ }++ }) {++ @Override+ protected void populateItem(ListItem<RefInfo> item) {+ String ref = item.getModelObject().getRef().getName();+ String branch = GitUtils.ref2branch(ref);+ if (branch != null) {+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent.revision = branch;+ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,+ DepotFilePage.paramsOf(depotModel.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));+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent.revision = tag;+ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,+ DepotFilePage.paramsOf(depotModel.getObject(), state));+ link.add(new Label("label", tag));+ item.add(link);+ item.add(AttributeAppender.append("class", "tag"));+ }+ }++ });+ return fragment;+ }++ });++ add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));+ add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));++ add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));+ add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));++ newParentsContainer(null);++ if (getCommit().getParentCount() != 0) {+ newRevisionDiff(null);+ } else {+ add(new WebMarkupContainer("revisionDiff").setVisible(false));+ }+ }++ private void newParentsContainer(@Nullable AjaxRequestTarget target) {+ WebMarkupContainer parentsContainer = new WebMarkupContainer("parents");+ parentsContainer.setOutputMarkupId(true);+ if (getParents().size() == 1) {+ RevCommit parent = getParents().get(0);+ State newState = new State();+ newState.revision = parent.name();+ newState.whitespaceOption = state.whitespaceOption;+ newState.pathFilter = state.pathFilter;+ Link<Void> link = new BookmarkablePageLink<Void>("parent", CommitDetailPage.class,+ paramsOf(depotModel.getObject(), newState));+ link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));+ parentsContainer.add(link);+ parentsContainer.add(new WebMarkupContainer("parents").setVisible(false));+ } else {+ parentsContainer.add(new WebMarkupContainer("parent").setVisible(false));+ parentsContainer.add(new Label("count", getParents().size() + " parents"));+ parentsContainer.add(new ListView<RevCommit>("parents", new LoadableDetachableModel<List<RevCommit>>() {++ @Override+ protected List<RevCommit> load() {+ return getParents();+ }++ }) {++ @Override+ protected void populateItem(ListItem<RevCommit> item) {+ RevCommit parent = item.getModelObject();++ State newState = new State();+ newState.revision = parent.name();+ newState.whitespaceOption = state.whitespaceOption;+ newState.pathFilter = state.pathFilter;++ Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class,+ paramsOf(depotModel.getObject(), newState));+ link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));+ item.add(link);++ item.add(new AjaxLink<Void>("diff") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ state.compareWith = item.getModelObject().name();+ resolvedCompareWith = item.getModelObject().copy();++ target.add(parentsContainer);+ newRevisionDiff(target);+ pushState(target);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (item.getModelObject().equals(getCompareWith()))+ add(AttributeAppender.append("class", "active"));+ }++ });+ }++ });+ }+ if (target != null) {+ replace(parentsContainer);+ target.add(parentsContainer);+ } else {+ add(parentsContainer);+ }+ }++ private ObjectId getCompareWith() {+ List<RevCommit> parents = getParents();+ if (resolvedCompareWith != null) {+ if (parents.contains(resolvedCompareWith))+ return resolvedCompareWith;+ else+ return parents.get(0);+ } else {+ return parents.get(0);+ }+ }++ private void newRevisionDiff(@Nullable AjaxRequestTarget target) {+ IModel<String> blameModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.blameFile;+ }++ @Override+ public void setObject(String object) {+ state.blameFile = object;+ pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ }++ };+ IModel<String> pathFilterModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.pathFilter;+ }++ @Override+ public void setObject(String object) {+ state.pathFilter = object;+ pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ }++ };+ IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {++ @Override+ public void detach() {+ }++ @Override+ public WhitespaceOption getObject() {+ return state.whitespaceOption;+ }++ @Override+ public void setObject(WhitespaceOption object) {+ state.whitespaceOption = object;+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ newParentsContainer(target);+ pushState(target);+ }++ };+ revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,+ Model.of((PullRequest)null), getCompareWith().name(), state.revision,+ pathFilterModel, whitespaceOptionModel, blameModel, this);+ revisionDiff.setOutputMarkupId(true);+ if (target != null) {+ replace(revisionDiff);+ target.add(revisionDiff);+ } else {+ add(revisionDiff);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));+ }++ public static PageParameters paramsOf(Depot depot, State state) {+ PageParameters params = paramsOf(depot);+ params.set(PARAM_REVISION, state.revision);+ if (state.compareWith != null)+ params.set(PARAM_COMPARE_WITH, state.compareWith);+ if (state.whitespaceOption != WhitespaceOption.DEFAULT)+ params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());+ if (state.pathFilter != null)+ params.set(PARAM_PATH_FILTER, state.pathFilter);+ if (state.blameFile != null)+ params.set(PARAM_BLAME_FILE, state.blameFile);+ if (state.commentId != null)+ params.set(PARAM_COMMENT, state.commentId);+ if (state.mark != null)+ params.set(PARAM_MARK, state.mark.toString());+ return params;+ }++ public static PageParameters paramsOf(Depot depot, 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));+ }++ private void pushState(AjaxRequestTarget target) {+ PageParameters params = paramsOf(getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(CommitDetailPage.class, params);+ pushState(target, url.toString(), state);+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);++ state = (State) data;+ newRevisionDiff(target);+ }++ public static class State implements Serializable {++ private static final long serialVersionUID = 1L;++ public String revision;++ @Nullable+ public String compareWith;++ @Nullable+ public Long commentId;++ public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;++ @Nullable+ public String pathFilter;++ @Nullable+ public String blameFile;++ @Nullable+ public CommentPos mark;++ public State() {+ }++ public State(PageParameters params) {+ revision = GitUtils.normalizePath(params.get(PARAM_REVISION).toString());+ compareWith = params.get(PARAM_COMPARE_WITH).toString();+ whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());+ pathFilter = params.get(PARAM_PATH_FILTER).toString();+ blameFile = params.get(PARAM_BLAME_FILE).toString();+ commentId = params.get(PARAM_COMMENT).toOptionalLong();+ mark = CommentPos.fromString(params.get(PARAM_MARK).toString());+ }++ }++ @Override+ public CommentPos getMark() {+ return state.mark;+ }++ @Override+ public String getMarkUrl(CommentPos mark) {+ State markState = new State();+ markState.mark = mark;+ markState.whitespaceOption = state.whitespaceOption;+ markState.compareWith = state.compareWith;+ markState.pathFilter = state.pathFilter;+ markState.revision = resolvedRevision.name();+ return urlFor(CommitDetailPage.class, paramsOf(getDepot(), markState)).toString();+ }++ @Override+ public String getCommentUrl(CodeComment comment) {+ State commentState = new State();+ String compareWith = getCompareWith().name();+ commentState.mark = comment.getCommentPos();+ commentState.commentId = comment.getId();+ commentState.whitespaceOption = state.whitespaceOption;+ commentState.compareWith = compareWith;+ commentState.pathFilter = state.pathFilter;+ commentState.revision = resolvedRevision.name();+ return urlFor(CommitDetailPage.class, paramsOf(getDepot(), commentState)).toString();+ }++ @Override+ public CodeComment getOpenComment() {+ if (state.commentId != null)+ return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);+ else+ return null;+ }++ @Override+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {+ if (comment != null) {+ state.commentId = comment.getId();+ state.mark = comment.getCommentPos();+ } else {+ state.commentId = null;+ state.mark = null;+ }+ pushState(target);+ }++ @Override+ public void onMark(AjaxRequestTarget target, CommentPos mark) {+ state.mark = mark;+ pushState(target);+ }++ @Override+ public void onAddComment(AjaxRequestTarget target, CommentPos mark) {+ state.commentId = null;+ state.mark = mark;+ pushState(target);+ }++ /*+ * In case we are on a branch, this operation makes sure that the branch resolves+ * to a certain commit during the life cycle of our page, unless the page is+ * refreshed. This can avoid the issue that displayed file content and subsequent+ * operations encounters different commit if someone commits to the branch while+ * we are staying on the page.+ */+ @Override+ protected Map<String, ObjectId> getObjectIdCache() {+ Map<String, ObjectId> objectIdCache = new HashMap<>();+ if (resolvedRevision != null)+ objectIdCache.put(state.revision, resolvedRevision);+ if (resolvedCompareWith != null)+ objectIdCache.put(state.compareWith, resolvedCompareWith);+ return objectIdCache;+ }++ @Override+ public String getAnchor() {+ return null;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.javaindex e0f0d0b890..396e119266 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.commit;+package com.gitplex.server.web.page.depot.commit;import java.util.List;@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.oneline.OnelineResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class CommitDetailResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitQuery.g4 b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQuery.g4similarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitQuery.g4rename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitQuery.g4diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javaindex d9ad894299..e226aeaf77 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java@@ -1,657 +1,657 @@-package com.gitplex.web.page.depot.commit;--import java.io.IOException;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;-import java.util.regex.Pattern;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.ANTLRInputStream;-import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.tree.ParseTreeWalker;-import org.apache.wicket.Component;-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.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.CssHeaderItem;-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.Form;-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.RepeatingView;-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.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.joda.time.DateTime;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.java.JavaEscape;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.DepotAndRevision;-import com.gitplex.core.manager.WorkExecutor;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.ContributorAvatars;-import com.gitplex.web.component.commitgraph.CommitGraphResourceReference;-import com.gitplex.web.component.commitgraph.CommitGraphUtils;-import com.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;-import com.gitplex.web.component.contributorpanel.ContributorPanel;-import com.gitplex.web.model.CommitRefsModel;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.google.common.base.Optional;-import com.google.common.base.Throwables;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.command.RevListCommand;-import com.gitplex.commons.util.StringUtils;-import com.gitplex.commons.util.concurrent.PrioritizedCallable;-import com.gitplex.commons.wicket.ajaxlistener.IndicateLoadingListener;-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;-import com.gitplex.web.page.depot.commit.CommitQueryLexer;-import com.gitplex.web.page.depot.commit.CommitQueryParser;-import com.gitplex.web.page.depot.commit.CommitQueryParser.CriteriaContext;-import com.gitplex.web.page.depot.commit.CommitQueryParser.QueryContext;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import jersey.repackaged.com.google.common.collect.Lists;--@SuppressWarnings("serial")-public class DepotCommitsPage extends DepotPage {-- private static final Logger logger = LoggerFactory.getLogger(DepotCommitsPage.class);-- private static final int LOG_PRIORITY = 1;-- private static final String GIT_ERROR_START = "Command error output: ";-- private static final int COUNT = 50;-- private static final int MAX_STEPS = 50;-- private static final String PARAM_COMPARE_WITH = "compareWith";-- private static final String PARAM_QUERY = "query";-- private static final String PARAM_STEP = "step";-- private State state = new State();-- private boolean hasMore;-- private WebMarkupContainer body;-- private Form<?> queryForm;-- private RepeatingView commitsView;-- private NotificationPanel feedback;-- private WebMarkupContainer foot;-- private IModel<Commits> commitsModel = new LoadableDetachableModel<Commits>() {-- @Override- protected Commits load() {- Commits commits = new Commits();-- List<String> commitHashes;- try {- RevListCommand command = new RevListCommand(getDepot().getDirectory());- command.ignoreCase(true);- state.applyTo(command);- commitHashes = GitPlex.getInstance(WorkExecutor.class).submit(new PrioritizedCallable<List<String>>(LOG_PRIORITY) {-- @Override- public List<String> call() throws Exception {- return command.call();- }-- }).get();- } catch (Exception e) {- if (e.getMessage() != null && e.getMessage().contains(GIT_ERROR_START)) {- queryForm.error(StringUtils.substringAfter(e.getMessage(), GIT_ERROR_START));- commitHashes = new ArrayList<>();- } else {- throw Throwables.propagate(e);- }- }-- hasMore = commitHashes.size() == state.getStep()*COUNT;-- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- int lastMaxCount = (state.getStep()-1)*COUNT;-- commits.last = new ArrayList<>();-- for (int i=0; i<lastMaxCount; i++) {- commits.last.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));- }-- CommitGraphUtils.sort(commits.last, 0);-- commits.current = new ArrayList<>(commits.last);- for (int i=lastMaxCount; i<commitHashes.size(); i++)- commits.current.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));-- CommitGraphUtils.sort(commits.current, lastMaxCount);-- commits.last = separateByDate(commits.last);- commits.current = separateByDate(commits.current);-- return commits;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- };-- private CommitRefsModel labelsModel = new CommitRefsModel(depotModel);-- public DepotCommitsPage(PageParameters params) {- super(params);-- state = new State(params);- }-- @SuppressWarnings("deprecation")- private Component replaceItem(AjaxRequestTarget target, int index) {- Component item = commitsView.get(index);- Component newItem = newCommitItem(item.getId(), index);- item.replaceWith(newItem);- target.add(newItem);- return newItem;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- queryForm = new Form<Void>("query") {-- @Override- protected void onSubmit() {- super.onSubmit();-- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- try {- state.getParseTree(); // validate query- updateCommits(target);- } catch (Exception e) {- logger.error("Error parsing commit query string: " + state.getQuery(), e);- if (StringUtils.isNotBlank(e.getMessage()))- error(e.getMessage());- else- error("Syntax error");- target.add(feedback);- }- }-- @Override- protected void onError() {- super.onError();-- RequestCycle.get().find(AjaxRequestTarget.class).add(feedback);- }-- };- queryForm.add(new TextField<String>("input", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.getQuery();- }-- @Override- public void setObject(String object) {- state.setQuery(object);- }-- }).add(new QueryAssistBehavior(depotModel)));-- queryForm.add(new AjaxButton("submit") {});- queryForm.setOutputMarkupId(true);- add(queryForm);-- add(feedback = new NotificationPanel("feedback", queryForm));- feedback.setOutputMarkupPlaceholderTag(true);-- body = new WebMarkupContainer("body");- body.setOutputMarkupId(true);- add(body);- body.add(commitsView = newCommitsView());- body.add(new WebMarkupContainer("noCommits") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!queryForm.hasErrorMessage() && commitsModel.getObject().current.isEmpty());- }-- });-- foot = new WebMarkupContainer("foot");- foot.setOutputMarkupId(true);-- foot.add(new AjaxLink<Void>("more") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new IndicateLoadingListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- state.setStep(state.getStep()+1);-- Commits commits = commitsModel.getObject();- int commitIndex = 0;- int lastCommitIndex = 0;- for (int i=0; i<commits.last.size(); i++) {- RevCommit lastCommit = commits.last.get(i);- RevCommit currentCommit = commits.current.get(i);- if (lastCommit == null) {- if (currentCommit == null) {- if (!commits.last.get(i+1).name().equals(commits.current.get(i+1).name()))- replaceItem(target, i);- } else {- addCommitClass(replaceItem(target, i), commitIndex);- }- } else {- if (currentCommit == null) {- replaceItem(target, i);- } else if (commitIndex != lastCommitIndex- || !lastCommit.name().equals(currentCommit.name())){- addCommitClass(replaceItem(target, i), commitIndex);- }- }- if (lastCommit != null)- lastCommitIndex++;- if (currentCommit != null)- commitIndex++;- }-- StringBuilder builder = new StringBuilder();- for (int i=commits.last.size(); i<commits.current.size(); i++) {- Component item = newCommitItem(commitsView.newChildId(), i);- if (commits.current.get(i) != null)- addCommitClass(item, commitIndex++);- commitsView.add(item);- target.add(item);- builder.append(String.format("$('#repo-commits>.body>.list').append(\"<li id='%s'></li>\");",- item.getMarkupId()));- }- target.prependJavaScript(builder);- target.add(feedback);- target.add(foot);- target.appendJavaScript(renderCommitGraph());- pushState(target);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(hasMore && state.getStep() < MAX_STEPS);- }-- });- foot.add(new WebMarkupContainer("tooMany") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(state.getStep() == MAX_STEPS);- }-- });- add(foot);- }-- private void updateCommits(AjaxRequestTarget target) {- state.setStep(1);-- target.add(feedback);- body.replace(commitsView = newCommitsView());- target.add(body);- target.add(foot);- target.appendJavaScript(renderCommitGraph());- pushState(target);- }-- private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotCommitsPage.class, params);- pushState(target, url.toString(), state);- }-- private RepeatingView newCommitsView() {- RepeatingView commitsView = new RepeatingView("commits");- commitsView.setOutputMarkupId(true);-- int commitIndex = 0;- List<RevCommit> commits = commitsModel.getObject().current;- for (int i=0; i<commits.size(); i++) {- Component item = newCommitItem(commitsView.newChildId(), i);- if (commits.get(i) != null)- addCommitClass(item, commitIndex++);- commitsView.add(item);- }-- return commitsView;- }-- private void addCommitClass(Component item, int commitIndex) {- item.add(AttributeAppender.append("class", " commit-item-" + commitIndex));- }-- private Component newCommitItem(String itemId, int index) {- List<RevCommit> current = commitsModel.getObject().current;- RevCommit commit = current.get(index);-- Fragment item;- if (commit != null) {- item = new Fragment(itemId, "commitFrag", this);- item.add(new ContributorAvatars("avatar", commit.getAuthorIdent(), commit.getCommitterIdent()));-- item.add(new ExpandableCommitMessagePanel("message", depotModel, new LoadableDetachableModel<RevCommit>() {-- @Override- protected RevCommit load() {- return commitsModel.getObject().current.get(index);- }-- }, new LoadableDetachableModel<List<Pattern>>() {-- @Override- protected List<Pattern> load() {- List<Pattern> patterns = new ArrayList<>();- QueryContext parseTree = state.getParseTree();- if (parseTree != null) {- for (CriteriaContext criteria: parseTree.criteria()) {- if (criteria.message() != null) {- String message = criteria.message().Value().getText();- message = message.substring(1);- message = message.substring(0, message.length()-1);- message = JavaEscape.unescapeJava(message);- patterns.add(Pattern.compile(message, Pattern.CASE_INSENSITIVE));- }- }- }- return patterns;- }-- }));-- RepeatingView labelsView = new RepeatingView("labels");-- List<String> commitLabels = labelsModel.getObject().get(commit.name());- if (commitLabels == null)- commitLabels = new ArrayList<>();- for (String label: commitLabels)- labelsView.add(new Label(labelsView.newChildId(), label));- item.add(labelsView);-- item.add(new ContributorPanel("contribution",- commit.getAuthorIdent(), commit.getCommitterIdent(), true));-- /*- * If we query a single definitive path, let's record it to be used for- * diff comparison and code browsing- */- String path = null;-- QueryContext parseTree = state.getParseTree();- if (parseTree != null) {- for (CriteriaContext criteria: parseTree.criteria()) {- if (criteria.path() != null) {- String value = criteria.path().Value().getText();- value = value.substring(1);- value = value.substring(0, value.length()-1);- if (value.contains("*") || path != null) {- path = null;- break;- } else {- path = value;- }- }- }- }-- DepotFilePage.State browseState = new DepotFilePage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));-- if (state.getCompareWith() != null) {- RevisionComparePage.State compareState = new RevisionComparePage.State();- compareState.leftSide = new DepotAndRevision(getDepot(), commit.name());- compareState.rightSide = new DepotAndRevision(getDepot(), DepotCommitsPage.this.state.getCompareWith());- compareState.pathFilter = path;- compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;-- params = RevisionComparePage.paramsOf(getDepot(), compareState);- item.add(new BookmarkablePageLink<Void>("compare", RevisionComparePage.class, params));- } else {- item.add(new WebMarkupContainer("compare").setVisible(false));- }-- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = commit.name();- params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<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()))));-- item.add(AttributeAppender.append("class", "commit clearfix"));- } else {- item = new Fragment(itemId, "dateFrag", this);- DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());- item.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));- item.add(AttributeAppender.append("class", "date"));- }- item.setOutputMarkupId(true);-- return item;- }-- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);- if (state.getCompareWith() != null)- params.set(PARAM_COMPARE_WITH, state.getCompareWith());- if (state.getQuery() != null)- params.set(PARAM_QUERY, state.getQuery());- if (state.getStep() != 1)- params.set(PARAM_STEP, state.getStep());- return params;- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotCommitsPage.class, paramsOf(depot));- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);-- state = (State) data;-- target.add(queryForm);-- body.replace(commitsView = newCommitsView());- target.add(body);- target.add(foot);-- target.appendJavaScript(renderCommitGraph());- }-- private String renderCommitGraph() {- String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject().current);- return String.format("gitplex.commitgraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits);- }-- @Override- protected void onDetach() {- commitsModel.detach();- labelsModel.detach();-- super.onDetach();- }-- private List<RevCommit> separateByDate(List<RevCommit> commits) {- List<RevCommit> separated = new ArrayList<>();- DateTime groupTime = null;- for (RevCommit commit: commits) {- DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen());- if (groupTime == null || commitTime.getYear() != groupTime.getYear()- || commitTime.getDayOfYear() != groupTime.getDayOfYear()) {- groupTime = commitTime;- separated.add(null);- }- separated.add(commit);- }- return separated;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));- response.render(CssHeaderItem.forReference(new DepotCommitsResourceReference()));- response.render(OnDomReadyHeaderItem.forScript(renderCommitGraph()));- }-- /*- * We do not use "--date-order", "--topo-order" or "--author-order" option of git log to- * retrieve commits as they can be slow. However use the default log ordering has the- * possibility of returning parent before child which can corrupt the commit lane. To- * solve this issue, we sort the commits in memory so that parent always comes after- * child. When more commits are loaded via "more" button, it is possible that some- * commits displayed previously can be parent of commits loaded lately and should be- * moved. To work around this issue, we calculate exact order of commits being displayed- * as "last", and calculate commits will be displayed as "current". Then we compare them- * to see which commit item in the page should be replaced, and which should be added.- *- * @author robin- *- */- private static class Commits {- List<RevCommit> last;-- List<RevCommit> current;- }-- public static class State implements Serializable {-- private static final long serialVersionUID = 1L;-- private String compareWith;-- private String query;-- private int step = 1;-- private transient Optional<QueryContext> parseTree;-- public State() {- }-- public State(PageParameters params) {- compareWith = params.get(PARAM_COMPARE_WITH).toString();- query = params.get(PARAM_QUERY).toString();-- Integer step = params.get(PARAM_STEP).toOptionalInteger();- if (step != null)- this.step = step.intValue();- }-- public String getCompareWith() {- return compareWith;- }-- public void setCompareWith(String compareWith) {- this.compareWith = compareWith;- }-- public String getQuery() {- return query;- }-- public void setQuery(String query) {- this.query = query;- parseTree = null;- }-- public int getStep() {- return step;- }-- public void setStep(int step) {- this.step = step;- }-- @Nullable- public QueryContext getParseTree() {- if (parseTree == null) {- if (query != null) {- ANTLRInputStream is = new ANTLRInputStream(query);- CommitQueryLexer lexer = new CommitQueryLexer(is);- lexer.removeErrorListeners();- CommonTokenStream tokens = new CommonTokenStream(lexer);- CommitQueryParser parser = new CommitQueryParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- parseTree = Optional.of(parser.query());- } else {- parseTree = Optional.fromNullable(null);- }- }- return parseTree.orNull();- }-- public void applyTo(RevListCommand command) {- if (step > MAX_STEPS)- throw new RuntimeException("Step should be no more than " + MAX_STEPS);-- command.count(step*COUNT);-- QueryContext parseTree = getParseTree();- if (parseTree != null) {- new ParseTreeWalker().walk(new RevListCommandFiller(command), parseTree);- if (command.revisions().isEmpty() && compareWith != null)- command.revisions(Lists.newArrayList(compareWith));- } else if (compareWith != null) {- command.revisions(Lists.newArrayList(compareWith));- }- }-- }-+package com.gitplex.server.web.page.depot.commit;++import java.io.IOException;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.regex.Pattern;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.ANTLRInputStream;+import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.tree.ParseTreeWalker;+import org.apache.wicket.Component;+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.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+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.Form;+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.RepeatingView;+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.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.joda.time.DateTime;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.java.JavaEscape;++import com.google.common.base.Optional;+import com.google.common.base.Throwables;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.command.RevListCommand;+import com.gitplex.commons.util.StringUtils;+import com.gitplex.commons.util.concurrent.PrioritizedCallable;+import com.gitplex.commons.wicket.ajaxlistener.IndicateLoadingListener;+import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.DepotAndRevision;+import com.gitplex.server.core.manager.WorkExecutor;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.ContributorAvatars;+import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReference;+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.model.CommitRefsModel;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.compare.RevisionComparePage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.web.page.depot.commit.CommitQueryLexer;+import com.gitplex.web.page.depot.commit.CommitQueryParser;+import com.gitplex.web.page.depot.commit.CommitQueryParser.CriteriaContext;+import com.gitplex.web.page.depot.commit.CommitQueryParser.QueryContext;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import jersey.repackaged.com.google.common.collect.Lists;++@SuppressWarnings("serial")+public class DepotCommitsPage extends DepotPage {++ private static final Logger logger = LoggerFactory.getLogger(DepotCommitsPage.class);++ private static final int LOG_PRIORITY = 1;++ private static final String GIT_ERROR_START = "Command error output: ";++ private static final int COUNT = 50;++ private static final int MAX_STEPS = 50;++ private static final String PARAM_COMPARE_WITH = "compareWith";++ private static final String PARAM_QUERY = "query";++ private static final String PARAM_STEP = "step";++ private State state = new State();++ private boolean hasMore;++ private WebMarkupContainer body;++ private Form<?> queryForm;++ private RepeatingView commitsView;++ private NotificationPanel feedback;++ private WebMarkupContainer foot;++ private IModel<Commits> commitsModel = new LoadableDetachableModel<Commits>() {++ @Override+ protected Commits load() {+ Commits commits = new Commits();++ List<String> commitHashes;+ try {+ RevListCommand command = new RevListCommand(getDepot().getDirectory());+ command.ignoreCase(true);+ state.applyTo(command);+ commitHashes = GitPlex.getInstance(WorkExecutor.class).submit(new PrioritizedCallable<List<String>>(LOG_PRIORITY) {++ @Override+ public List<String> call() throws Exception {+ return command.call();+ }++ }).get();+ } catch (Exception e) {+ if (e.getMessage() != null && e.getMessage().contains(GIT_ERROR_START)) {+ queryForm.error(StringUtils.substringAfter(e.getMessage(), GIT_ERROR_START));+ commitHashes = new ArrayList<>();+ } else {+ throw Throwables.propagate(e);+ }+ }++ hasMore = commitHashes.size() == state.getStep()*COUNT;++ try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ int lastMaxCount = (state.getStep()-1)*COUNT;++ commits.last = new ArrayList<>();++ for (int i=0; i<lastMaxCount; i++) {+ commits.last.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));+ }++ CommitGraphUtils.sort(commits.last, 0);++ commits.current = new ArrayList<>(commits.last);+ for (int i=lastMaxCount; i<commitHashes.size(); i++)+ commits.current.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));++ CommitGraphUtils.sort(commits.current, lastMaxCount);++ commits.last = separateByDate(commits.last);+ commits.current = separateByDate(commits.current);++ return commits;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ };++ private CommitRefsModel labelsModel = new CommitRefsModel(depotModel);++ public DepotCommitsPage(PageParameters params) {+ super(params);++ state = new State(params);+ }++ @SuppressWarnings("deprecation")+ private Component replaceItem(AjaxRequestTarget target, int index) {+ Component item = commitsView.get(index);+ Component newItem = newCommitItem(item.getId(), index);+ item.replaceWith(newItem);+ target.add(newItem);+ return newItem;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ queryForm = new Form<Void>("query") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ try {+ state.getParseTree(); // validate query+ updateCommits(target);+ } catch (Exception e) {+ logger.error("Error parsing commit query string: " + state.getQuery(), e);+ if (StringUtils.isNotBlank(e.getMessage()))+ error(e.getMessage());+ else+ error("Syntax error");+ target.add(feedback);+ }+ }++ @Override+ protected void onError() {+ super.onError();++ RequestCycle.get().find(AjaxRequestTarget.class).add(feedback);+ }++ };+ queryForm.add(new TextField<String>("input", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.getQuery();+ }++ @Override+ public void setObject(String object) {+ state.setQuery(object);+ }++ }).add(new QueryAssistBehavior(depotModel)));++ queryForm.add(new AjaxButton("submit") {});+ queryForm.setOutputMarkupId(true);+ add(queryForm);++ add(feedback = new NotificationPanel("feedback", queryForm));+ feedback.setOutputMarkupPlaceholderTag(true);++ body = new WebMarkupContainer("body");+ body.setOutputMarkupId(true);+ add(body);+ body.add(commitsView = newCommitsView());+ body.add(new WebMarkupContainer("noCommits") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!queryForm.hasErrorMessage() && commitsModel.getObject().current.isEmpty());+ }++ });++ foot = new WebMarkupContainer("foot");+ foot.setOutputMarkupId(true);++ foot.add(new AjaxLink<Void>("more") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new IndicateLoadingListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ state.setStep(state.getStep()+1);++ Commits commits = commitsModel.getObject();+ int commitIndex = 0;+ int lastCommitIndex = 0;+ for (int i=0; i<commits.last.size(); i++) {+ RevCommit lastCommit = commits.last.get(i);+ RevCommit currentCommit = commits.current.get(i);+ if (lastCommit == null) {+ if (currentCommit == null) {+ if (!commits.last.get(i+1).name().equals(commits.current.get(i+1).name()))+ replaceItem(target, i);+ } else {+ addCommitClass(replaceItem(target, i), commitIndex);+ }+ } else {+ if (currentCommit == null) {+ replaceItem(target, i);+ } else if (commitIndex != lastCommitIndex+ || !lastCommit.name().equals(currentCommit.name())){+ addCommitClass(replaceItem(target, i), commitIndex);+ }+ }+ if (lastCommit != null)+ lastCommitIndex++;+ if (currentCommit != null)+ commitIndex++;+ }++ StringBuilder builder = new StringBuilder();+ for (int i=commits.last.size(); i<commits.current.size(); i++) {+ Component item = newCommitItem(commitsView.newChildId(), i);+ if (commits.current.get(i) != null)+ addCommitClass(item, commitIndex++);+ commitsView.add(item);+ target.add(item);+ builder.append(String.format("$('#repo-commits>.body>.list').append(\"<li id='%s'></li>\");",+ item.getMarkupId()));+ }+ target.prependJavaScript(builder);+ target.add(feedback);+ target.add(foot);+ target.appendJavaScript(renderCommitGraph());+ pushState(target);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(hasMore && state.getStep() < MAX_STEPS);+ }++ });+ foot.add(new WebMarkupContainer("tooMany") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(state.getStep() == MAX_STEPS);+ }++ });+ add(foot);+ }++ private void updateCommits(AjaxRequestTarget target) {+ state.setStep(1);++ target.add(feedback);+ body.replace(commitsView = newCommitsView());+ target.add(body);+ target.add(foot);+ target.appendJavaScript(renderCommitGraph());+ pushState(target);+ }++ private void pushState(AjaxRequestTarget target) {+ PageParameters params = paramsOf(getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(DepotCommitsPage.class, params);+ pushState(target, url.toString(), state);+ }++ private RepeatingView newCommitsView() {+ RepeatingView commitsView = new RepeatingView("commits");+ commitsView.setOutputMarkupId(true);++ int commitIndex = 0;+ List<RevCommit> commits = commitsModel.getObject().current;+ for (int i=0; i<commits.size(); i++) {+ Component item = newCommitItem(commitsView.newChildId(), i);+ if (commits.get(i) != null)+ addCommitClass(item, commitIndex++);+ commitsView.add(item);+ }++ return commitsView;+ }++ private void addCommitClass(Component item, int commitIndex) {+ item.add(AttributeAppender.append("class", " commit-item-" + commitIndex));+ }++ private Component newCommitItem(String itemId, int index) {+ List<RevCommit> current = commitsModel.getObject().current;+ RevCommit commit = current.get(index);++ Fragment item;+ if (commit != null) {+ item = new Fragment(itemId, "commitFrag", this);+ item.add(new ContributorAvatars("avatar", commit.getAuthorIdent(), commit.getCommitterIdent()));++ item.add(new ExpandableCommitMessagePanel("message", depotModel, new LoadableDetachableModel<RevCommit>() {++ @Override+ protected RevCommit load() {+ return commitsModel.getObject().current.get(index);+ }++ }, new LoadableDetachableModel<List<Pattern>>() {++ @Override+ protected List<Pattern> load() {+ List<Pattern> patterns = new ArrayList<>();+ QueryContext parseTree = state.getParseTree();+ if (parseTree != null) {+ for (CriteriaContext criteria: parseTree.criteria()) {+ if (criteria.message() != null) {+ String message = criteria.message().Value().getText();+ message = message.substring(1);+ message = message.substring(0, message.length()-1);+ message = JavaEscape.unescapeJava(message);+ patterns.add(Pattern.compile(message, Pattern.CASE_INSENSITIVE));+ }+ }+ }+ return patterns;+ }++ }));++ RepeatingView labelsView = new RepeatingView("labels");++ List<String> commitLabels = labelsModel.getObject().get(commit.name());+ if (commitLabels == null)+ commitLabels = new ArrayList<>();+ for (String label: commitLabels)+ labelsView.add(new Label(labelsView.newChildId(), label));+ item.add(labelsView);++ item.add(new ContributorPanel("contribution",+ commit.getAuthorIdent(), commit.getCommitterIdent(), true));++ /*+ * If we query a single definitive path, let's record it to be used for+ * diff comparison and code browsing+ */+ String path = null;++ QueryContext parseTree = state.getParseTree();+ if (parseTree != null) {+ for (CriteriaContext criteria: parseTree.criteria()) {+ if (criteria.path() != null) {+ String value = criteria.path().Value().getText();+ value = value.substring(1);+ value = value.substring(0, value.length()-1);+ if (value.contains("*") || path != null) {+ path = null;+ break;+ } else {+ path = value;+ }+ }+ }+ }++ DepotFilePage.State browseState = new DepotFilePage.State();+ browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);+ item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));++ if (state.getCompareWith() != null) {+ RevisionComparePage.State compareState = new RevisionComparePage.State();+ compareState.leftSide = new DepotAndRevision(getDepot(), commit.name());+ compareState.rightSide = new DepotAndRevision(getDepot(), DepotCommitsPage.this.state.getCompareWith());+ compareState.pathFilter = path;+ compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;++ params = RevisionComparePage.paramsOf(getDepot(), compareState);+ item.add(new BookmarkablePageLink<Void>("compare", RevisionComparePage.class, params));+ } else {+ item.add(new WebMarkupContainer("compare").setVisible(false));+ }++ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ Link<Void> hashLink = new BookmarkablePageLink<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()))));++ item.add(AttributeAppender.append("class", "commit clearfix"));+ } else {+ item = new Fragment(itemId, "dateFrag", this);+ DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());+ item.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));+ item.add(AttributeAppender.append("class", "date"));+ }+ item.setOutputMarkupId(true);++ return item;+ }++ public static PageParameters paramsOf(Depot depot, State state) {+ PageParameters params = paramsOf(depot);+ if (state.getCompareWith() != null)+ params.set(PARAM_COMPARE_WITH, state.getCompareWith());+ if (state.getQuery() != null)+ params.set(PARAM_QUERY, state.getQuery());+ if (state.getStep() != 1)+ params.set(PARAM_STEP, state.getStep());+ return params;+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ setResponsePage(DepotCommitsPage.class, paramsOf(depot));+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);++ state = (State) data;++ target.add(queryForm);++ body.replace(commitsView = newCommitsView());+ target.add(body);+ target.add(foot);++ target.appendJavaScript(renderCommitGraph());+ }++ private String renderCommitGraph() {+ String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject().current);+ return String.format("gitplex.server.commitgraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits);+ }++ @Override+ protected void onDetach() {+ commitsModel.detach();+ labelsModel.detach();++ super.onDetach();+ }++ private List<RevCommit> separateByDate(List<RevCommit> commits) {+ List<RevCommit> separated = new ArrayList<>();+ DateTime groupTime = null;+ for (RevCommit commit: commits) {+ DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen());+ if (groupTime == null || commitTime.getYear() != groupTime.getYear()+ || commitTime.getDayOfYear() != groupTime.getDayOfYear()) {+ groupTime = commitTime;+ separated.add(null);+ }+ separated.add(commit);+ }+ return separated;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));+ response.render(CssHeaderItem.forReference(new DepotCommitsResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript(renderCommitGraph()));+ }++ /*+ * We do not use "--date-order", "--topo-order" or "--author-order" option of git log to+ * retrieve commits as they can be slow. However use the default log ordering has the+ * possibility of returning parent before child which can corrupt the commit lane. To+ * solve this issue, we sort the commits in memory so that parent always comes after+ * child. When more commits are loaded via "more" button, it is possible that some+ * commits displayed previously can be parent of commits loaded lately and should be+ * moved. To work around this issue, we calculate exact order of commits being displayed+ * as "last", and calculate commits will be displayed as "current". Then we compare them+ * to see which commit item in the page should be replaced, and which should be added.+ *+ * @author robin+ *+ */+ private static class Commits {+ List<RevCommit> last;++ List<RevCommit> current;+ }++ public static class State implements Serializable {++ private static final long serialVersionUID = 1L;++ private String compareWith;++ private String query;++ private int step = 1;++ private transient Optional<QueryContext> parseTree;++ public State() {+ }++ public State(PageParameters params) {+ compareWith = params.get(PARAM_COMPARE_WITH).toString();+ query = params.get(PARAM_QUERY).toString();++ Integer step = params.get(PARAM_STEP).toOptionalInteger();+ if (step != null)+ this.step = step.intValue();+ }++ public String getCompareWith() {+ return compareWith;+ }++ public void setCompareWith(String compareWith) {+ this.compareWith = compareWith;+ }++ public String getQuery() {+ return query;+ }++ public void setQuery(String query) {+ this.query = query;+ parseTree = null;+ }++ public int getStep() {+ return step;+ }++ public void setStep(int step) {+ this.step = step;+ }++ @Nullable+ public QueryContext getParseTree() {+ if (parseTree == null) {+ if (query != null) {+ ANTLRInputStream is = new ANTLRInputStream(query);+ CommitQueryLexer lexer = new CommitQueryLexer(is);+ lexer.removeErrorListeners();+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ CommitQueryParser parser = new CommitQueryParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ parseTree = Optional.of(parser.query());+ } else {+ parseTree = Optional.fromNullable(null);+ }+ }+ return parseTree.orNull();+ }++ public void applyTo(RevListCommand command) {+ if (step > MAX_STEPS)+ throw new RuntimeException("Step should be no more than " + MAX_STEPS);++ command.count(step*COUNT);++ QueryContext parseTree = getParseTree();+ if (parseTree != null) {+ new ParseTreeWalker().walk(new RevListCommandFiller(command), parseTree);+ if (command.revisions().isEmpty() && compareWith != null)+ command.revisions(Lists.newArrayList(compareWith));+ } else if (compareWith != null) {+ command.revisions(Lists.newArrayList(compareWith));+ }+ }++ }+}\ No newline at end of filediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.javaindex 41b301f062..e6bcd21b91 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.commit;+package com.gitplex.server.web.page.depot.commit;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.javaindex 200e264bb8..bafd7565af 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.commit;+package com.gitplex.server.web.page.depot.commit;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -8,11 +8,6 @@ import java.util.Map;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.web.Constants;-import com.gitplex.web.util.SuggestionUtils;import com.gitplex.commons.antlr.codeassist.FenceAware;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.antlr.codeassist.ParentedElement;@@ -24,6 +19,11 @@ import com.gitplex.commons.util.StringUtils;import com.gitplex.commons.util.match.PatternApplied;import com.gitplex.commons.util.match.WildcardUtils;import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.util.SuggestionUtils;import com.gitplex.web.page.depot.commit.CommitQueryParser;@SuppressWarnings("serial")diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.javasimilarity index 98%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.javaindex de98067c02..89d0c5136a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.commit;+package com.gitplex.server.web.page.depot.commit;import org.antlr.v4.runtime.tree.ParseTreeProperty;import org.antlr.v4.runtime.tree.TerminalNode;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.js b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.jssimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.jsrename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.jsindex 605fa8e526..24e750a86f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.js+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/commit-detail.js@@ -1,4 +1,4 @@-gitplex.commitdetail = {+gitplex.server.commitdetail = {initRefs: function(refsId) {var $refs = $("#" + refsId);if ($refs.children().length != 0)diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/depot-commits.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/depot-commits.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javaindex de16712fb0..f958455bba 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.compare;+package com.gitplex.server.web.page.depot.compare;import java.io.IOException;import java.io.Serializable;@@ -31,27 +31,6 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.entity.support.DepotAndRevision;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.web.component.commitlist.CommitListPanel;-import com.gitplex.web.component.diff.revision.CommentSupport;-import com.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.gitplex.web.component.revisionpicker.AffinalRevisionPicker;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.websocket.CodeCommentChangedRegion;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.lang.diff.WhitespaceOption;import com.gitplex.commons.wicket.behavior.TooltipBehavior;@@ -60,6 +39,27 @@ import com.gitplex.commons.wicket.component.tabbable.Tab;import com.gitplex.commons.wicket.component.tabbable.Tabbable;import com.gitplex.commons.wicket.websocket.WebSocketManager;import com.gitplex.commons.wicket.websocket.WebSocketRegion;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.CompareContext;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.entity.support.DepotAndRevision;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.web.component.commitlist.CommitListPanel;+import com.gitplex.server.web.component.diff.revision.CommentSupport;+import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.revisionpicker.AffinalRevisionPicker;+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.websocket.CodeCommentChangedRegion;@SuppressWarnings("serial")public class RevisionComparePage extends DepotPage implements CommentSupport {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.javaindex f174fd0c27..550f01a12f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionCompareResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.compare;+package com.gitplex.server.web.page.depot.compare;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/revision-compare.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/compare/revision-compare.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/revision-compare.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/compare/revision-compare.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/depot.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/depot.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.js b/server.web/src/main/java/com/gitplex/server/web/page/depot/depot.jssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.jsrename to server.web/src/main/java/com/gitplex/server/web/page/depot/depot.jsdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.javaindex 99132d3d89..19490b32b1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.file;+package com.gitplex.server.web.page.depot.file;import java.io.IOException;import java.io.Serializable;@@ -38,46 +38,46 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.core.event.RefUpdated;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.search.IndexManager;-import com.gitplex.search.SearchManager;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.search.query.BlobQuery;-import com.gitplex.search.query.TextQuery;-import com.gitplex.web.WebSession;-import com.gitplex.web.component.archivemenulink.ArchiveMenuLink;-import com.gitplex.web.component.depotfile.blobsearch.advanced.AdvancedSearchPanel;-import com.gitplex.web.component.depotfile.blobsearch.instant.InstantSearchPanel;-import com.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.web.component.depotfile.blobview.BlobNameChangeCallback;-import com.gitplex.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.component.depotfile.blobview.source.SourceViewPanel;-import com.gitplex.web.component.depotfile.editsave.CancelListener;-import com.gitplex.web.component.depotfile.editsave.EditSavePanel;-import com.gitplex.web.component.depotfile.fileedit.FileEditPanel;-import com.gitplex.web.component.depotfile.filelist.FileListPanel;-import com.gitplex.web.component.depotfile.filenavigator.FileNavigator;-import com.gitplex.web.component.revisionpicker.RevisionPicker;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.websocket.CodeCommentChangedRegion;-import com.gitplex.web.websocket.CommitIndexedRegion;-import com.gitplex.web.websocket.PullRequestChangedRegion;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.TextRange;+import com.gitplex.server.core.event.RefUpdated;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.search.IndexManager;+import com.gitplex.server.search.SearchManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.TextQuery;+import com.gitplex.server.web.WebSession;+import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;+import com.gitplex.server.web.component.depotfile.blobsearch.advanced.AdvancedSearchPanel;+import com.gitplex.server.web.component.depotfile.blobsearch.instant.InstantSearchPanel;+import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;+import com.gitplex.server.web.component.depotfile.blobview.BlobNameChangeCallback;+import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.component.depotfile.blobview.source.SourceViewPanel;+import com.gitplex.server.web.component.depotfile.editsave.CancelListener;+import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;+import com.gitplex.server.web.component.depotfile.fileedit.FileEditPanel;+import com.gitplex.server.web.component.depotfile.filelist.FileListPanel;+import com.gitplex.server.web.component.depotfile.filenavigator.FileNavigator;+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.commit.DepotCommitsPage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.websocket.CodeCommentChangedRegion;+import com.gitplex.server.web.websocket.CommitIndexedRegion;+import com.gitplex.server.web.websocket.PullRequestChangedRegion;import com.google.common.base.Objects;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobIdent;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.javaindex 1df36d8cff..7d117f0d02 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.file;+package com.gitplex.server.web.page.depot.file;import java.util.List;@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class DepotFileResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.javaindex a8affe04e9..58b6275d75 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.file;+package com.gitplex.server.web.page.depot.file;import java.io.Serializable;import java.io.UnsupportedEncodingException;@@ -9,12 +9,12 @@ import java.util.List;import javax.annotation.Nullable;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.google.common.base.Charsets;import com.google.common.base.Joiner;import com.google.common.base.Splitter;import com.gitplex.commons.lang.diff.WhitespaceOption;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;public class RequestCompareInfo implements Serializable {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.js b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.jssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.jsrename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.jsdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/hgrabber.png b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/hgrabber.pngsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/hgrabber.pngrename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/hgrabber.pngdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/indexing.gif b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/indexing.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/file/indexing.gifrename to server.web/src/main/java/com/gitplex/server/web/page/depot/file/indexing.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.javaindex b748c685e6..cc3e682b53 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.moreinfo;+package com.gitplex.server.web.page.depot.moreinfo;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -8,18 +8,18 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.accountchoice.AccountSingleChoice;-import com.gitplex.web.component.accountchoice.AdministrativeAccountChoiceProvider;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;+import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")abstract class ForkOptionPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.javaindex a9c45eda9f..488b8c31b2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.moreinfo;+package com.gitplex.server.web.page.depot.moreinfo;import java.util.Collection;@@ -18,20 +18,20 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.Constants;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.CommitInfoManager;-import com.gitplex.core.manager.UrlManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.depotselector.DepotSelector;-import com.gitplex.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.tags.DepotTagsPage;import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.CommitInfoManager;+import com.gitplex.server.core.manager.UrlManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.depotselector.DepotSelector;+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.file.DepotFilePage;+import com.gitplex.server.web.page.depot.tags.DepotTagsPage;@SuppressWarnings("serial")public abstract class MoreInfoPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.javasimilarity index 65%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.javaindex db9bbb94d0..0461565451 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.page.depot.moreinfo;+package com.gitplex.server.web.page.depot.moreinfo;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;public class MoreInfoResourceReference extends BaseDependentCssResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/more-info.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/more-info.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/more-info.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/more-info.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/no-branches.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/no-branches.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/no-branches.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/no-branches.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javaindex 83da0f1d95..ed040829a0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java@@ -1,7 +1,7 @@-package com.gitplex.web.page.depot.pullrequest.newrequest;+package com.gitplex.server.web.page.depot.pullrequest.newrequest;-import static com.gitplex.core.entity.PullRequest.Status.INTEGRATED;-import static com.gitplex.core.entity.PullRequest.Status.PENDING_UPDATE;+import static com.gitplex.server.core.entity.PullRequest.Status.INTEGRATED;+import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_UPDATE;import java.io.IOException;import java.util.ArrayList;@@ -35,40 +35,6 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.entity.PullRequest.Status;-import com.gitplex.core.entity.support.CloseInfo;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.security.ObjectPermission;-import com.gitplex.web.component.BranchLink;-import com.gitplex.web.component.branchpicker.AffinalBranchPicker;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.commitlist.CommitListPanel;-import com.gitplex.web.component.diff.revision.CommentSupport;-import com.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.gitplex.web.component.pullrequest.requestassignee.AssigneeChoice;-import com.gitplex.web.component.pullrequest.requestreviewer.ReviewerAvatar;-import com.gitplex.web.component.pullrequest.requestreviewer.ReviewerChoice;-import com.gitplex.web.model.ReviewersModel;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.compare.RevisionComparePage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.page.security.LoginPage;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.hibernate.dao.Dao;@@ -77,6 +43,40 @@ import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;import com.gitplex.commons.wicket.component.tabbable.Tab;import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.entity.PullRequest.Status;+import com.gitplex.server.core.entity.support.CloseInfo;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.security.ObjectPermission;+import com.gitplex.server.web.component.BranchLink;+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.commitlist.CommitListPanel;+import com.gitplex.server.web.component.diff.revision.CommentSupport;+import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.pullrequest.requestassignee.AssigneeChoice;+import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerAvatar;+import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoice;+import com.gitplex.server.web.model.ReviewersModel;+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.security.LoginPage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.javaindex b316d01cb9..f5968cec83 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.newrequest;+package com.gitplex.server.web.page.depot.pullrequest.newrequest;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/new-request.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/new-request.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javaindex 9e9396960a..e235780f2c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import java.util.Collection;@@ -7,13 +7,13 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.component.comment.CodeCommentFilter;-import com.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")public class ApprovalHintPanel extends GenericPanel<PullRequest> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javasimilarity index 76%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javaindex 88d634e42d..85d2615cf1 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import java.util.Collection;@@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.web.component.comment.CodeCommentFilter;-import com.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")public class IntegrationHintPanel extends GenericPanel<PullRequest> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javaindex 4d524a215c..9dda8757a9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java@@ -1,6 +1,6 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import static com.gitplex.core.entity.PullRequest.Status.PENDING_INTEGRATE;+import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_INTEGRATE;import javax.annotation.Nullable;@@ -9,18 +9,18 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequest.Status;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.PullRequestReviewManager;-import com.gitplex.core.security.SecurityUtils;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequest.Status;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.PullRequestReviewManager;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")public enum PullRequestOperation {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javaindex e2edaf3929..3ef7d9ed30 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java@@ -1,17 +1,17 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;--import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.APPROVE;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISCARD;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.INTEGRATE;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.REOPEN;-import static com.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;++import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.APPROVE;+import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;+import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;+import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISCARD;+import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.INTEGRATE;+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 java.util.ArrayList;import java.util.Collection;@@ -55,31 +55,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequest.Status;-import com.gitplex.core.entity.support.DepotAndBranch;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.manager.VisitInfoManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.BranchLink;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.pullrequest.verificationstatus.VerificationStatusPanel;-import com.gitplex.web.model.EntityModel;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.util.DateUtils;-import com.gitplex.web.websocket.PullRequestChanged;-import com.gitplex.web.websocket.PullRequestChangedRegion;import com.google.common.base.Preconditions;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.wicket.WicketUtils;@@ -91,6 +66,31 @@ import com.gitplex.commons.wicket.component.tabbable.Tab;import com.gitplex.commons.wicket.component.tabbable.Tabbable;import com.gitplex.commons.wicket.websocket.WebSocketRegion;import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequest.Status;+import com.gitplex.server.core.entity.support.DepotAndBranch;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.manager.VisitInfoManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.BranchLink;+import com.gitplex.server.web.component.comment.CommentInput;+import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;+import com.gitplex.server.web.model.EntityModel;+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.integrationpreview.IntegrationPreviewPage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.util.DateUtils;+import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PullRequestChangedRegion;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.javaindex 0f44ec1a76..196b2d0d31 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.javaindex 1fa45f4ae9..7dc86d5784 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java@@ -1,9 +1,9 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;-import static com.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;+import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -12,14 +12,14 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.ObjectId;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.entity.support.IntegrationPreview;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;@SuppressWarnings("serial")class ResolveConflictInstructionPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javaindex 7cbf8390ec..242207fffd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java@@ -1,12 +1,12 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class UpdateChangesLink extends BookmarkablePageLink<Void> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ajax-indicator.gifsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gifrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ajax-indicator.gifdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javaindex a6bc171aff..58230d1c99 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.changes;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -32,20 +32,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.support.CodeCommentActivity;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.web.component.diff.revision.CommentSupport;-import com.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.websocket.CodeCommentChangedRegion;-import com.gitplex.web.websocket.PullRequestChanged;import com.google.common.base.Preconditions;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.lang.diff.WhitespaceOption;@@ -53,6 +39,20 @@ import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.websocket.WebSocketManager;import com.gitplex.commons.wicket.websocket.WebSocketRegion;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.support.CodeCommentActivity;+import com.gitplex.server.core.entity.support.CommentPos;+import com.gitplex.server.core.manager.CodeCommentManager;+import com.gitplex.server.web.component.diff.revision.CommentSupport;+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.websocket.CodeCommentChangedRegion;+import com.gitplex.server.web.websocket.PullRequestChanged;@SuppressWarnings("serial")public class RequestChangesPage extends RequestDetailPage implements CommentSupport {@@ -251,10 +251,10 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSuppint newIndex = getCommitIndex(state.newCommit);if ((state.oldCommit.equals(getPullRequest().getBaseCommitHash()) || oldIndex != -1)&& newIndex != -1) {- script = String.format("gitplex.requestChanges.initCommitSelector(%s, '%s', %d, %d);",+ script = String.format("gitplex.server.requestChanges.initCommitSelector(%s, '%s', %d, %d);",callback, getPullRequest().getBaseCommitHash(), oldIndex+1, newIndex);} else {- script = String.format("gitplex.requestChanges.initCommitSelector(%s, '%s');",+ script = String.format("gitplex.server.requestChanges.initCommitSelector(%s, '%s');",callback, getPullRequest().getBaseCommitHash());}response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.javasimilarity index 83%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.javaindex a3bff6a1f2..c7d01b6d9a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.changes;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.gitplex.web.page.base.BaseDependentResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class RequestChangesResourceReference extends BaseDependentResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.jssimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.jsrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.jsindex cc852161a2..6502753e86 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/request-changes.js@@ -1,4 +1,4 @@-gitplex.requestChanges = {+gitplex.server.requestChanges = {initCommitSelector: function(callback, baseCommit, fromIndex, toIndex) {var $commits = $(".commits-selector ul a");if (fromIndex!=undefined && toIndex!=undefined) {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javaindex a610aa0714..bc6b106ba5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.codecomments;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments;import java.nio.file.Paths;import java.util.ArrayList;@@ -7,12 +7,12 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.web.component.comment.CodeCommentAware;-import com.gitplex.web.component.comment.CodeCommentFilter;-import com.gitplex.web.component.comment.CodeCommentListPanel;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.core.entity.CodeComment;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.web.component.comment.CodeCommentAware;+import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.component.comment.CodeCommentListPanel;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;@SuppressWarnings("serial")public class RequestCodeCommentsPage extends RequestDetailPage implements CodeCommentAware {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.javaindex 4b1efbab16..0f8b03a29c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview;import java.io.Serializable;@@ -16,14 +16,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.IntegrationPreview;-import com.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.websocket.PullRequestChanged;import com.gitplex.commons.lang.diff.WhitespaceOption;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.IntegrationPreview;+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.websocket.PullRequestChanged;@SuppressWarnings("serial")public class IntegrationPreviewPage extends RequestDetailPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.javaindex 7709de7a61..20ebc2fdee 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.javaindex 1dc327ba7b..3681d6627b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;import java.io.Serializable;import java.util.Date;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javaindex a5df801335..7fcabd74ed 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java@@ -1,744 +1,744 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;--import java.util.ArrayList;-import java.util.Arrays;-import java.util.Date;-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.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-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.form.DropDownChoice;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.IChoiceRenderer;-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.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-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.joda.time.DateTime;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.entity.PullRequestReference;-import com.gitplex.core.entity.PullRequestReview;-import com.gitplex.core.entity.PullRequestReviewInvitation;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.core.entity.PullRequestWatch;-import com.gitplex.core.entity.PullRequest.IntegrationStrategy;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.security.ObjectPermission;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.pullrequest.requestassignee.AssigneeChoice;-import com.gitplex.web.component.pullrequest.requestreviewer.ReviewerAvatar;-import com.gitplex.web.component.pullrequest.requestreviewer.ReviewerChoice;-import com.gitplex.web.component.pullrequest.reviewresult.ReviewResultIcon;-import com.gitplex.web.model.EntityModel;-import com.gitplex.web.model.ReviewersModel;-import com.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.CommentedActivity;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.OpenedActivity;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.ReferencedActivity;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.RequestCommentDeleted;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.StatusChangeActivity;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.UpdatedActivity;-import com.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.web.websocket.PullRequestChanged;-import com.google.common.base.Preconditions;-import com.gitplex.commons.hibernate.dao.Dao;-import com.gitplex.commons.wicket.ConfirmOnClick;-import com.gitplex.commons.wicket.behavior.TooltipBehavior;-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;--@SuppressWarnings("serial")-public class RequestOverviewPage extends RequestDetailPage {-- private static final String ASSIGNEE_HELP = "Assignee has write permission to the "- + "repository and is resonsible for integrating the pull request into "- + "target branch after it passes gatekeeper check.";-- private enum WatchStatus {- WATCHING("Watching"),- NOT_WATCHING("Not Watching"),- IGNORE("Ignore");-- private final String displayName;-- WatchStatus(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }-- };-- private RepeatingView activitiesView;-- public RequestOverviewPage(PageParameters params) {- super(params);- }-- private Component newActivityRow(String id, PullRequestActivity activity) {- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity)) {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof RequestCommentDeleted) {- RequestCommentDeleted commentRemoved = (RequestCommentDeleted) event.getPayload();- remove();- commentRemoved.getPartialPageRequestHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));- }- }-- };- row.setOutputMarkupId(true);- String anchor = activity.getAnchor();- if (anchor != null)- row.setMarkupId(anchor);-- if (row.get("content") == null)- row.add(activity.render("content"));-- WebMarkupContainer avatarColumn = new WebMarkupContainer("avatar");- row.add(avatarColumn);-- if (activity instanceof OpenedActivity) {- row.add(AttributeAppender.append("class", " discussion"));- avatarColumn.add(new AvatarLink("avatar", ((OpenedActivity)activity).getRequest().getSubmitter(), null));- } else if (activity instanceof CommentedActivity) {- row.add(AttributeAppender.append("class", " discussion"));- avatarColumn.add(new AvatarLink("avatar", ((CommentedActivity)activity).getComment().getUser(), null));- } else {- row.add(AttributeAppender.append("class", " non-discussion"));- avatarColumn.add(new WebMarkupContainer("avatar"));- }-- if (activity instanceof UpdatedActivity)- row.add(AttributeAppender.append("class", " update"));- else- row.add(AttributeAppender.append("class", " non-update"));-- return row;- }-- private List<PullRequestActivity> getActivities() {- PullRequest request = getPullRequest();- List<PullRequestActivity> activities = new ArrayList<>();-- activities.add(new OpenedActivity(request));-- for (PullRequestUpdate update: request.getUpdates())- activities.add(new UpdatedActivity(update));-- for (PullRequestComment comment: request.getComments()) {- activities.add(new CommentedActivity(comment));- }-- for (PullRequestReference reference: request.getReferencedBy()) {- activities.add(new ReferencedActivity(reference));- }-- for (PullRequestStatusChange statusChange: request.getStatusChanges()) {- activities.add(new StatusChangeActivity(statusChange));- }-- activities.sort((o1, o2) -> {- if (o1.getDate().getTime()<o2.getDate().getTime())- return -1;- else if (o1.getDate().getTime()>o2.getDate().getTime())- return 1;- else if (o1 instanceof OpenedActivity)- return -1;- else- return 1;- });-- return activities;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pullRequestChanged.getPartialPageRequestHandler();-- @SuppressWarnings("deprecation")- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);- PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();- List<PullRequestActivity> newActivities = new ArrayList<>();- for (PullRequestActivity activity: getActivities()) {- if (activity.getDate().getTime() > lastActivity.getDate().getTime())- newActivities.add(activity);- }-- Component sinceChangesRow = null;- for (Component row: activitiesView) {- if (row.getDefaultModelObject() == null) {- sinceChangesRow = row;- break;- }- }-- if (sinceChangesRow == null && !newActivities.isEmpty()) {- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();- sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);- activitiesView.add(sinceChangesRow);- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());- partialPageRequestHandler.prependJavaScript(script);- partialPageRequestHandler.add(sinceChangesRow);- prevActivityRow = sinceChangesRow;- }-- for (PullRequestActivity activity: newActivities) {- Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);- newActivityRow.add(AttributeAppender.append("class", "new"));- activitiesView.add(newActivityRow);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());- partialPageRequestHandler.prependJavaScript(script);- partialPageRequestHandler.add(newActivityRow);-- if (activity instanceof UpdatedActivity) {- partialPageRequestHandler.appendJavaScript("$('tr.since-changes').addClass('visible');");- }- prevActivityRow = newActivityRow;- }- }- }-- private Component newSinceChangesRow(String id, Date sinceDate) {- WebMarkupContainer row = new WebMarkupContainer(id);- row.setOutputMarkupId(true);- row.add(AttributeAppender.append("class", " non-discussion"));-- WebMarkupContainer avatarColumn = new WebMarkupContainer("avatar");- avatarColumn.add(new WebMarkupContainer("avatar"));- row.add(avatarColumn);-- WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);- contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));- row.add(contentColumn);-- row.add(AttributeAppender.append("class", "since-changes"));-- return row;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(activitiesView = new RepeatingView("requestActivities"));- activitiesView.setOutputMarkupId(true);-- List<PullRequestActivity> activities = getActivities();-- PullRequest request = getPullRequest();- List<PullRequestActivity> oldActivities = new ArrayList<>();- List<PullRequestActivity> newActivities = new ArrayList<>();- for (PullRequestActivity activity: activities) {- if (request.isVisitedAfter(activity.getDate())) {- oldActivities.add(activity);- } else {- newActivities.add(activity);- }- }-- for (PullRequestActivity activity: oldActivities) {- activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));- }-- if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();- Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);- for (PullRequestActivity activity: newActivities) {- if (activity instanceof UpdatedActivity) {- row.add(AttributeAppender.append("class", "visible"));- break;- }- }- activitiesView.add(row);- }-- for (PullRequestActivity activity: newActivities) {- Component row = newActivityRow(activitiesView.newChildId(), activity);- row.add(AttributeAppender.append("class", "new"));- activitiesView.add(row);- }-- WebMarkupContainer addComment = new WebMarkupContainer("addComment") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- };- addComment.setOutputMarkupId(true);- add(addComment);-- Form<?> form = new Form<Void>("form");- addComment.add(form);-- CommentInput input = new CommentInput("input", Model.of("")) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());- }-- @Override- protected Depot getDepot() {- return RequestOverviewPage.this.getDepot();- }-- };- input.setRequired(true);- form.add(input);-- form.add(new NotificationPanel("feedback", input));-- form.add(new AjaxSubmitLink("comment") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- PullRequestComment comment = new PullRequestComment();- comment.setRequest(getPullRequest());- comment.setUser(getLoginUser());- comment.setContent(input.getModelObject());- GitPlex.getInstance(PullRequestCommentManager.class).save(comment);- input.setModelObject("");-- target.add(addComment);-- @SuppressWarnings("deprecation")- Component lastActivityRow = activitiesView.get(activitiesView.size()-1);- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));- activitiesView.add(newActivityRow);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());- target.prependJavaScript(script);- target.add(newActivityRow);- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });-- add(newIntegrationStrategyContainer());- add(newAssigneeContainer());- add(newReviewersContainer());- add(newWatchContainer());- add(newManageContainer());- }-- private WebMarkupContainer newManageContainer() {- WebMarkupContainer container = new WebMarkupContainer("manage");- container.setVisible(SecurityUtils.canModify(getPullRequest()));- container.add(new Link<Void>("synchronize") {-- @Override- public void onClick() {- GitPlex.getInstance(PullRequestManager.class).check(getPullRequest());- Session.get().success("Pull request is synchronized");- }-- });- container.add(new Link<Void>("delete") {-- @Override- public void onClick() {- PullRequest request = getPullRequest();- GitPlex.getInstance(PullRequestManager.class).delete(request);- Session.get().success("Pull request #" + request.getNumber() + " is deleted");- setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getDepot()));- }-- }.add(new ConfirmOnClick("Do you really want to delete this pull request?")));- return container;- }-- private WebMarkupContainer newIntegrationStrategyContainer() {- WebMarkupContainer integrationStrategyContainer = new WebMarkupContainer("integrationStrategy") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().isOpen());- }-- };-- PullRequest request = getPullRequest();-- final List<IntegrationStrategy> strategies =- GitPlex.getInstance(PullRequestManager.class).getApplicableIntegrationStrategies(request);- if (!strategies.contains(request.getIntegrationStrategy())) {- request.setIntegrationStrategy(strategies.get(0));- GitPlex.getInstance(Dao.class).persist(request);- }- IModel<IntegrationStrategy> strategyModel = new IModel<IntegrationStrategy>() {-- @Override- public void detach() {- }-- @Override- public IntegrationStrategy getObject() {- return getPullRequest().getIntegrationStrategy();- }-- @Override- public void setObject(IntegrationStrategy object) {- getPullRequest().setIntegrationStrategy(object);- }-- };-- DropDownChoice<IntegrationStrategy> editor =- new DropDownChoice<IntegrationStrategy>("editor", strategyModel, strategies) {-- @Override- protected void onConfigure() {- super.onConfigure();-- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());- setVisible(SecurityUtils.getSubject().isPermitted(writePermission) && strategies.size() > 1);- }-- };- editor.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- GitPlex.getInstance(Dao.class).persist(getPullRequest());- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));- }-- });- integrationStrategyContainer.add(editor);-- integrationStrategyContainer.add(new Label("viewer", request.getIntegrationStrategy()) {-- @Override- protected void onConfigure() {- super.onConfigure();-- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());- setVisible(!SecurityUtils.getSubject().isPermitted(writePermission) || strategies.size() == 1);- }-- });-- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());-- if (!SecurityUtils.getSubject().isPermitted(writePermission) || strategies.size() == 1) {- integrationStrategyContainer.add(new WebMarkupContainer("help").add(- new TooltipBehavior(Model.of(getPullRequest().getIntegrationStrategy().getDescription()))));- } else {- StringBuilder strategyHelp = new StringBuilder("<dl class='integration-strategy-help'>");-- for (IntegrationStrategy strategy: strategies) {- strategyHelp.append("<dt>").append(strategy.toString()).append("</dt>");- strategyHelp.append("<dd>").append(strategy.getDescription()).append("</dd>");- }-- strategyHelp.append("</dl>");-- integrationStrategyContainer.add(new WebMarkupContainer("help")- .add(AttributeAppender.append("data-html", "true"))- .add(new TooltipBehavior(Model.of(strategyHelp.toString()), new TooltipConfig().withPlacement(Placement.left))));- }-- return integrationStrategyContainer;- }-- private WebMarkupContainer newWatchContainer() {- final WebMarkupContainer watchContainer = new WebMarkupContainer("watch") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- };-- watchContainer.setOutputMarkupId(true);-- final IModel<WatchStatus> optionModel = new LoadableDetachableModel<WatchStatus>() {-- @Override- protected WatchStatus load() {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- if (watch != null) {- if (watch.isIgnore())- return WatchStatus.IGNORE;- else- return WatchStatus.WATCHING;- } else {- return WatchStatus.NOT_WATCHING;- }- }-- };-- List<WatchStatus> options = Arrays.asList(WatchStatus.values());-- IChoiceRenderer<WatchStatus> choiceRenderer = new IChoiceRenderer<WatchStatus>() {-- @Override- public Object getDisplayValue(WatchStatus object) {- return object.toString();- }-- @Override- public String getIdValue(WatchStatus object, int index) {- return object.name();- }-- @Override- public WatchStatus getObject(String id, IModel<? extends List<? extends WatchStatus>> choices) {- return WatchStatus.valueOf(id);- }-- };- DropDownChoice<WatchStatus> choice = new DropDownChoice<>("option", optionModel,- options, choiceRenderer);-- choice.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- Dao dao = GitPlex.getInstance(Dao.class);- if (optionModel.getObject() == WatchStatus.WATCHING) {- if (watch != null) {- watch.setIgnore(false);- watch.setReason(null);- } else {- watch = new PullRequestWatch();- watch.setRequest(getPullRequest());- watch.setUser(getLoginUser());- getPullRequest().getWatches().add(watch);- }- dao.persist(watch);- } else if (optionModel.getObject() == WatchStatus.NOT_WATCHING) {- if (watch != null) {- dao.remove(watch);- getPullRequest().getWatches().remove(watch);- }- } else {- if (watch != null) {- watch.setIgnore(true);- } else {- watch = new PullRequestWatch();- watch.setRequest(getPullRequest());- watch.setUser(getLoginUser());- watch.setIgnore(true);- getPullRequest().getWatches().add(watch);- }- dao.persist(watch);- }- target.add(watchContainer);- }-- });- watchContainer.add(choice);- watchContainer.add(new Label("help", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- if (watch != null) {- if (watch.isIgnore()) {- return "Ignore notifications irrelevant to me.";- } else if (watch.getReason() != null) {- return watch.getReason();- } else {- return "You will be notified of any activities.";- }- } else {- return "Ignore notifications irrelevant to me, but start to watch once I am involved.";- }- }-- }));-- return watchContainer;- }-- private Component newAssigneeContainer() {- PullRequest request = getPullRequest();-- Fragment assigneeContainer;- Account assignee = request.getAssignee();- boolean canChangeAssignee = request.isOpen() && SecurityUtils.canModify(request);- if (assignee != null) {- if (canChangeAssignee) {- assigneeContainer = new Fragment("assignee", "assigneeEditFrag", this);- assigneeContainer.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(ASSIGNEE_HELP))));-- AssigneeChoice choice = new AssigneeChoice("assignee", depotModel, new IModel<Account>() {-- @Override- public void detach() {- }-- @Override- public Account getObject() {- return getPullRequest().getAssignee();- }-- @Override- public void setObject(Account object) {- getPullRequest().setAssignee(object);- }-- });- choice.setRequired(true);- assigneeContainer.add(choice);- choice.add(new AjaxFormComponentUpdatingBehavior("change") {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- Preconditions.checkNotNull(getPullRequest().getAssignee());- GitPlex.getInstance(PullRequestManager.class).changeAssignee(getPullRequest());- }-- });- } else {- assigneeContainer = new Fragment("assignee", "assigneeViewFrag", this);- assigneeContainer.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(ASSIGNEE_HELP))));- assigneeContainer.add(new Avatar("assignee", assignee, new TooltipConfig()));- }- } else {- assigneeContainer = new Fragment("assignee", "noAssigneeFrag", this);- }-- return assigneeContainer;- }-- private WebMarkupContainer newReviewersContainer() {- WebMarkupContainer reviewersContainer = new WebMarkupContainer("reviewers") {-- @Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = getPullRequest();- if (request.getReviewInvitations().isEmpty()) {- setVisible(request.isOpen()- && !request.getPotentialReviewers().isEmpty()- && SecurityUtils.canModify(request));- } else {- setVisible(true);- }- }-- };- reviewersContainer.setOutputMarkupId(true);- reviewersContainer.add(new ListView<PullRequestReviewInvitation>("reviewers", new ReviewersModel(requestModel)) {-- @Override- protected void populateItem(ListItem<PullRequestReviewInvitation> item) {- PullRequestReviewInvitation invitation = item.getModelObject();- item.add(new ReviewerAvatar("avatar", invitation) {-- @Override- public void onClick(AjaxRequestTarget target) {- super.onClick(target);-- target.add(reviewersContainer);- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));- }-- });-- List<PullRequestReview> userReviews = new ArrayList<>();- for (PullRequestReview review: getPullRequest().getReviews()) {- if (review.getUser().equals(invitation.getUser()))- userReviews.add(review);- }- if (!userReviews.isEmpty()) {- PullRequestReview review = userReviews.get(userReviews.size()-1);- item.add(new ReviewResultIcon("result", new EntityModel<PullRequestReview>(review)));- } else {- item.add(new WebMarkupContainer("result").setVisible(false));- }- }-- });-- reviewersContainer.add(new ReviewerChoice("addReviewer", requestModel) {-- @Override- protected void onSelect(AjaxRequestTarget target, Account user) {- super.onSelect(target, user);-- target.add(reviewersContainer);- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));- }-- });-- return reviewersContainer;- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(RequestListPage.class, paramsOf(depot));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new RequestOverviewResourceReference()));- }--}+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;++import java.util.ArrayList;+import java.util.Arrays;+import java.util.Date;+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.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+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.form.DropDownChoice;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.IChoiceRenderer;+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.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+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.joda.time.DateTime;++import com.google.common.base.Preconditions;+import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.commons.wicket.ConfirmOnClick;+import com.gitplex.commons.wicket.behavior.TooltipBehavior;+import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.entity.PullRequestReference;+import com.gitplex.server.core.entity.PullRequestReview;+import com.gitplex.server.core.entity.PullRequestReviewInvitation;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.core.entity.PullRequestWatch;+import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.security.ObjectPermission;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.Avatar;+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.pullrequest.requestassignee.AssigneeChoice;+import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerAvatar;+import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoice;+import com.gitplex.server.web.component.pullrequest.reviewresult.ReviewResultIcon;+import com.gitplex.server.web.model.EntityModel;+import com.gitplex.server.web.model.ReviewersModel;+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.websocket.PullRequestChanged;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;++@SuppressWarnings("serial")+public class RequestOverviewPage extends RequestDetailPage {++ private static final String ASSIGNEE_HELP = "Assignee has write permission to the "+ + "repository and is resonsible for integrating the pull request into "+ + "target branch after it passes gatekeeper check.";++ private enum WatchStatus {+ WATCHING("Watching"),+ NOT_WATCHING("Not Watching"),+ IGNORE("Ignore");++ private final String displayName;++ WatchStatus(String displayName) {+ this.displayName = displayName;+ }++ @Override+ public String toString() {+ return displayName;+ }++ };++ private RepeatingView activitiesView;++ public RequestOverviewPage(PageParameters params) {+ super(params);+ }++ private Component newActivityRow(String id, PullRequestActivity activity) {+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity)) {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof RequestCommentDeleted) {+ RequestCommentDeleted commentRemoved = (RequestCommentDeleted) event.getPayload();+ remove();+ commentRemoved.getPartialPageRequestHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));+ }+ }++ };+ row.setOutputMarkupId(true);+ String anchor = activity.getAnchor();+ if (anchor != null)+ row.setMarkupId(anchor);++ if (row.get("content") == null)+ row.add(activity.render("content"));++ WebMarkupContainer avatarColumn = new WebMarkupContainer("avatar");+ row.add(avatarColumn);++ if (activity instanceof OpenedActivity) {+ row.add(AttributeAppender.append("class", " discussion"));+ avatarColumn.add(new AvatarLink("avatar", ((OpenedActivity)activity).getRequest().getSubmitter(), null));+ } else if (activity instanceof CommentedActivity) {+ row.add(AttributeAppender.append("class", " discussion"));+ avatarColumn.add(new AvatarLink("avatar", ((CommentedActivity)activity).getComment().getUser(), null));+ } else {+ row.add(AttributeAppender.append("class", " non-discussion"));+ avatarColumn.add(new WebMarkupContainer("avatar"));+ }++ if (activity instanceof UpdatedActivity)+ row.add(AttributeAppender.append("class", " update"));+ else+ row.add(AttributeAppender.append("class", " non-update"));++ return row;+ }++ private List<PullRequestActivity> getActivities() {+ PullRequest request = getPullRequest();+ List<PullRequestActivity> activities = new ArrayList<>();++ activities.add(new OpenedActivity(request));++ for (PullRequestUpdate update: request.getUpdates())+ activities.add(new UpdatedActivity(update));++ for (PullRequestComment comment: request.getComments()) {+ activities.add(new CommentedActivity(comment));+ }++ for (PullRequestReference reference: request.getReferencedBy()) {+ activities.add(new ReferencedActivity(reference));+ }++ for (PullRequestStatusChange statusChange: request.getStatusChanges()) {+ activities.add(new StatusChangeActivity(statusChange));+ }++ activities.sort((o1, o2) -> {+ if (o1.getDate().getTime()<o2.getDate().getTime())+ return -1;+ else if (o1.getDate().getTime()>o2.getDate().getTime())+ return 1;+ else if (o1 instanceof OpenedActivity)+ return -1;+ else+ return 1;+ });++ return activities;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PullRequestChanged) {+ PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();+ IPartialPageRequestHandler partialPageRequestHandler = pullRequestChanged.getPartialPageRequestHandler();++ @SuppressWarnings("deprecation")+ Component prevActivityRow = activitiesView.get(activitiesView.size()-1);+ PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();+ List<PullRequestActivity> newActivities = new ArrayList<>();+ for (PullRequestActivity activity: getActivities()) {+ if (activity.getDate().getTime() > lastActivity.getDate().getTime())+ newActivities.add(activity);+ }++ Component sinceChangesRow = null;+ for (Component row: activitiesView) {+ if (row.getDefaultModelObject() == null) {+ sinceChangesRow = row;+ break;+ }+ }++ if (sinceChangesRow == null && !newActivities.isEmpty()) {+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();+ sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);+ activitiesView.add(sinceChangesRow);+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());+ partialPageRequestHandler.prependJavaScript(script);+ partialPageRequestHandler.add(sinceChangesRow);+ prevActivityRow = sinceChangesRow;+ }++ for (PullRequestActivity activity: newActivities) {+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);+ newActivityRow.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());+ partialPageRequestHandler.prependJavaScript(script);+ partialPageRequestHandler.add(newActivityRow);++ if (activity instanceof UpdatedActivity) {+ partialPageRequestHandler.appendJavaScript("$('tr.since-changes').addClass('visible');");+ }+ prevActivityRow = newActivityRow;+ }+ }+ }++ private Component newSinceChangesRow(String id, Date sinceDate) {+ WebMarkupContainer row = new WebMarkupContainer(id);+ row.setOutputMarkupId(true);+ row.add(AttributeAppender.append("class", " non-discussion"));++ WebMarkupContainer avatarColumn = new WebMarkupContainer("avatar");+ avatarColumn.add(new WebMarkupContainer("avatar"));+ row.add(avatarColumn);++ WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);+ contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));+ row.add(contentColumn);++ row.add(AttributeAppender.append("class", "since-changes"));++ return row;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(activitiesView = new RepeatingView("requestActivities"));+ activitiesView.setOutputMarkupId(true);++ List<PullRequestActivity> activities = getActivities();++ PullRequest request = getPullRequest();+ List<PullRequestActivity> oldActivities = new ArrayList<>();+ List<PullRequestActivity> newActivities = new ArrayList<>();+ for (PullRequestActivity activity: activities) {+ if (request.isVisitedAfter(activity.getDate())) {+ oldActivities.add(activity);+ } else {+ newActivities.add(activity);+ }+ }++ for (PullRequestActivity activity: oldActivities) {+ activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));+ }++ if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();+ Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);+ for (PullRequestActivity activity: newActivities) {+ if (activity instanceof UpdatedActivity) {+ row.add(AttributeAppender.append("class", "visible"));+ break;+ }+ }+ activitiesView.add(row);+ }++ for (PullRequestActivity activity: newActivities) {+ Component row = newActivityRow(activitiesView.newChildId(), activity);+ row.add(AttributeAppender.append("class", "new"));+ activitiesView.add(row);+ }++ WebMarkupContainer addComment = new WebMarkupContainer("addComment") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null);+ }++ };+ addComment.setOutputMarkupId(true);+ add(addComment);++ Form<?> form = new Form<Void>("form");+ addComment.add(form);++ CommentInput input = new CommentInput("input", Model.of("")) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());+ }++ @Override+ protected Depot getDepot() {+ return RequestOverviewPage.this.getDepot();+ }++ };+ input.setRequired(true);+ form.add(input);++ form.add(new NotificationPanel("feedback", input));++ form.add(new AjaxSubmitLink("comment") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ PullRequestComment comment = new PullRequestComment();+ comment.setRequest(getPullRequest());+ comment.setUser(getLoginUser());+ comment.setContent(input.getModelObject());+ GitPlex.getInstance(PullRequestCommentManager.class).save(comment);+ input.setModelObject("");++ target.add(addComment);++ @SuppressWarnings("deprecation")+ Component lastActivityRow = activitiesView.get(activitiesView.size()-1);+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());+ target.prependJavaScript(script);+ target.add(newActivityRow);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });++ add(newIntegrationStrategyContainer());+ add(newAssigneeContainer());+ add(newReviewersContainer());+ add(newWatchContainer());+ add(newManageContainer());+ }++ private WebMarkupContainer newManageContainer() {+ WebMarkupContainer container = new WebMarkupContainer("manage");+ container.setVisible(SecurityUtils.canModify(getPullRequest()));+ container.add(new Link<Void>("synchronize") {++ @Override+ public void onClick() {+ GitPlex.getInstance(PullRequestManager.class).check(getPullRequest());+ Session.get().success("Pull request is synchronized");+ }++ });+ container.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ PullRequest request = getPullRequest();+ GitPlex.getInstance(PullRequestManager.class).delete(request);+ Session.get().success("Pull request #" + request.getNumber() + " is deleted");+ setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getDepot()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete this pull request?")));+ return container;+ }++ private WebMarkupContainer newIntegrationStrategyContainer() {+ WebMarkupContainer integrationStrategyContainer = new WebMarkupContainer("integrationStrategy") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isOpen());+ }++ };++ PullRequest request = getPullRequest();++ final List<IntegrationStrategy> strategies =+ GitPlex.getInstance(PullRequestManager.class).getApplicableIntegrationStrategies(request);+ if (!strategies.contains(request.getIntegrationStrategy())) {+ request.setIntegrationStrategy(strategies.get(0));+ GitPlex.getInstance(Dao.class).persist(request);+ }+ IModel<IntegrationStrategy> strategyModel = new IModel<IntegrationStrategy>() {++ @Override+ public void detach() {+ }++ @Override+ public IntegrationStrategy getObject() {+ return getPullRequest().getIntegrationStrategy();+ }++ @Override+ public void setObject(IntegrationStrategy object) {+ getPullRequest().setIntegrationStrategy(object);+ }++ };++ DropDownChoice<IntegrationStrategy> editor =+ new DropDownChoice<IntegrationStrategy>("editor", strategyModel, strategies) {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());+ setVisible(SecurityUtils.getSubject().isPermitted(writePermission) && strategies.size() > 1);+ }++ };+ editor.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ GitPlex.getInstance(Dao.class).persist(getPullRequest());+ send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ }++ });+ integrationStrategyContainer.add(editor);++ integrationStrategyContainer.add(new Label("viewer", request.getIntegrationStrategy()) {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());+ setVisible(!SecurityUtils.getSubject().isPermitted(writePermission) || strategies.size() == 1);+ }++ });++ ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());++ if (!SecurityUtils.getSubject().isPermitted(writePermission) || strategies.size() == 1) {+ integrationStrategyContainer.add(new WebMarkupContainer("help").add(+ new TooltipBehavior(Model.of(getPullRequest().getIntegrationStrategy().getDescription()))));+ } else {+ StringBuilder strategyHelp = new StringBuilder("<dl class='integration-strategy-help'>");++ for (IntegrationStrategy strategy: strategies) {+ strategyHelp.append("<dt>").append(strategy.toString()).append("</dt>");+ strategyHelp.append("<dd>").append(strategy.getDescription()).append("</dd>");+ }++ strategyHelp.append("</dl>");++ integrationStrategyContainer.add(new WebMarkupContainer("help")+ .add(AttributeAppender.append("data-html", "true"))+ .add(new TooltipBehavior(Model.of(strategyHelp.toString()), new TooltipConfig().withPlacement(Placement.left))));+ }++ return integrationStrategyContainer;+ }++ private WebMarkupContainer newWatchContainer() {+ final WebMarkupContainer watchContainer = new WebMarkupContainer("watch") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null);+ }++ };++ watchContainer.setOutputMarkupId(true);++ final IModel<WatchStatus> optionModel = new LoadableDetachableModel<WatchStatus>() {++ @Override+ protected WatchStatus load() {+ PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());+ if (watch != null) {+ if (watch.isIgnore())+ return WatchStatus.IGNORE;+ else+ return WatchStatus.WATCHING;+ } else {+ return WatchStatus.NOT_WATCHING;+ }+ }++ };++ List<WatchStatus> options = Arrays.asList(WatchStatus.values());++ IChoiceRenderer<WatchStatus> choiceRenderer = new IChoiceRenderer<WatchStatus>() {++ @Override+ public Object getDisplayValue(WatchStatus object) {+ return object.toString();+ }++ @Override+ public String getIdValue(WatchStatus object, int index) {+ return object.name();+ }++ @Override+ public WatchStatus getObject(String id, IModel<? extends List<? extends WatchStatus>> choices) {+ return WatchStatus.valueOf(id);+ }++ };+ DropDownChoice<WatchStatus> choice = new DropDownChoice<>("option", optionModel,+ options, choiceRenderer);++ choice.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());+ Dao dao = GitPlex.getInstance(Dao.class);+ if (optionModel.getObject() == WatchStatus.WATCHING) {+ if (watch != null) {+ watch.setIgnore(false);+ watch.setReason(null);+ } else {+ watch = new PullRequestWatch();+ watch.setRequest(getPullRequest());+ watch.setUser(getLoginUser());+ getPullRequest().getWatches().add(watch);+ }+ dao.persist(watch);+ } else if (optionModel.getObject() == WatchStatus.NOT_WATCHING) {+ if (watch != null) {+ dao.remove(watch);+ getPullRequest().getWatches().remove(watch);+ }+ } else {+ if (watch != null) {+ watch.setIgnore(true);+ } else {+ watch = new PullRequestWatch();+ watch.setRequest(getPullRequest());+ watch.setUser(getLoginUser());+ watch.setIgnore(true);+ getPullRequest().getWatches().add(watch);+ }+ dao.persist(watch);+ }+ target.add(watchContainer);+ }++ });+ watchContainer.add(choice);+ watchContainer.add(new Label("help", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());+ if (watch != null) {+ if (watch.isIgnore()) {+ return "Ignore notifications irrelevant to me.";+ } else if (watch.getReason() != null) {+ return watch.getReason();+ } else {+ return "You will be notified of any activities.";+ }+ } else {+ return "Ignore notifications irrelevant to me, but start to watch once I am involved.";+ }+ }++ }));++ return watchContainer;+ }++ private Component newAssigneeContainer() {+ PullRequest request = getPullRequest();++ Fragment assigneeContainer;+ Account assignee = request.getAssignee();+ boolean canChangeAssignee = request.isOpen() && SecurityUtils.canModify(request);+ if (assignee != null) {+ if (canChangeAssignee) {+ assigneeContainer = new Fragment("assignee", "assigneeEditFrag", this);+ assigneeContainer.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(ASSIGNEE_HELP))));++ AssigneeChoice choice = new AssigneeChoice("assignee", depotModel, new IModel<Account>() {++ @Override+ public void detach() {+ }++ @Override+ public Account getObject() {+ return getPullRequest().getAssignee();+ }++ @Override+ public void setObject(Account object) {+ getPullRequest().setAssignee(object);+ }++ });+ choice.setRequired(true);+ assigneeContainer.add(choice);+ choice.add(new AjaxFormComponentUpdatingBehavior("change") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ Preconditions.checkNotNull(getPullRequest().getAssignee());+ GitPlex.getInstance(PullRequestManager.class).changeAssignee(getPullRequest());+ }++ });+ } else {+ assigneeContainer = new Fragment("assignee", "assigneeViewFrag", this);+ assigneeContainer.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(ASSIGNEE_HELP))));+ assigneeContainer.add(new Avatar("assignee", assignee, new TooltipConfig()));+ }+ } else {+ assigneeContainer = new Fragment("assignee", "noAssigneeFrag", this);+ }++ return assigneeContainer;+ }++ private WebMarkupContainer newReviewersContainer() {+ WebMarkupContainer reviewersContainer = new WebMarkupContainer("reviewers") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ if (request.getReviewInvitations().isEmpty()) {+ setVisible(request.isOpen()+ && !request.getPotentialReviewers().isEmpty()+ && SecurityUtils.canModify(request));+ } else {+ setVisible(true);+ }+ }++ };+ reviewersContainer.setOutputMarkupId(true);+ reviewersContainer.add(new ListView<PullRequestReviewInvitation>("reviewers", new ReviewersModel(requestModel)) {++ @Override+ protected void populateItem(ListItem<PullRequestReviewInvitation> item) {+ PullRequestReviewInvitation invitation = item.getModelObject();+ item.add(new ReviewerAvatar("avatar", invitation) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ super.onClick(target);++ target.add(reviewersContainer);+ send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ }++ });++ List<PullRequestReview> userReviews = new ArrayList<>();+ for (PullRequestReview review: getPullRequest().getReviews()) {+ if (review.getUser().equals(invitation.getUser()))+ userReviews.add(review);+ }+ if (!userReviews.isEmpty()) {+ PullRequestReview review = userReviews.get(userReviews.size()-1);+ item.add(new ReviewResultIcon("result", new EntityModel<PullRequestReview>(review)));+ } else {+ item.add(new WebMarkupContainer("result").setVisible(false));+ }+ }++ });++ reviewersContainer.add(new ReviewerChoice("addReviewer", requestModel) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Account user) {+ super.onSelect(target, user);++ target.add(reviewersContainer);+ send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ }++ });++ return reviewersContainer;+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ setResponsePage(RequestListPage.class, paramsOf(depot));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new RequestOverviewResourceReference()));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javasimilarity index 80%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javaindex 82f01afbb8..0ce1b715e3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javaindex 1dc9fa1bc6..d51fa40a14 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview;import java.util.Date;@@ -9,10 +9,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.websocket.PullRequestChanged;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.websocket.PullRequestChanged;@SuppressWarnings("serial")public class SinceChangesLink extends BookmarkablePageLink<Void> {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.javaindex 65014aceb5..266af330c8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import java.util.Date;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class CommentedActivity implements PullRequestActivity {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javaindex ec050fec72..58b5d294fd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -16,22 +16,22 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.hibernate.StaleStateException;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestComment;-import com.gitplex.core.manager.PullRequestCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestComment;+import com.gitplex.server.core.manager.PullRequestCommentManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.comment.CommentInput;+import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;+import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.javasimilarity index 70%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.javaindex b0ea49edc1..228f6003e7 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import java.util.Date;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class OpenedActivity implements PullRequestActivity {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javaindex 1054964918..3431f55729 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -16,20 +16,20 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.hibernate.StaleStateException;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.PullRequestManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.PullRequestManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.comment.CommentInput;+import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.javaindex f151596d73..3b9408b1cb 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import java.util.Date;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequestReference;-import com.gitplex.core.manager.PullRequestReferenceManager;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequestReference;+import com.gitplex.server.core.manager.PullRequestReferenceManager;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class ReferencedActivity implements PullRequestActivity {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javasimilarity index 71%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javaindex b16c213830..19da76a6e6 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java@@ -1,49 +1,49 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;--import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestReference;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.pullrequest.requeststatus.RequestStatusPanel;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.util.DateUtils;--@SuppressWarnings("serial")-class ReferencedPanel extends GenericPanel<PullRequestReference> {-- public ReferencedPanel(String id, IModel<PullRequestReference> model) {- super(id, model);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PullRequestReference reference = getModelObject();- add(new AvatarLink("avatar", reference.getUser(), null));- add(new AccountLink("name", reference.getUser()));- add(new Label("age", DateUtils.formatAge(reference.getDate())));-- BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("link",- RequestOverviewPage.class, RequestOverviewPage.paramsOf(reference.getReferencedBy()));- link.add(new Label("number", "#" + reference.getReferencedBy().getNumber()));- link.add(new Label("title", reference.getReferencedBy().getTitle()));- add(link);-- add(new RequestStatusPanel("status", new AbstractReadOnlyModel<PullRequest>() {-- @Override- public PullRequest getObject() {- return ReferencedPanel.this.getModelObject().getReferencedBy();- }-- }, false));- }--}+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;++import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestReference;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;+import com.gitplex.server.web.util.DateUtils;++@SuppressWarnings("serial")+class ReferencedPanel extends GenericPanel<PullRequestReference> {++ public ReferencedPanel(String id, IModel<PullRequestReference> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequestReference reference = getModelObject();+ add(new AvatarLink("avatar", reference.getUser(), null));+ add(new AccountLink("name", reference.getUser()));+ add(new Label("age", DateUtils.formatAge(reference.getDate())));++ BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("link",+ RequestOverviewPage.class, RequestOverviewPage.paramsOf(reference.getReferencedBy()));+ link.add(new Label("number", "#" + reference.getReferencedBy().getNumber()));+ link.add(new Label("title", reference.getReferencedBy().getTitle()));+ add(link);++ add(new RequestStatusPanel("status", new AbstractReadOnlyModel<PullRequest>() {++ @Override+ public PullRequest getObject() {+ return ReferencedPanel.this.getModelObject().getReferencedBy();+ }++ }, false));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javasimilarity index 72%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javaindex 29532dfd69..8b7ba38bb5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javasimilarity index 72%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javaindex ce6835951a..d0f928e37e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import java.util.Date;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.manager.PullRequestStatusChangeManager;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class StatusChangeActivity implements PullRequestActivity {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javaindex dc1e9e8101..c83c1d7654 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java@@ -1,210 +1,210 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-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.ajax.markup.html.form.AjaxButton;-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.Form;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.GenericPanel;-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.hibernate.StaleStateException;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestStatusChange;-import com.gitplex.core.manager.PullRequestStatusChangeManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;-import com.gitplex.web.util.DateUtils;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--@SuppressWarnings("serial")-class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {-- public StatusChangePanel(String id, IModel<PullRequestStatusChange> model) {- super(id, model);- }-- private Component newViewer() {- Fragment viewer = new Fragment("body", "viewFrag", this);-- String note = getStatusChange().getNote();- if (StringUtils.isNotBlank(note)) {- MarkdownEditSupport editSupport;- if (SecurityUtils.canModify(getStatusChange())) {- editSupport = new MarkdownEditSupport() {-- @Override- public void setContent(String content) {- getStatusChange().setNote(content);- GitPlex.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange());- }-- @Override- public long getVersion() {- return getStatusChange().getVersion();- }-- };- } else {- editSupport = null;- }- viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getStatusChange().getNote();- }-- }, editSupport));- } else {- viewer.add(new Label("content", "<i>No note</i>").setEscapeModelStrings(false));- }-- WebMarkupContainer actions = new WebMarkupContainer("actions");- actions.setVisible(SecurityUtils.canModify(getStatusChange()));- actions.add(new AjaxLink<Void>("edit") {-- @Override- public void onClick(AjaxRequestTarget target) {- Fragment editor = new Fragment("body", "editFrag", StatusChangePanel.this);-- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);- editor.add(form);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- long lastVersion = getStatusChange().getVersion();- CommentInput input = new CommentInput("input", Model.of(getStatusChange().getNote())) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(getStatusChange().getRequest().getTargetDepot(),- getStatusChange().getRequest().getUUID());- }-- @Override- protected Depot getDepot() {- return getStatusChange().getRequest().getTargetDepot();- }-- };- form.add(input);-- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- try {- if (getStatusChange().getVersion() != lastVersion)- throw new StaleStateException("");- getStatusChange().setNote(input.getModelObject());- GitPlex.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange());-- Component viewer = newViewer();- editor.replaceWith(viewer);- target.add(viewer);- } catch (StaleStateException e) {- error("Some one changed the content you are editing. Reload the page and try again.");- target.add(feedback);- }- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- Component viewer = newViewer();- editor.replaceWith(viewer);- target.add(viewer);- }-- });-- editor.setOutputMarkupId(true);- viewer.replaceWith(editor);- target.add(editor);- }-- });-- viewer.add(actions);-- viewer.setOutputMarkupId(true);- return viewer;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PullRequestStatusChange statusChange = getModelObject();-- WebMarkupContainer container = new WebMarkupContainer("statusChange");- String activityName = statusChange.getType().getName();- container.add(AttributeAppender.append("class", "activity " + activityName.replace(" ", "-").replace("(", "").replace(")", "").toLowerCase()));-- WebMarkupContainer icon = new WebMarkupContainer("icon");- container.add(icon);- String iconClass = statusChange.getType().getIconClass();- if (iconClass != null)- icon.add(AttributeAppender.append("class", iconClass));-- container.add(new AvatarLink("userAvatar", statusChange.getUser(), null));- container.add(new AccountLink("userName", statusChange.getUser()));- 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>() {-- @Override- protected PullRequest load() {- return StatusChangePanel.this.getModelObject().getRequest();- }-- }, statusChange.getDate()));-- container.add(newViewer());-- add(container);- }-- private PullRequestStatusChange getStatusChange() {- return getModelObject();- }-}+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+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.ajax.markup.html.form.AjaxButton;+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.Form;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+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.hibernate.StaleStateException;++import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;+import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;+import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestStatusChange;+import com.gitplex.server.core.manager.PullRequestStatusChangeManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+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.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;+import com.gitplex.server.web.util.DateUtils;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++@SuppressWarnings("serial")+class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {++ public StatusChangePanel(String id, IModel<PullRequestStatusChange> model) {+ super(id, model);+ }++ private Component newViewer() {+ Fragment viewer = new Fragment("body", "viewFrag", this);++ String note = getStatusChange().getNote();+ if (StringUtils.isNotBlank(note)) {+ MarkdownEditSupport editSupport;+ if (SecurityUtils.canModify(getStatusChange())) {+ editSupport = new MarkdownEditSupport() {++ @Override+ public void setContent(String content) {+ getStatusChange().setNote(content);+ GitPlex.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange());+ }++ @Override+ public long getVersion() {+ return getStatusChange().getVersion();+ }++ };+ } else {+ editSupport = null;+ }+ viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getStatusChange().getNote();+ }++ }, editSupport));+ } else {+ viewer.add(new Label("content", "<i>No note</i>").setEscapeModelStrings(false));+ }++ WebMarkupContainer actions = new WebMarkupContainer("actions");+ actions.setVisible(SecurityUtils.canModify(getStatusChange()));+ actions.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment editor = new Fragment("body", "editFrag", StatusChangePanel.this);++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ editor.add(form);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ long lastVersion = getStatusChange().getVersion();+ CommentInput input = new CommentInput("input", Model.of(getStatusChange().getNote())) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(getStatusChange().getRequest().getTargetDepot(),+ getStatusChange().getRequest().getUUID());+ }++ @Override+ protected Depot getDepot() {+ return getStatusChange().getRequest().getTargetDepot();+ }++ };+ form.add(input);++ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ try {+ if (getStatusChange().getVersion() != lastVersion)+ throw new StaleStateException("");+ getStatusChange().setNote(input.getModelObject());+ GitPlex.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange());++ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ } catch (StaleStateException e) {+ error("Some one changed the content you are editing. Reload the page and try again.");+ target.add(feedback);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ }++ });++ editor.setOutputMarkupId(true);+ viewer.replaceWith(editor);+ target.add(editor);+ }++ });++ viewer.add(actions);++ viewer.setOutputMarkupId(true);+ return viewer;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequestStatusChange statusChange = getModelObject();++ WebMarkupContainer container = new WebMarkupContainer("statusChange");+ String activityName = statusChange.getType().getName();+ container.add(AttributeAppender.append("class", "activity " + activityName.replace(" ", "-").replace("(", "").replace(")", "").toLowerCase()));++ WebMarkupContainer icon = new WebMarkupContainer("icon");+ container.add(icon);+ String iconClass = statusChange.getType().getIconClass();+ if (iconClass != null)+ icon.add(AttributeAppender.append("class", iconClass));++ container.add(new AvatarLink("userAvatar", statusChange.getUser(), null));+ container.add(new AccountLink("userName", statusChange.getUser()));+ 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>() {++ @Override+ protected PullRequest load() {+ return StatusChangePanel.this.getModelObject().getRequest();+ }++ }, statusChange.getDate()));++ container.add(newViewer());++ add(container);+ }++ private PullRequestStatusChange getStatusChange() {+ return getModelObject();+ }+}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.javasimilarity index 75%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.javaindex bc24b9f378..1ac5430159 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java@@ -1,14 +1,14 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import java.util.Date;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;import com.gitplex.commons.hibernate.dao.Dao;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class UpdatedActivity implements PullRequestActivity {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javaindex 8a3022c3d9..ac3b3e0700 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java@@ -1,150 +1,150 @@-package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;--import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;-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.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.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.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.revwalk.RevCommit;--import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.PullRequestUpdate;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;-import com.gitplex.web.component.pullrequest.verificationstatus.VerificationStatusPanel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.websocket.PullRequestChanged;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;--@SuppressWarnings("serial")-class UpdatedPanel extends GenericPanel<PullRequestUpdate> {-- public UpdatedPanel(String id, IModel<PullRequestUpdate> model) {- super(id, model);- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- visitChildren(VerificationStatusPanel.class, new IVisitor<VerificationStatusPanel, Void>() {-- @Override- public void component(VerificationStatusPanel object, IVisit<Void> visit) {- pullRequestChanged.getPartialPageRequestHandler().add(object);- }-- });- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;- add(new Label("tooManyCommits", tooManyMessage) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getUpdate().getCommits().size()>Constants.MAX_DISPLAY_COMMITS);- }-- });- add(new ListView<RevCommit>("commits", new LoadableDetachableModel<List<RevCommit>>() {-- @Override- protected List<RevCommit> load() {- List<RevCommit> commits = getUpdate().getCommits();- if (commits.size() > Constants.MAX_DISPLAY_COMMITS)- return commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());- else- return commits;- }-- }) {-- @Override- protected void populateItem(final ListItem<RevCommit> item) {- RevCommit commit = item.getModelObject();-- item.add(new AvatarLink("author", commit.getAuthorIdent(), new TooltipConfig()));-- IModel<Depot> depotModel = new AbstractReadOnlyModel<Depot>() {-- @Override- public Depot getObject() {- return getUpdate().getRequest().getTarget().getDepot();- }-- };- item.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));-- IModel<PullRequest> requestModel = new AbstractReadOnlyModel<PullRequest>() {-- @Override- public PullRequest getObject() {- return getUpdate().getRequest();- }-- };- item.add(new VerificationStatusPanel("verification", requestModel, Model.of(commit.name())));-- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = commit.name();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<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()))));-- DepotFilePage.State browseState = new DepotFilePage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));-- if (getUpdate().getRequest().getTarget().getObjectId(false) != null) {- if (getUpdate().getRequest().getMergedCommits().contains(commit)) {- item.add(AttributeAppender.append("class", " integrated"));- item.add(AttributeAppender.append("title", "This commit has been integrated"));- } else if (!getUpdate().getRequest().getPendingCommits().contains(commit)) {- item.add(AttributeAppender.append("class", " rebased"));- item.add(AttributeAppender.append("title", "This commit has been rebased"));- }- }-- }-- });-- }-- private PullRequestUpdate getUpdate() {- return getModelObject();- }--}+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;++import java.util.List;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.IEvent;+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.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.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.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.revwalk.RevCommit;++import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.PullRequestUpdate;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;+import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;+import com.gitplex.server.web.page.depot.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.websocket.PullRequestChanged;++import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;++@SuppressWarnings("serial")+class UpdatedPanel extends GenericPanel<PullRequestUpdate> {++ public UpdatedPanel(String id, IModel<PullRequestUpdate> model) {+ super(id, model);+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PullRequestChanged) {+ PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();+ visitChildren(VerificationStatusPanel.class, new IVisitor<VerificationStatusPanel, Void>() {++ @Override+ public void component(VerificationStatusPanel object, IVisit<Void> visit) {+ pullRequestChanged.getPartialPageRequestHandler().add(object);+ }++ });+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;+ add(new Label("tooManyCommits", tooManyMessage) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUpdate().getCommits().size()>Constants.MAX_DISPLAY_COMMITS);+ }++ });+ add(new ListView<RevCommit>("commits", new LoadableDetachableModel<List<RevCommit>>() {++ @Override+ protected List<RevCommit> load() {+ List<RevCommit> commits = getUpdate().getCommits();+ if (commits.size() > Constants.MAX_DISPLAY_COMMITS)+ return commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());+ else+ return commits;+ }++ }) {++ @Override+ protected void populateItem(final ListItem<RevCommit> item) {+ RevCommit commit = item.getModelObject();++ item.add(new AvatarLink("author", commit.getAuthorIdent(), new TooltipConfig()));++ IModel<Depot> depotModel = new AbstractReadOnlyModel<Depot>() {++ @Override+ public Depot getObject() {+ return getUpdate().getRequest().getTarget().getDepot();+ }++ };+ item.add(new ExpandableCommitMessagePanel("message", depotModel, item.getModel()));++ IModel<PullRequest> requestModel = new AbstractReadOnlyModel<PullRequest>() {++ @Override+ public PullRequest getObject() {+ return getUpdate().getRequest();+ }++ };+ item.add(new VerificationStatusPanel("verification", requestModel, Model.of(commit.name())));++ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);+ Link<Void> hashLink = new BookmarkablePageLink<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()))));++ DepotFilePage.State browseState = new DepotFilePage.State();+ browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);+ item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));++ if (getUpdate().getRequest().getTarget().getObjectId(false) != null) {+ if (getUpdate().getRequest().getMergedCommits().contains(commit)) {+ item.add(AttributeAppender.append("class", " integrated"));+ item.add(AttributeAppender.append("title", "This commit has been integrated"));+ } else if (!getUpdate().getRequest().getPendingCommits().contains(commit)) {+ item.add(AttributeAppender.append("class", " rebased"));+ item.add(AttributeAppender.append("title", "This commit has been rebased"));+ }+ }++ }++ });++ }++ private PullRequestUpdate getUpdate() {+ return getModelObject();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/request-overview.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/request-overview.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.javaindex 0bd9ce1e3c..855be8a1c9 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.depot.pullrequest.requestlist;import java.util.ArrayList;import java.util.Date;@@ -32,26 +32,26 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.web.Constants;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.BranchLink;-import com.gitplex.web.component.pullrequest.requeststatus.RequestStatusPanel;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;-import com.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Direction;-import com.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Status;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.component.menu.MenuItem;import com.gitplex.commons.wicket.component.menu.MenuLink;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.BranchLink;+import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;+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.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.javasimilarity index 81%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.javaindex 5ff9840c60..7a79601e17 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.depot.pullrequest.requestlist;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.javaindex fbed906fdc..5545e01af4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java@@ -1,9 +1,9 @@-package com.gitplex.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.depot.pullrequest.requestlist;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofSource;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofSourceDepot;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofTarget;-import static com.gitplex.core.entity.PullRequest.CriterionHelper.ofTargetDepot;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSource;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSourceDepot;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTarget;+import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTargetDepot;import java.io.Serializable;import java.util.Date;@@ -13,13 +13,13 @@ import javax.validation.constraints.NotNull;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.gitplex.core.annotation.AccountChoice;-import com.gitplex.core.annotation.BranchChoice;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.DepotAndBranch;import com.gitplex.commons.hibernate.dao.EntityCriteria;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.annotation.AccountChoice;+import com.gitplex.server.core.annotation.BranchChoice;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.PullRequest;+import com.gitplex.server.core.entity.support.DepotAndBranch;@SuppressWarnings("serial")@Editablediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.javaindex a20d75ef31..5a0145c909 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.pullrequest.requestlist;+package com.gitplex.server.web.page.depot.pullrequest.requestlist;import java.io.Serializable;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/request-list.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/request-list.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/request-list.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/request-list.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.javasimilarity index 77%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.javaindex a47b99da8f..bcaf01509b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting;+package com.gitplex.server.web.page.depot.setting;import java.util.ArrayList;import java.util.List;@@ -8,17 +8,17 @@ 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.core.security.SecurityUtils;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;-import com.gitplex.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;-import com.gitplex.web.page.depot.setting.gatekeeper.GateKeeperPage;-import com.gitplex.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;import com.gitplex.commons.wicket.component.tabbable.PageTab;import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.server.core.security.SecurityUtils;+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.DepotTeamListPage;+import com.gitplex.server.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;+import com.gitplex.server.web.page.depot.setting.gatekeeper.GateKeeperPage;+import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;+import com.gitplex.server.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;@SuppressWarnings("serial")public abstract class DepotSettingPage extends DepotPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.javaindex 4abe07e811..7c7ec4a201 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting;+package com.gitplex.server.web.page.depot.setting;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.javasimilarity index 98%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.javaindex 2e8e51c64d..a7944d7775 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting;+package com.gitplex.server.web.page.depot.setting;import org.apache.wicket.Component;import org.apache.wicket.model.Model;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.javaindex aaae92fd91..ae8d571f58 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting;+package com.gitplex.server.web.page.depot.setting;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.javaindex 4e797f22d8..deadf062e4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java@@ -1,374 +1,374 @@-package com.gitplex.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.BookmarkablePageLink;-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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--@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) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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, Constants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add collaborator...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.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 BookmarkablePageLink<Void>("avatarLink", CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));- link.add(new Avatar("avatar", authorization.getUser()));- item.add(link);-- link = new BookmarkablePageLink<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 BookmarkablePageLink<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) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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));- }--}+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.BookmarkablePageLink;+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.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.UserAuthorizationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+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.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+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;++@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) {+ return new PrivilegeSelectionPanel(id, false, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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, Constants.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 BookmarkablePageLink<Void>("avatarLink", CollaboratorDepotListPage.class,+ CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));+ link.add(new Avatar("avatar", authorization.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<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 BookmarkablePageLink<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) {+ return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javaindex 57670befb2..345077b0f0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java@@ -1,295 +1,295 @@-package com.gitplex.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.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;-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.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--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) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- 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;- }-- }, Constants.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 BookmarkablePageLink<Void>(- "avatarLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new BookmarkablePageLink<Void>(- "nameLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());- link = new BookmarkablePageLink<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 BookmarkablePageLink<Void>(- "avatarLink",- CollaboratorDepotListPage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new BookmarkablePageLink<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 BookmarkablePageLink<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;- }-- }--}+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.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;+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.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.OrganizationMembership;+import com.gitplex.server.core.entity.UserAuthorization;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.depotaccess.DepotAccess;+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 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) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ 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;+ }++ }, Constants.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 BookmarkablePageLink<Void>(+ "avatarLink",+ MemberEffectivePrivilegePage.class,+ params);+ link.add(new Avatar("avatar", permission.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<Void>(+ "nameLink",+ MemberEffectivePrivilegePage.class,+ params);+ link.add(new Label("name", permission.getUser().getDisplayName()));+ item.add(link);++ params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());+ link = new BookmarkablePageLink<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 BookmarkablePageLink<Void>(+ "avatarLink",+ CollaboratorDepotListPage.class,+ params);+ link.add(new Avatar("avatar", permission.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<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 BookmarkablePageLink<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/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.javaindex 46d8cb6d82..9f481b2dc3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.authorization;+package com.gitplex.server.web.page.depot.setting.authorization;import java.util.ArrayList;import java.util.Collection;@@ -23,27 +23,27 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.component.teamchoice.AbstractTeamChoiceProvider;-import com.gitplex.web.component.teamchoice.TeamChoiceResourceReference;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.account.teams.TeamDepotListPage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.modal.ModalLink;import com.gitplex.commons.wicket.component.select2.Response;import com.gitplex.commons.wicket.component.select2.ResponseFiller;import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.Team;+import com.gitplex.server.core.entity.TeamAuthorization;+import com.gitplex.server.core.manager.TeamAuthorizationManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.core.security.privilege.DepotPrivilege;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;+import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.server.web.component.teamchoice.AbstractTeamChoiceProvider;+import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;+import com.gitplex.server.web.depotaccess.DepotAccess;+import com.gitplex.server.web.page.account.teams.TeamDepotListPage;+import com.gitplex.server.web.page.depot.setting.DepotSettingPage;@SuppressWarnings("serial")public class DepotTeamListPage extends DepotSettingPage {@@ -153,9 +153,9 @@ public class DepotTeamListPage extends DepotSettingPage {super.onInitialize();getSettings().setPlaceholder("Select team to authorize...");- getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");+ getSettings().setFormatResult("gitplex.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.server.teamChoiceFormatter.escapeMarkup");}@Overridediff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.javaindex 0a545eb103..f533ad772d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.commitmessagetransform;+package com.gitplex.server.web.page.depot.setting.commitmessagetransform;import java.io.Serializable;@@ -7,13 +7,13 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.CommitMessageTransformSetting;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.setting.DepotSettingPage;import com.gitplex.commons.wicket.editable.PropertyDescriptor;import com.gitplex.commons.wicket.editable.reflection.ReflectionPropertyEditor;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.page.depot.setting.DepotSettingPage;@SuppressWarnings("serial")public class CommitMessageTransformPage extends DepotSettingPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/depot-setting.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/depot-setting.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/depot-setting.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/depot-setting.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.javaindex d100774273..ad248ce00a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import java.util.ArrayList;import java.util.List;@@ -6,19 +6,19 @@ import java.util.stream.Collectors;import org.apache.wicket.ajax.AjaxRequestTarget;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.AndGateKeeper;-import com.gitplex.core.gatekeeper.AndOrGateKeeper;-import com.gitplex.core.gatekeeper.CompositeGateKeeper;-import com.gitplex.core.gatekeeper.ConditionalGateKeeper;-import com.gitplex.core.gatekeeper.DefaultGateKeeper;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.gatekeeper.NotGateKeeper;-import com.gitplex.core.manager.DepotManager;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.gitplex.commons.wicket.behavior.dragdrop.DropBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.AndGateKeeper;+import com.gitplex.server.core.gatekeeper.AndOrGateKeeper;+import com.gitplex.server.core.gatekeeper.CompositeGateKeeper;+import com.gitplex.server.core.gatekeeper.ConditionalGateKeeper;+import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.gatekeeper.NotGateKeeper;+import com.gitplex.server.core.manager.DepotManager;abstract class GateKeeperDropBehavior extends DropBehavior {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.javaindex 818d9f82c2..4dbe18ec6c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.core.gatekeeper.GateKeeper;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.gatekeeper.GateKeeper;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.javaindex 8fa6a08e24..3b416f6cfd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import java.util.List;@@ -6,10 +6,10 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;-import com.gitplex.core.gatekeeper.GateKeeper;import com.gitplex.commons.wicket.component.DropdownLink;import com.gitplex.commons.wicket.component.floating.AlignPlacement;import com.gitplex.commons.wicket.component.floating.FloatingPanel;+import com.gitplex.server.core.gatekeeper.GateKeeper;@SuppressWarnings("serial")abstract class GateKeeperLink extends DropdownLink {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.javaindex a0dc5315a6..39c589c441 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import java.util.List;@@ -10,14 +10,14 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.setting.DepotSettingPage;import com.gitplex.commons.util.ReflectionUtils;import com.gitplex.commons.wicket.component.modal.ModalPanel;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.page.depot.setting.DepotSettingPage;import jersey.repackaged.com.google.common.collect.Lists;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.javasimilarity index 96%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.javaindex 81bceec88e..9776965f10 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import java.util.ArrayList;import java.util.List;@@ -18,13 +18,6 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.gitplex.core.gatekeeper.AbstractGateKeeper;-import com.gitplex.core.gatekeeper.AndGateKeeper;-import com.gitplex.core.gatekeeper.AndOrGateKeeper;-import com.gitplex.core.gatekeeper.ConditionalGateKeeper;-import com.gitplex.core.gatekeeper.DefaultGateKeeper;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.gatekeeper.NotGateKeeper;import com.google.common.base.Joiner;import com.gitplex.commons.util.ReflectionUtils;import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;@@ -33,6 +26,13 @@ import com.gitplex.commons.wicket.component.modal.ModalLink;import com.gitplex.commons.wicket.component.modal.ModalPanel;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.gatekeeper.AbstractGateKeeper;+import com.gitplex.server.core.gatekeeper.AndGateKeeper;+import com.gitplex.server.core.gatekeeper.AndOrGateKeeper;+import com.gitplex.server.core.gatekeeper.ConditionalGateKeeper;+import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.gatekeeper.NotGateKeeper;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.javaindex 00037fffcb..f30a02ff97 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.gatekeeper;+package com.gitplex.server.web.page.depot.setting.gatekeeper;import java.util.ArrayList;import java.util.Iterator;@@ -15,17 +15,17 @@ 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 com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.gatekeeper.DefaultGateKeeper;-import com.gitplex.core.gatekeeper.GateKeeper;-import com.gitplex.core.gatekeeper.TeamAwareGateKeeper;-import com.gitplex.web.page.account.AccountPage;import com.google.common.base.Preconditions;import com.gitplex.commons.loader.ImplementationRegistry;import com.gitplex.commons.wicket.behavior.CollapseBehavior;import com.gitplex.commons.wicket.component.AccordionPanel;import com.gitplex.commons.wicket.editable.EditableUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;+import com.gitplex.server.core.gatekeeper.GateKeeper;+import com.gitplex.server.core.gatekeeper.TeamAwareGateKeeper;+import com.gitplex.server.web.page.account.AccountPage;@SuppressWarnings("serial")abstract class GateKeeperSelector extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.javasimilarity index 88%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.javaindex 87c0596258..196e647311 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.general;+package com.gitplex.server.web.page.depot.setting.general;import java.io.Serializable;import java.util.ArrayList;@@ -15,24 +15,24 @@ 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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;-import com.gitplex.web.component.accountchoice.AccountSingleChoice;-import com.gitplex.web.component.confirmdelete.ConfirmDeleteDepotModal;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;import com.gitplex.commons.wicket.component.modal.ModalPanel;import com.gitplex.commons.wicket.component.select2.Response;import com.gitplex.commons.wicket.component.select2.ResponseFiller;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.Constants;+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.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.depot.setting.DepotSettingPage;@SuppressWarnings("serial")public class GeneralSettingPage extends DepotSettingPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.javaindex 104ca586cd..aa68a80a37 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.integrationpolicy;+package com.gitplex.server.web.page.depot.setting.integrationpolicy;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -6,8 +6,8 @@ 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.core.entity.support.IntegrationPolicy;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.entity.support.IntegrationPolicy;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.javasimilarity index 91%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.javaindex cad4dd9e3c..5f7a15a77c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.integrationpolicy;+package com.gitplex.server.web.page.depot.setting.integrationpolicy;import java.util.List;@@ -12,13 +12,13 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.support.IntegrationPolicy;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.setting.DepotSettingPage;import com.gitplex.commons.wicket.behavior.sortable.SortBehavior;import com.gitplex.commons.wicket.behavior.sortable.SortPosition;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.entity.support.IntegrationPolicy;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.page.depot.setting.DepotSettingPage;@SuppressWarnings("serial")public class IntegrationPolicyPage extends DepotSettingPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.javaindex 1b67de9cb9..a03a8b264f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.setting.integrationpolicy;+package com.gitplex.server.web.page.depot.setting.integrationpolicy;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -6,9 +6,9 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.panel.Panel;-import com.gitplex.core.entity.support.IntegrationPolicy;import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;import com.gitplex.commons.wicket.editable.BeanContext;+import com.gitplex.server.core.entity.support.IntegrationPolicy;@SuppressWarnings("serial")abstract class IntegrationPolicyPanel extends Panel {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.html b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javaindex 8bc12a72ef..699663cdad 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.tags;+package com.gitplex.server.web.page.depot.tags;import java.util.Iterator;import java.util.List;@@ -33,17 +33,6 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTag;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.archivemenulink.ArchiveMenuLink;-import com.gitplex.web.component.contributorpanel.ContributorPanel;-import com.gitplex.web.component.revisionpicker.RevisionPicker;-import com.gitplex.web.page.depot.DepotPage;-import com.gitplex.web.page.depot.NoBranchesPage;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.git.GitUtils;import com.gitplex.commons.git.RefInfo;import com.gitplex.commons.util.StringUtils;@@ -51,6 +40,17 @@ import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;+import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+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.commit.CommitDetailPage;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -241,7 +241,7 @@ public class DepotTagsPage extends DepotPage {PageableListView<RefInfo> tagsView;tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,- com.gitplex.web.Constants.DEFAULT_PAGE_SIZE) {+ com.gitplex.server.web.Constants.DEFAULT_PAGE_SIZE) {@Overrideprotected void populateItem(ListItem<RefInfo> item) {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.javaindex fbc5aade33..5039671fe5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.depot.tags;+package com.gitplex.server.web.page.depot.tags;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/depot-tags.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/tags/depot-tags.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/depot-tags.cssrename to server.web/src/main/java/com/gitplex/server/web/page/depot/tags/depot-tags.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.java b/server.web/src/main/java/com/gitplex/server/web/page/error/BaseErrorPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/error/BaseErrorPage.javaindex ad646a2387..285dd847ba 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/error/BaseErrorPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.error;+package com.gitplex.server.web.page.error;import java.io.Serializable;@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import com.gitplex.web.page.base.BasePage;+import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")public abstract class BaseErrorPage extends BasePage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/error/ErrorPageResourceReference.javasimilarity index 67%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/error/ErrorPageResourceReference.javaindex 3515508b14..a8751a2709 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/error/ErrorPageResourceReference.java@@ -1,6 +1,6 @@-package com.gitplex.web.page.error;+package com.gitplex.server.web.page.error;-import com.gitplex.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;public class ErrorPageResourceReference extends BaseDependentCssResourceReference {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.html b/server.web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.java b/server.web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.javaindex 21a9643910..7b2e3af1f2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.error;+package com.gitplex.server.web.page.error;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -8,9 +8,9 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.util.string.Strings;-import com.gitplex.web.page.home.DashboardPage;import com.gitplex.commons.util.WordUtils;import com.gitplex.commons.wicket.component.MultilineLabel;+import com.gitplex.server.web.page.home.DashboardPage;@SuppressWarnings("serial")public class ExpectedExceptionPage extends BaseErrorPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.html b/server.web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.java b/server.web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.javaindex 3a690b4f08..fe5472c738 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package com.gitplex.web.page.error;+package com.gitplex.server.web.page.error;import java.io.Serializable;import java.net.InetAddress;@@ -33,13 +33,13 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.model.Model;import org.apache.wicket.util.string.Strings;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.web.page.home.DashboardPage;-import com.gitplex.web.util.DateUtils;import com.gitplex.commons.util.FileUtils;import com.gitplex.commons.util.StringUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.web.page.home.DashboardPage;+import com.gitplex.server.web.util.DateUtils;@SuppressWarnings("serial")public class UnexpectedExceptionPage extends BaseErrorPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/error/error-page.css b/server.web/src/main/java/com/gitplex/server/web/page/error/error-page.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/error/error-page.cssrename to server.web/src/main/java/com/gitplex/server/web/page/error/error-page.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html b/server.web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java b/server.web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.javasimilarity index 89%rename from gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.javaindex 5497162b1b..14ccd511b4 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java@@ -1,137 +1,137 @@-package com.gitplex.web.page.home;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-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.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;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;--import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.Constants;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.layout.LayoutPage;--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 DashboardPage extends LayoutPage {-- private PageableListView<Depot> depotsView;-- private BootstrapPagingNavigator depotsPageNav;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private String searchInput;-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("search", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(depotsContainer);- target.add(depotsPageNav);- target.add(noDepotsContainer);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @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);- }- }- depots.sort(Depot::compareLastVisit);- return depots;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link",- DepotFilePage.class, DepotFilePage.paramsOf(depot));- link.add(new Label("name", depot.getFQN()));- item.add(link);- }-- });-- add(depotsPageNav = new BootstrapAjaxPagingNavigator("depotsPageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- depotsPageNav.setOutputMarkupPlaceholderTag(true);-- add(noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- });- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new DashboardResourceReference()));- }-- @Override- protected Component newContextHead(String componentId) {- return new Label(componentId, "Accessible Repositories");- }--}+package com.gitplex.server.web.page.home;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+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.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;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.Constants;+import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.layout.LayoutPage;++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 DashboardPage extends LayoutPage {++ private PageableListView<Depot> depotsView;++ private BootstrapPagingNavigator depotsPageNav;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private String searchInput;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("search", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(depotsPageNav);+ target.add(noDepotsContainer);+ }++ });++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<Depot>("depots",+ new LoadableDetachableModel<List<Depot>>() {++ @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);+ }+ }+ depots.sort(Depot::compareLastVisit);+ return depots;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Depot> item) {+ Depot depot = item.getModelObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ DepotFilePage.class, DepotFilePage.paramsOf(depot));+ link.add(new Label("name", depot.getFQN()));+ item.add(link);+ }++ });++ add(depotsPageNav = new BootstrapAjaxPagingNavigator("depotsPageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ depotsPageNav.setOutputMarkupPlaceholderTag(true);++ add(noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ });+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DashboardResourceReference()));+ }++ @Override+ protected Component newContextHead(String componentId) {+ return new Label(componentId, "Accessible Repositories");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.javaindex 18c5371363..52afd2300a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.home;+package com.gitplex.server.web.page.home;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/dashboard.css b/server.web/src/main/java/com/gitplex/server/web/page/home/dashboard.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/home/dashboard.cssrename to server.web/src/main/java/com/gitplex/server/web/page/home/dashboard.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.html b/server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.java b/server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.javaindex 0c1ea25142..7ca0a512d8 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.init;+package com.gitplex.server.web.page.init;import java.util.ArrayList;import java.util.List;@@ -10,16 +10,16 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.WebSession;-import com.gitplex.web.page.base.BasePage;import com.gitplex.commons.util.init.InitStage;import com.gitplex.commons.util.init.ManualConfig;import com.gitplex.commons.wicket.component.wizard.ManualConfigStep;import com.gitplex.commons.wicket.component.wizard.Wizard;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.WebSession;+import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")public class ServerInitPage extends BasePage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitResourceReference.javaindex 5a27d3c771..df0fbcd6ec 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/init/ServerInitResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.init;+package com.gitplex.server.web.page.init;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.html b/server.web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.java b/server.web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.javasimilarity index 78%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.javaindex 8cfed4b1b0..04a9ed4046 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java@@ -1,12 +1,12 @@-package com.gitplex.web.page.init;+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.web.page.account.overview.NewDepotPage;-import com.gitplex.web.page.account.overview.NewOrganizationPage;-import com.gitplex.web.page.layout.LayoutPage;+import com.gitplex.server.web.page.account.overview.NewDepotPage;+import com.gitplex.server.web.page.account.overview.NewOrganizationPage;+import com.gitplex.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")public class WelcomePage extends LayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.javaindex 31de4a11ef..d7bb916f6d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.init;+package com.gitplex.server.web.page.init;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/server-init.css b/server.web/src/main/java/com/gitplex/server/web/page/init/server-init.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/server-init.cssrename to server.web/src/main/java/com/gitplex/server/web/page/init/server-init.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/init/welcome.css b/server.web/src/main/java/com/gitplex/server/web/page/init/welcome.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/init/welcome.cssrename to server.web/src/main/java/com/gitplex/server/web/page/init/welcome.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.html b/server.web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.java b/server.web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.javasimilarity index 79%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.javaindex bb4c2ca6da..d804f5488e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java@@ -1,21 +1,21 @@-package com.gitplex.web.page.layout;+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.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.component.accountchoice.AccountSingleChoice;-import com.gitplex.web.component.accountchoice.AdministrativeAccountChoiceProvider;-import com.gitplex.web.page.depot.file.DepotFilePage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;+import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;+import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")public class CreateDepotPage extends LayoutPage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.html b/server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.java b/server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javaindex b7142a7877..9a30d791d0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java@@ -1,265 +1,265 @@-package com.gitplex.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.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.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.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.commons.loader.AppLoader;-import com.gitplex.commons.loader.Plugin;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.floating.AlignPlacement;-import com.gitplex.commons.wicket.websocket.WebSocketRegion;-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.account.overview.NewOrganizationPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.gitplex.web.page.account.tasks.TaskListPage;-import com.gitplex.web.page.admin.SystemSettingPage;-import com.gitplex.web.page.base.BasePage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.home.DashboardPage;-import com.gitplex.web.page.security.LoginPage;-import com.gitplex.web.page.security.LogoutPage;-import com.gitplex.web.page.security.RegisterPage;-import com.gitplex.web.websocket.TaskChangedRegion;--@SuppressWarnings("serial")-public abstract class LayoutPage extends BasePage {-- private static final String RELEASE_DATE_FORMAT = "yyyy-MM-dd";-- public LayoutPage() {- }-- public LayoutPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer head = new WebMarkupContainer("mainHead");- add(head);-- head.add(newContextHead("context"));-- if (isLoggedIn()) {- head.add(new DropdownLink("createNewDropdown") {-- @Override- protected Component newContent(String id) {- Fragment fragment = new Fragment(id, "createNewFrag", LayoutPage.this);- fragment.add(new BookmarkablePageLink<Void>("createNewDepot", CreateDepotPage.class));- fragment.add(new BookmarkablePageLink<Void>("createNewOrganization",- NewOrganizationPage.class, NewOrganizationPage.paramsOf(getLoginUser())));- return fragment;- }-- });- } else {- head.add(new WebMarkupContainer("createNewDropdown").setVisible(false));- }-- head.add(new BookmarkablePageLink<Void>("depotsLink", DashboardPage.class));-- head.add(new ExternalLink("docLink", GitPlex.getInstance().getDocLink()));-- Account user = getLoginUser();- boolean signedIn = user != null;-- head.add(new Link<Void>("login") {-- @Override- public void onClick() {- throw new RestartResponseAtInterceptPageException(LoginPage.class);- }-- }.setVisible(!signedIn));-- boolean enableSelfRegister = GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister();- head.add(new BookmarkablePageLink<Void>("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister));- head.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class).setVisible(signedIn));- if (user != null) {- head.add(new BookmarkablePageLink<Void>("tasks", TaskListPage.class, TaskListPage.paramsOf(user)) {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(getComponent());- }-- });-- setOutputMarkupPlaceholderTag(true);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getLoginUser().getRequestTasks().isEmpty());- }-- });-- } else {- head.add(new WebMarkupContainer("tasks").setVisible(false));- }-- if (signedIn) {- head.add(new AvatarLink("user", user, null));- head.add(new DropdownLink("userMenuTrigger", new AlignPlacement(50, 100, 50, 0, 8)) {-- @Override- protected Component newContent(String id) {- 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 BookmarkablePageLink<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 BookmarkablePageLink<Void>("profile", ProfileEditPage.class, ProfileEditPage.paramsOf(user)));- fragment.add(new BookmarkablePageLink<Void>("administration", SystemSettingPage.class) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManageSystem());- }-- });- fragment.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class));-- return fragment;- }-- });- } else {- head.add(new WebMarkupContainer("user").setVisible(false));- head.add(new WebMarkupContainer("userMenuTrigger").setVisible(false));- head.add(new WebMarkupContainer("userMenu").setVisible(false));- }-- add(new WebMarkupContainer("mainFoot") {-- @Override- protected void onInitialize() {- super.onInitialize();- Plugin product = AppLoader.getProduct();- add(new Label("productVersion", product.getVersion()));- add(new Label("releaseDate", new SimpleDateFormat(RELEASE_DATE_FORMAT).format(product.getDate())));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isFootVisible());- }-- });- }-- protected Component newContextHead(String componentId) {- return new WebMarkupContainer(componentId);- }-- protected boolean isLoggedIn() {- return getLoginUser() != null;- }-- protected boolean isRemembered() {- return SecurityUtils.getSubject().isRemembered();- }-- protected boolean isAuthenticated() {- return SecurityUtils.getSubject().isAuthenticated();- }-- protected boolean isFootVisible() {- return true;- }-- @Nullable- protected Account getAccount() {- return getLoginUser();- }-- @Nullable- protected Depot getDepot() {- return null;- }-- protected void onSelect(AjaxRequestTarget target, Account account) {- setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(account));- }-- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));- }-- @Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- if (isLoggedIn()) {- regions.add(new TaskChangedRegion(getLoginUser().getId()));- }- return regions;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new LayoutResourceReference()));- }--}+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.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.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.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.commons.loader.AppLoader;+import com.gitplex.commons.loader.Plugin;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.floating.AlignPlacement;+import com.gitplex.commons.wicket.websocket.WebSocketRegion;+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.avatar.AvatarLink;+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.file.DepotFilePage;+import com.gitplex.server.web.page.home.DashboardPage;+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.websocket.TaskChangedRegion;++@SuppressWarnings("serial")+public abstract class LayoutPage extends BasePage {++ private static final String RELEASE_DATE_FORMAT = "yyyy-MM-dd";++ public LayoutPage() {+ }++ public LayoutPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer head = new WebMarkupContainer("mainHead");+ add(head);++ head.add(newContextHead("context"));++ if (isLoggedIn()) {+ head.add(new DropdownLink("createNewDropdown") {++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "createNewFrag", LayoutPage.this);+ fragment.add(new BookmarkablePageLink<Void>("createNewDepot", CreateDepotPage.class));+ fragment.add(new BookmarkablePageLink<Void>("createNewOrganization",+ NewOrganizationPage.class, NewOrganizationPage.paramsOf(getLoginUser())));+ return fragment;+ }++ });+ } else {+ head.add(new WebMarkupContainer("createNewDropdown").setVisible(false));+ }++ head.add(new BookmarkablePageLink<Void>("depotsLink", DashboardPage.class));++ head.add(new ExternalLink("docLink", GitPlex.getInstance().getDocLink()));++ Account user = getLoginUser();+ boolean signedIn = user != null;++ head.add(new Link<Void>("login") {++ @Override+ public void onClick() {+ throw new RestartResponseAtInterceptPageException(LoginPage.class);+ }++ }.setVisible(!signedIn));++ boolean enableSelfRegister = GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister();+ head.add(new BookmarkablePageLink<Void>("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister));+ head.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class).setVisible(signedIn));+ if (user != null) {+ head.add(new BookmarkablePageLink<Void>("tasks", TaskListPage.class, TaskListPage.paramsOf(user)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ handler.add(getComponent());+ }++ });++ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getLoginUser().getRequestTasks().isEmpty());+ }++ });++ } else {+ head.add(new WebMarkupContainer("tasks").setVisible(false));+ }++ if (signedIn) {+ head.add(new AvatarLink("user", user, null));+ head.add(new DropdownLink("userMenuTrigger", new AlignPlacement(50, 100, 50, 0, 8)) {++ @Override+ protected Component newContent(String id) {+ 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 BookmarkablePageLink<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 BookmarkablePageLink<Void>("profile", ProfileEditPage.class, ProfileEditPage.paramsOf(user)));+ fragment.add(new BookmarkablePageLink<Void>("administration", SystemSettingPage.class) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManageSystem());+ }++ });+ fragment.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class));++ return fragment;+ }++ });+ } else {+ head.add(new WebMarkupContainer("user").setVisible(false));+ head.add(new WebMarkupContainer("userMenuTrigger").setVisible(false));+ head.add(new WebMarkupContainer("userMenu").setVisible(false));+ }++ add(new WebMarkupContainer("mainFoot") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ Plugin product = AppLoader.getProduct();+ add(new Label("productVersion", product.getVersion()));+ add(new Label("releaseDate", new SimpleDateFormat(RELEASE_DATE_FORMAT).format(product.getDate())));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(isFootVisible());+ }++ });+ }++ protected Component newContextHead(String componentId) {+ return new WebMarkupContainer(componentId);+ }++ protected boolean isLoggedIn() {+ return getLoginUser() != null;+ }++ protected boolean isRemembered() {+ return SecurityUtils.getSubject().isRemembered();+ }++ protected boolean isAuthenticated() {+ return SecurityUtils.getSubject().isAuthenticated();+ }++ protected boolean isFootVisible() {+ return true;+ }++ @Nullable+ protected Account getAccount() {+ return getLoginUser();+ }++ @Nullable+ protected Depot getDepot() {+ return null;+ }++ protected void onSelect(AjaxRequestTarget target, Account account) {+ setResponsePage(AccountOverviewPage.class, AccountOverviewPage.paramsOf(account));+ }++ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ }++ @Override+ public Collection<WebSocketRegion> getWebSocketRegions() {+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ if (isLoggedIn()) {+ regions.add(new TaskChangedRegion(getLoginUser().getId()));+ }+ return regions;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(CssHeaderItem.forReference(new LayoutResourceReference()));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutResourceReference.javaindex 8af540fd44..cc03dd2a94 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/layout/LayoutResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.layout;+package com.gitplex.server.web.page.layout;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/layout/layout.css b/server.web/src/main/java/com/gitplex/server/web/page/layout/layout.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/layout/layout.cssrename to server.web/src/main/java/com/gitplex/server/web/page/layout/layout.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.html b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.javaindex 5fc287a64a..b28b396336 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import java.io.Serializable;import java.util.Arrays;@@ -13,16 +13,16 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.manager.MailManager;-import com.gitplex.web.page.base.BasePage;import com.gitplex.commons.wicket.behavior.testform.TestFormBehavior;import com.gitplex.commons.wicket.behavior.testform.TestResult;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.annotation.Editable;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.manager.MailManager;+import com.gitplex.server.web.page.base.BasePage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/ForgetResourceReference.javaindex b9568a9748..f603b994bc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/ForgetResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.html b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javaindex 93a0e760af..916d055800 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationException;@@ -12,10 +12,10 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;-import com.gitplex.core.GitPlex;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.web.WebSession;-import com.gitplex.web.page.base.BasePage;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.web.WebSession;+import com.gitplex.server.web.page.base.BasePage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginResourceReference.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/LoginResourceReference.javaindex 31e43df941..a2b7aca75f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/LoginResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.javasimilarity index 70%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.javaindex e982bf528c..5a6d6af223 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.java@@ -1,9 +1,9 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.wicket.RestartResponseException;-import com.gitplex.web.WebSession;-import com.gitplex.web.page.base.BasePage;+import com.gitplex.server.web.WebSession;+import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")public class LogoutPage extends BasePage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.html b/server.web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.java b/server.web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.javaindex 1bd2a1fac3..bfd57e9fc5 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.shiro.authz.UnauthenticatedException;import org.apache.wicket.Session;@@ -8,18 +8,18 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.SubmitLink;import org.apache.wicket.markup.html.link.Link;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.manager.ConfigManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.setting.AvatarEditPage;-import com.gitplex.web.page.base.BasePage;-import com.gitplex.web.page.home.DashboardPage;import com.gitplex.commons.wicket.editable.BeanContext;import com.gitplex.commons.wicket.editable.BeanEditor;import com.gitplex.commons.wicket.editable.PathSegment;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Account;+import com.gitplex.server.core.manager.AccountManager;+import com.gitplex.server.core.manager.ConfigManager;+import com.gitplex.server.core.security.SecurityUtils;+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;@SuppressWarnings("serial")public class RegisterPage extends BasePage {diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/page/security/RegisterResourceReference.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/page/security/RegisterResourceReference.javaindex e444923184..63c82da54c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/security/RegisterResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.security;+package com.gitplex.server.web.page.security;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/forget.css b/server.web/src/main/java/com/gitplex/server/web/page/security/forget.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/forget.cssrename to server.web/src/main/java/com/gitplex/server/web/page/security/forget.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/login.css b/server.web/src/main/java/com/gitplex/server/web/page/security/login.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/login.cssrename to server.web/src/main/java/com/gitplex/server/web/page/security/login.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/register.css b/server.web/src/main/java/com/gitplex/server/web/page/security/register.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/security/register.cssrename to server.web/src/main/java/com/gitplex/server/web/page/security/register.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.html b/server.web/src/main/java/com/gitplex/server/web/page/test/RunModePage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/test/RunModePage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.java b/server.web/src/main/java/com/gitplex/server/web/page/test/RunModePage.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.javarename to server.web/src/main/java/com/gitplex/server/web/page/test/RunModePage.javaindex f2d1312e80..0d57e09aee 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/test/RunModePage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.test;+package com.gitplex.server.web.page.test;import java.io.File;import java.io.IOException;diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html b/server.web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmlsimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.htmlrename to server.web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmldiff --git a/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.java b/server.web/src/main/java/com/gitplex/server/web/page/test/TestPage.javasimilarity index 82%rename from gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.javarename to server.web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 1c34aa442c..d9525a2717 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -1,4 +1,4 @@-package com.gitplex.web.page.test;+package com.gitplex.server.web.page.test;import com.gitplex.commons.wicket.page.CommonPage;diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.java b/server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.javarename to server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.javaindex cbcd77799b..6835ed1457 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import java.io.IOException;import java.io.UnsupportedEncodingException;@@ -18,10 +18,10 @@ import org.eclipse.jgit.archive.TgzFormat;import org.eclipse.jgit.archive.ZipFormat;import org.eclipse.jgit.lib.Constants;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.javaindex 2e3fffced3..b660605535 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.java b/server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.javarename to server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.javaindex 1aece038b5..9e72587ff0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import java.io.File;import java.io.FileInputStream;@@ -17,11 +17,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.Constants;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.AttachmentManager;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.AttachmentManager;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.javaindex 96f650c1a2..73a967ea2d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.java b/server.web/src/main/java/com/gitplex/server/web/resource/BlobResource.javasimilarity index 93%rename from gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.javarename to server.web/src/main/java/com/gitplex/server/web/resource/BlobResource.javaindex 6a014ef3e6..dfb6eb6849 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/BlobResource.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import java.io.IOException;import java.io.InputStream;@@ -14,15 +14,15 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.Constants;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import com.gitplex.commons.git.Blob;import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.git.GitUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.DepotManager;+import com.gitplex.server.core.security.SecurityUtils;public class BlobResource extends AbstractResource {diff --git a/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.java b/server.web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.javarename to server.web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.javaindex c2465b691d..2c04de373a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.java+++ b/server.web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.web.resource;+package com.gitplex.server.web.resource;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.java b/server.web/src/main/java/com/gitplex/server/web/util/DateUtils.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.javarename to server.web/src/main/java/com/gitplex/server/web/util/DateUtils.javaindex efb1893162..1fd5a308bd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.java+++ b/server.web/src/main/java/com/gitplex/server/web/util/DateUtils.java@@ -1,11 +1,11 @@-package com.gitplex.web.util;+package com.gitplex.server.web.util;import java.util.Date;import org.joda.time.DateTime;import org.ocpsoft.prettytime.PrettyTime;-import com.gitplex.web.Constants;+import com.gitplex.server.web.Constants;public class DateUtils extends org.apache.commons.lang3.time.DateUtils {diff --git a/gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.java b/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.javasimilarity index 97%rename from gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.javarename to server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.javaindex 5af24e22d1..f15a5f95b3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.java+++ b/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java@@ -1,4 +1,4 @@-package com.gitplex.web.util;+package com.gitplex.server.web.util;import java.util.ArrayList;import java.util.HashMap;@@ -10,9 +10,6 @@ import java.util.Set;import javax.annotation.Nullable;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.CommitInfoManager;import com.google.common.base.Preconditions;import com.gitplex.commons.antlr.codeassist.InputSuggestion;import com.gitplex.commons.git.GitUtils;@@ -21,6 +18,9 @@ import com.gitplex.commons.hibernate.dao.Dao;import com.gitplex.commons.util.Range;import com.gitplex.commons.util.match.PatternApplied;import com.gitplex.commons.util.match.WildcardUtils;+import com.gitplex.server.core.GitPlex;+import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.manager.CommitInfoManager;public class SuggestionUtils {diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.java b/server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.javaindex d6d76bfbdd..d8ffd4b5e0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java@@ -1,13 +1,13 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.event.codecomment.CodeCommentEvent;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.wicket.WicketUtils;import com.gitplex.commons.wicket.websocket.PageKey;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.core.event.codecomment.CodeCommentEvent;@Singletonpublic class CodeCommentChangeBroadcaster {diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.java b/server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.javaindex 4b72a23ca5..3402566168 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.java@@ -1,4 +1,4 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import com.gitplex.commons.wicket.websocket.WebSocketRegion;diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.java b/server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.javaindex 8181e8b2c3..435080c08a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.java@@ -1,11 +1,11 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.search.CommitIndexed;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.search.CommitIndexed;@Singletonpublic class CommitIndexedBroadcaster {diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.java b/server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.javasimilarity index 94%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.javaindex 1268bc0ea4..d682842228 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.java@@ -1,4 +1,4 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import org.eclipse.jgit.lib.ObjectId;diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.java b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.javasimilarity index 86%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.javaindex 1410f40158..a93dd1bd5f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.java@@ -1,13 +1,13 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.event.pullrequest.PullRequestChangeEvent;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.wicket.WicketUtils;import com.gitplex.commons.wicket.websocket.PageKey;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;@Singletonpublic class PullRequestChangeBroadcaster {diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.java b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.javasimilarity index 87%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.javaindex fe2a52abad..dba4c03110 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java@@ -1,4 +1,4 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.java b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.javaindex 239af45e9e..3ebdef890c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java@@ -1,4 +1,4 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import com.gitplex.commons.wicket.websocket.WebSocketRegion;diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.java b/server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.javasimilarity index 85%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.javaindex d87087fb0e..404903aaf0 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java@@ -1,11 +1,11 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import com.gitplex.core.event.TaskChangeEvent;import com.gitplex.commons.loader.Listen;import com.gitplex.commons.wicket.websocket.WebSocketManager;+import com.gitplex.server.core.event.TaskChangeEvent;@Singletonpublic class TaskChangeBroadcaster {diff --git a/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.java b/server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.javasimilarity index 92%rename from gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.javarename to server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.javaindex 0e7b0092f3..6fe9430d37 100644--- a/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.java+++ b/server.web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java@@ -1,4 +1,4 @@-package com.gitplex.web.websocket;+package com.gitplex.server.web.websocket;import com.gitplex.commons.wicket.websocket.WebSocketRegion;